aboutsummaryrefslogtreecommitdiff
path: root/editor
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge pull request #12950 from ianb96/code_foldingRémi Verschelde2017-11-204-68/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code Folding
| * | | | | | | | | | | | | | | scrolling fixesIan2017-11-183-75/+89
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | TextEdit code foldingIan2017-11-174-12/+59
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #13042 from gad-o/customIconFixRémi Verschelde2017-11-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #10798: Fixes Change Type does not change icon
| * | | | | | | | | | | | | | | Fix #10798: Fixes Change Type does not change iconOrkun2017-11-191-0/+2
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem : While replacing old node properties with new ones, we also copy meta data of old node's icon Solve: don't copy meta so don't override _editor_icon
* | | | | | | | | | | | | | | Merge pull request #13059 from dragmz/13009Rémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Regression: running current scene (unsaved) will ask for main scene
| * | | | | | | | | | | | | | | Fix Regression: running current scene (unsaved) will ask for main sceneMarcin Zawiejski2017-11-191-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #13030 from Krakean/masterRémi Verschelde2017-11-192-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "View FPS" in 3D->Perspective's popup.
| * | | | | | | | | | | | | | | | Add "View FPS" in 3D->Perspective's popup.Dmitry Koteroff2017-11-202-0/+44
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
* | | | | | | | | | | | | | | | Merge pull request #13000 from djrm/pr_import_fixesRémi Verschelde2017-11-191-11/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import fixes
| * | | | | | | | | | | | | | | | Improved packed scene previews.Daniel J. Ramirez2017-11-171-11/+17
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix import obj as scene.Daniel J. Ramirez2017-11-191-0/+1
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #13043 from volzhs/post-importRémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore post_import function
| * | | | | | | | | | | | | | | Restore post_import functionvolzhs2017-11-191-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #13039 from sketchyfun/animation_key_selection_fixRémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issues with clicking animation keys that are on frame 0
| * | | | | | | | | | | | | | | | Fixed issue with animation keys that are on frame 0 being difficult to clickBenH2017-11-191-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #12955 from groud/editor_canvas_item_api_reworkPoommetee Ketson2017-11-202-52/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Editor canvas item api rework
| * | | | | | | | | | | | | | | | Rework the canvas_item API for further improves to the canvas item editorGilles Roudiere2017-11-192-52/+52
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #13031 from YeldhamDev/dock_labelRémi Verschelde2017-11-191-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | Added a label to the Dock Positioner
| * | | | | | | | | | | | | | | Added a label to the Dock Positioner.Michael Alexsander Silva Dias2017-11-191-1/+6
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | fix set_current_tab: Indexp_current=-1 out of sizeOmar Al Halabi2017-11-191-1/+1
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #12999 from Hinsbart/dnd_importPoommetee Ketson2017-11-191-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Editor: Drop files to copy them to project.
| * | | | | | | | | | | | | | Editor: Drop files to copy to project.Andreas Haas2017-11-171-5/+12
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed issue where some of the animation editor buttons were difficult to ↵BenH2017-11-181-6/+5
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | click, mainly the add key button. This was due to an error in the offsets
* | | | | | | | | | | | | Merge pull request #12998 from djrm/pr_fixesRémi Verschelde2017-11-183-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | some fixes
| * | | | | | | | | | | | Avoid spamming the console for editor settings initial sets.Daniel J. Ramirez2017-11-171-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated some icons.Daniel J. Ramirez2017-11-162-5/+2
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #12930 from vnen/gdscrit-output-printJuan Linietsky2017-11-172-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Make tool scripts print on the editor Output panel
| * | | | | | | | | | | | Add a print handler for the editor output panelGeorge Marques2017-11-162-0/+14
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #12982 from tagcup/aabb_renameRémi Verschelde2017-11-1715-59/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Rect3 to AABB.
| * | | | | | | | | | | | Rename Rect3 to AABB.Ferenc Arn2017-11-1715-59/+59
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12973.
* | / / / / / / / / / / Make resources edited by plugins be sent as referenceGeorge Marques2017-11-171-1/+5
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that a plugin can save a resource using the ResourceSaver.
* | | | | | | | | | | Merge pull request #12977 from YeldhamDev/create_node_relationshipsRémi Verschelde2017-11-171-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Enabling relationship lines in the Scene Tree enables them in the Create New Node dialog as well
| * | | | | | | | | | Enabling relationship lines in the Scene Tree enables them in the Create New ↵Michael Alexsander Silva Dias2017-11-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Node dialog as well.
* | | | | | | | | | | Merge pull request #12583 from volzhs/select-multiple-filesRémi Verschelde2017-11-172-1/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Not to be slow when select multiple files
| * | | | | | | | | | | Not to be slow when select multiple filesvolzhs2017-11-022-1/+17
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #12976 from Paulb23/scene_tree_add_undo_issue_6125Rémi Verschelde2017-11-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed scene tree updating when undo/redo root node creation, issue 6125
| * | | | | | | | | | | | Fixed scene tree updating when undoing root node creation, issue 6125Paulb232017-11-161-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #12971 from Chaosus/saveandrunscenefixRémi Verschelde2017-11-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix current scene run when scene saved
| * | | | | | | | | | | | | Fix current scene run when scene savedChaosus2017-11-161-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #12488 from djrm/pr_gridmap_fixesRémi Verschelde2017-11-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several improvements to GridMap.
| * | | | | | | | | | | | | | Several improvements to GridMap.Daniel J. Ramirez2017-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed crash when undoing. More ergonomic shortcuts. Fixed freelook navigation.
* | | | | | | | | | | | | | | Merge pull request #12970 from leezh/module_docsRémi Verschelde2017-11-161-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Added modules' doc files to make_doc_header
| * | | | | | | | | | | | | | Added modules' doc files to make_doc_headerZher Huei Lee2017-11-171-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were somehow never included. This fixes that.
* | | | | | | | | | | | | | | Merge pull request #12966 from SaracenOne/convcolRémi Verschelde2017-11-161-19/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Added 'convcol' flag for importing meshes as convex collision
| * | | | | | | | | | | | | | Added 'convcol' flag for importing meshes as convex collision and completed codeSaracen2017-11-161-19/+68
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for parsing collision flags to mesh data.
* | | | | | | | | | | | | | Add support for remote debug in scene tree.Juan Linietsky2017-11-152-0/+70
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Improve code style of generated headersRémi Verschelde2017-11-151-24/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | doc: Rename "@Global Scope" to "@GlobalScope"Rémi Verschelde2017-11-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spaces in filenames are evil.
* | | | | | | | | | | | | doc: Remove revision.module_config from version stringRémi Verschelde2017-11-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now "3.0-alpha" instead of "3.0.alpha.custom_build{,.mono}", limits unnecessary diffs.