aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix Sprite3D's incorrect behavior when using AtlasTextures."Juan Linietsky2018-05-071-20/+9
|
* Merge pull request #18121 from ↵Juan Linietsky2018-05-071-15/+26
|\ | | | | | | | | Crazy-P/Resolves-Freeze-on-change-reflection-probe Resolves editor freezes on change of reflection probe
| * Fixes incorrect adding to last in self_listCrazy-P2018-04-111-15/+26
| | | | | | | | Fixes https://github.com/godotengine/godot/issues/18052
* | Merge pull request #18144 from ↵Juan Linietsky2018-05-072-0/+5
|\ \ | | | | | | | | | | | | Crazy-P/Resolves-crash-on-shape2D-culling-for-empty-Concave-shapes Resolves crash on shape2D culling for empty Concave shapes
| * | Resolves crash on shape2D culling for empty Concave shapesCrazy-P2018-04-122-0/+5
| | | | | | | | | | | | Fixes https://github.com/godotengine/godot/issues/17789
* | | Merge pull request #18159 from ShyRed/viewportskyJuan Linietsky2018-05-071-1/+5
|\ \ \ | | | | | | | | Fix binding of ViewportTexture to Sky
| * | | Fix binding of ViewportTexture to SkyShyRed2018-04-121-1/+5
| | | | | | | | | | | | | | | | In order to the get the actual rendered image from a ViewportTexture the sky needs to access the proxy texture.
* | | | Merge pull request #18219 from AlexHolly/fix-image-blit-blendJuan Linietsky2018-05-071-0/+24
|\ \ \ \ | | | | | | | | | | blit and blend fix when dst<Vector2
| * | | | blit and blend fix when dst<Vector2Alexander Holland2018-04-151-0/+24
| | | | |
* | | | | Merge pull request #18533 from JFonS/fix_shader_compileJuan Linietsky2018-05-072-3/+44
|\ \ \ \ \ | | | | | | | | | | | | Fix vector reduction in shader language
| * | | | | Fix vector reduction in shader languageJFonS2018-05-072-3/+44
| | | | | |
* | | | | | Merge pull request #18684 from muiroc/fix_dragdrop_instancingJuan Linietsky2018-05-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Editor: Makes dragdrop instantiation behavior consistent with the instance scene button
| * | | | | | SpatialEditorViewport::_create_instance: pass GEN_EDIT_STATE_INSTANCED to ↵muiroc2018-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | scene->instance()
* | | | | | | Merge pull request #18495 from Zylann/partial_texture_updateJuan Linietsky2018-05-079-0/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added partial texture update to VisualServer
| * | | | | | | Added partial texture update to VisualServerMarc Gilleron2018-04-299-0/+64
| | | | | | | |
* | | | | | | | Merge pull request #18519 from TheYokai/connectionsdock_upgradeJuan Linietsky2018-05-072-260/+497
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ConnectionsDock - Additional Features (Edit Connection, Disconnect All) and Refactor
| * | | | | | | | Added disconnect_all and edit functionality to ConnectionsDock.Eoin O'Neill2018-04-292-325/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor: Changed function order so header and source are in sync, renamed functions and members to be more clear. Replaced pointers with references where appropriate.
| * | | | | | | | Added connection editing. Some refactoring.Eoin O'Neill2018-04-292-46/+112
| | | | | | | | |
| * | | | | | | | Basic context menu added to connections docker w/ code cleanup.Eoin O'Neill2018-04-292-75/+147
| | | | | | | | |
* | | | | | | | | Merge pull request #18525 from Calinou/improve-3d-gridJuan Linietsky2018-05-072-11/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve the 3D editor grid
| * | | | | | | | | Improve the 3D editor gridHugo Locurcio2018-04-302-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The grid's primary and secondary colors can now be changed - The number of grid steps (subdivisions) can now be changed - The grid size can now be changed - The grid is now darker by default
* | | | | | | | | | Merge pull request #18682 from YeldhamDev/play_backwards_autocompleteJuan Linietsky2018-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added "play_backwards" to the list o functions to autocomplete
| * | | | | | | | | | Added "play_backwards" to the list o functions to autocomplete.Michael Alexsander Silva Dias2018-05-071-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #18505 from AlexHolly/image-point2-helperJuan Linietsky2018-05-072-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add Point2 helper for Image.get_pixel and Image.set_pixel
| * | | | | | | | | | | add Point2 helper for Image.get_pixel and Image.set_pixelAlexander Holland2018-04-292-1/+13
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | image-point2-helper
* | | | | | | | | | | Merge pull request #18610 from homer666/editor-popup-adjustmentsJuan Linietsky2018-05-074-4/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adjust default editor dialog window sizes
| * | | | | | | | | | | Adjust default editor popup sizeshomer6662018-05-054-4/+32
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #18616 from Chaosus/updategladJuan Linietsky2018-05-074-16/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Update GLAD to 0.1.20a0
| * | | | | | | | | | | Update GLAD to 0.1.20a0Chaosus2018-05-044-16/+33
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #18633 from groud/fix_2d_editorJuan Linietsky2018-05-072-61/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 2d editor
| * | | | | | | | | | | | Fixes some 2d bones display problemsgroud2018-05-052-29/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixes several selection problems in the 2D editorgroud2018-05-051-32/+28
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #18642 from flashyincceo/engine-clickJuan Linietsky2018-05-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix script editor CTRL+CLICK on singleton functions
| * | | | | | | | | | | | | Fix script editor CTRL+CLICK on singleton functionsPeter Folkins2018-05-051-0/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #15640 from willnationsdev/resource-saved-signalMax Hilbrunner2018-05-075-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added EditorPlugin 'resource_saved' signal
| * | | | | | | | | | | | | | Added EditorPlugin 'resource_saved' signalWill Nations2018-01-315-0/+16
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #18628 from raphael10241024/patchGilles Roudière2018-05-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix : code editor's text size should change at least one each time when you try to change it using shortcuts
| * | | | | | | | | | | | | | | Fix:code editor text size should change at least one each time, don't mind ↵RaphaelHunter2018-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | how you setting your display scale
* | | | | | | | | | | | | | | | Merge pull request #18122 from olivergs/wip/rtl-content-heightMax Hilbrunner2018-05-073-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RichTextLabel, doc: Added new method to get total content height
| * | | | | | | | | | | | | | | | RichTextLabel, doc: Added new method to get total content heightOliver Gutierrez2018-04-113-3/+19
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #18308 from ericmccarthy7/developMax Hilbrunner2018-05-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clone down newline bug
| * | | | | | | | | | | | | | | | Fix clone down newline bugEric McCarthy2018-04-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously cloning down at the end of a script was broken if there was not an additional empty line. This fix ensures there is an empty line before attempting to clone downwards. Fixes #18206, cheers!
* | | | | | | | | | | | | | | | | Merge pull request #18677 from BastiaanOlij/add_no_blendJuan Linietsky2018-05-077-2/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add no-blend canvas item render_mode
| * | | | | | | | | | | | | | | | | Add no-blend canvas item render_modeBastiaan Olij2018-05-077-2/+31
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #18524 from BastiaanOlij/keep_3d_linearJuan Linietsky2018-05-0711-9/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Added option to viewport to keep linear color
| * | | | | | | | | | | | | | | | | Added option to viewport to keep linear colorBastiaan Olij2018-05-0611-9/+61
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #18675 from endragor/fix-ios-audio-interruptMax Hilbrunner2018-05-074-22/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resume audio on iOS after phone call or alarm
| * | | | | | | | | | | | | | | | | Resume audio on iOS after phone call or alarmRuslan Mustakov2018-05-074-22/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a phone call or an alarm triggers on iOS, the application receives an "audio interruption" and it's up to the application to resume playback when the interruption ends. I added handling for audio interruptions same as if the game is focused out and then back in.
* | | | | | | | | | | | | | | | | | Merge pull request #18625 from hhirsch/patch-1Max Hilbrunner2018-05-071-21/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Remove commented out code in methods.py
| * | | | | | | | | | | | | | | | | Remove commented out code in methods.pyHenry Hirsch2018-05-051-21/+0
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |