aboutsummaryrefslogtreecommitdiff
path: root/editor
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #14551 from volzhs/ok-alert-confirmRémi Verschelde2017-12-162-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Pressing Enter key creates or loads script on Attach script window
| * | | | | | | Pressing Enter key creates or loads script on Attach script windowvolzhs2017-12-112-0/+7
| | | | | | | |
* | | | | | | | Merge pull request #14613 from voithos/fold-jump-bugfixRémi Verschelde2017-12-162-8/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Account for folded code blocks when navigating via members list
| * | | | | | | | Account for folded code blocks when navigating via members listZaven Muradyan2017-12-122-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the editor would attempt to set the scroll position to the function's line number, but this would result in an invalid scroll whenever functions above the target were folded. This changes callback to use a combination of `goto_line` and `set_edit_state` to navigate to the target line and reset the cursor to column 0. Using `goto_line` also has the side effect of automatically unfolding the target function, which seems like useful behavior. Fixes #14572.
* | | | | | | | | Merge pull request #14609 from sersoong/master-testRémi Verschelde2017-12-162-25/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Enhanced Merge From Scene
| * | | | | | | | | Enhanced Merge From Scenesersoong2017-12-132-25/+75
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14630 from willnationsdev/script-editor-create-apiRémi Verschelde2017-12-162-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add API for ScriptEditor to open ScriptCreateDialog
| * | | | | | | | | | Added open_script_create_dialog funcWill Nations2017-12-132-0/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #14623 from volzhs/mesh-menu-themeRémi Verschelde2017-12-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix theme for Mesh menu
| * | | | | | | | | | | Fix theme for Mesh menuvolzhs2017-12-131-2/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #14645 from volzhs/focus-after-selectRémi Verschelde2017-12-161-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Focus path field after seleting file browser on Attach script window
| * | | | | | | | | | | Focus path field after seleting file browser on Attach script windowvolzhs2017-12-141-0/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #14649 from MattUV/fix-indentationRémi Verschelde2017-12-162-67/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Modifies text indentation behaviour
| * | | | | | | | | | | Modifies indentation behavioursMattUV2017-12-152-67/+8
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially fixes #14559 (see the issue for details); Removes some code redondancy ; Adds the possibility to indent left and right without selecting text ; Adds the entries to the context menu when text is not selected ; Renames indent_selection_left() and indent_selection_right() to indent_left() and indent_right() ; Unifies context menus of shader text editor and script text editor.
* | | | | | | | | | | Merge pull request #14652 from hoelzl/pr-moved-instanced-childrenRémi Verschelde2017-12-161-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent users from moving instanced children
| * | | | | | | | | | | Prevent users from moving instanced childrenMatthias Hoelzl2017-12-141-3/+5
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Made built-in identifiers properly constant in shaders. Fixes #14449, closes ↵Juan Linietsky2017-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #14629
* | | | | | | | | | | ScriptCreateDialog: Fix loading scripts with named classes.Andreas Haas2017-12-151-1/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need to validate the class name when creating a new script, existing scripts already have one. Fixes #14643 Supersedes/Closes #14684
* | | | | | | | | | -Added new scene conversion to binary on export (disabled by default, please ↵Juan Linietsky2017-12-153-2/+43
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test) -This method works by directly converting text to binary, so the scene does not need to be loaded and saved
* | | | | | | | | Updated iconsDaniel J. Ramirez2017-12-1424-232/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ciskip]
* | | | | | | | | GDScript files are converted to binary on export now.Juan Linietsky2017-12-141-0/+1
|/ / / / / / / /
* / / / / / / / -Add lightmapperJuan Linietsky2017-12-149-17/+326
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Fixes to unwrapper (remove degenerates), makes Thekla not crash -Added optional cancel button in EditorProgress -Added function to force processing of events (needed for cancel button)
* | | | | | | TileMapEditor: Fix tile placement.Andreas Haas2017-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14625
* | | | | | | Merge pull request #14596 from Noshyaar/prRémi Verschelde2017-12-1311-140/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enhance undoredo action name, TTR, cleanup
| * | | | | | | Enhance undoredo action name, TTR, cleanupPoommetee Ketson2017-12-1211-140/+14
| |/ / / / / /
* / / / / / / Fixed Tileset editor button having the wrong text and not being translatable.Michael Alexsander Silva Dias2017-12-121-1/+1
|/ / / / / /
* / / / / / Change statable to multistate, remove extra separatorPoommetee Ketson2017-12-121-3/+2
|/ / / / /
* | / / / Highlight Editor Settings categoriesRay Koopa2017-12-111-1/+2
| |/ / / |/| | |
* | | | Merge pull request #13836 from AndreaCatania/scaleRémi Verschelde2017-12-111-16/+17
|\ \ \ \ | |/ / / |/| | | Fixed bullet scale on get_transform and joints
| * | | Makes consistent Slider joint GizmoAndreaCatania2017-12-091-3/+3
| | | |
| * | | Makes consistent 6DOF joint GizmoAndreaCatania2017-12-091-13/+14
| |/ /
* | | Merge pull request #14541 from volzhs/fix-checkbuttonRémi Verschelde2017-12-111-3/+1
|\ \ \ | | | | | | | | Fix CheckButton & CheckBox minimum size
| * | | Fix CheckButton minimum sizevolzhs2017-12-111-3/+1
| | | |
* | | | Merge pull request #14533 from Krakean/addrootifnone_fixRémi Verschelde2017-12-111-0/+1
|\ \ \ \ | |/ / / |/| | | Fix to #14503
| * | | Fixed #14503Dmitry Koteroff2017-12-111-0/+1
| | | |
* | | | Merge pull request #14518 from poke1024/fix-player-wposRémi Verschelde2017-12-111-1/+8
|\ \ \ \ | | | | | | | | | | Fix player window centering on macOS retina screens
| * | | | Fix player window centering on macOS retina screensBernhard Liebl2017-12-101-1/+8
| |/ / /
* | | | Fix SceneTreeEditor crashing when calling _deselect_itemsStefano Bonicatti2017-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | The crash can be triggered for instance by trying to reparent a node and clicking on the background of the Reparent Node window.
* | | | Fix wrong return value in some virtual method bindingsRémi Verschelde2017-12-101-1/+1
|/ / /
* | | Merge pull request #14501 from Paulb23/close_wrong_scene_issue_13844Rémi Verschelde2017-12-101-0/+3
|\ \ \ | | | | | | | | Fixed close current scene closing the wrong scene, issue 13844
| * | | Fixed close current scene closing the wrong scene, issue 13844Paulb232017-12-101-0/+3
| | | |
* | | | Merge pull request #11510 from AndreaCatania/skelRémi Verschelde2017-12-107-3/+262
|\ \ \ \ | |/ / / |/| | | Added skeleton x-ray
| * | | Implemented skeleton visibilityAndreaCatania2017-12-107-3/+262
| | | | | | | | | | | | | | | | Removed code visibility code from popup menu
* | | | Merge pull request #13351 from poke1024/fix12451_2Rémi Verschelde2017-12-101-0/+2
|\ \ \ \ | | | | | | | | | | Make click on arrow properly open and close property editor modals
| * | | | fix certain popup close clicks with popup buttonsBernhard Liebl2017-12-101-0/+2
| | | | |
* | | | | Style: Re-apply clang-format over recent invalid additionsRémi Verschelde2017-12-107-8/+8
| | | | |
* | | | | PropertyEditor: Filter out resource_local_to_sceneRémi Verschelde2017-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This lets the empty "Global" category disappear again. Also silence a debug print.
* | | | | Merge pull request #14479 from Web-eWorks/gltf-fixesRémi Verschelde2017-12-101-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix importing GLTF meshes as external files.
| * | | | | Fix importing GLTF meshes as external files.Webster Sheets2017-12-091-1/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #14480 from volzhs/startup-errorRémi Verschelde2017-12-102-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix get_edited_scene_root error at starting editor