aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9425 from Zylann/curve_iteration3Juan Linietsky2017-06-274-63/+97
|\ | | | | Fix curve saving, refined undo/redo
| * Fix curve saving, refined undo/redoMarc Gilleron2017-06-284-63/+97
|/
* Change default color of script editor text selectionRémi Verschelde2017-06-271-1/+1
| | | | Supersedes and closes #9388.
* Fix active plugins property nameGeorge Marques2017-06-271-1/+1
|
* Merge pull request #9404 from Zylann/curve_improvementJuan Linietsky2017-06-277-98/+308
|\ | | | | Curve improvement
| * Curve featuresMarc Gilleron2017-06-267-98/+308
| | | | | | | | | | | | - Ability to set tangents as linear - Indicative min and max values - CurveTexture doesn't need min and max anymore
* | docs: Correct xform descriptions in class_basismdraw2017-06-271-2/+2
| |
* | Merge pull request #9360 from GodotExplorer/pr-external-editor-language-checkRémi Verschelde2017-06-278-10/+49
|\ \ | | | | | | Better user experience with external text editors.
| * | Better user expirence with external text editors.geequlim2017-06-278-10/+49
| | | | | | | | | | | | | | | Implements open_in_external_editor for subclasses of ScriptLanguage. Add option 'Debug with external editor' to debug menu to control the behavoir of script opened by editor.
* | | Merge pull request #9413 from Noshyaar/pr-save1Rémi Verschelde2017-06-271-3/+1
|\ \ \ | | | | | | | | Clean up redundancy in scene save confirmation
| * | | Clean up redundancy in scene save confirmationPoommetee Ketson2017-06-271-3/+1
|/ / /
* | | -Fixed SCREEN_TEXTURE and other related 2D shader parameters.Juan Linietsky2017-06-2628-78/+200
| | | | | | | | | | | | -Fixded BackBuffercopy object
* | | Fix regression in dc1843201571707ee09f0592ef3b0cd4232c70b8Rémi Verschelde2017-06-271-1/+1
| | | | | | | | | | | | Closes #9407.
* | | Merge pull request #9402 from nunodonato/selectimportagainRémi Verschelde2017-06-271-2/+1
|\ \ \ | | | | | | | | Update import dock when editing a resource from the inspector
| * | | Update import dock when editing a resource from the inspector (improved version)Nuno Donato2017-06-261-2/+1
| | | | | | | | | | | | | | | | closes #8139. (just in case it wasn't closed well enough the first time :p)
* | | | Merge pull request #9195 from kubecz3k/obj-incoming-connectionsRémi Verschelde2017-06-272-0/+17
|\ \ \ \ | | | | | | | | | | Ability to get a list of signals that are targeting given object
| * | | | Ability to get a list of signals that are targeting objectJakub Grzesik2017-06-152-0/+17
| | | | |
* | | | | Merge pull request #9268 from BastiaanOlij/improve_defaultsRémi Verschelde2017-06-261-10/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | Align primitive defaults to default collision shape sizes
| * | | | Align primitive defaults to default collision shape sizesBastiaanOlij2017-06-191-10/+10
| | | | |
* | | | | Merge pull request #9296 from TwistedTwigleg/Camera2D_enhancements_V2Rémi Verschelde2017-06-262-18/+127
|\ \ \ \ \ | | | | | | | | | | | | Camera2D enhancements (V2)
| * | | | | Added some editor enhancements to Camera2D. Added the option to draw ↵TwistedTwigleg2017-06-252-18/+127
| | | | | | | | | | | | | | | | | | | | | | | | Camera2Ds bounds and drag margins. Added options to toggle the drawing of Camera2Ds lines in the editor. When a Camera2D is marked as current, its lines become a little less transparent.
* | | | | | Merge pull request #9304 from Noshyaar/pr-saveRémi Verschelde2017-06-263-73/+181
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | EditorNode: add Save/Discard/Cancel dialog
| * | | | | EditorNode: enhance save/quit dialogPoommetee Ketson2017-06-273-52/+79
| | | | | |
| * | | | | EditorNode: enhance quit dialogPoommetee Ketson2017-06-252-38/+90
| | | | | |
| * | | | | EditorNode: add Save/Discard/Cancel dialogPoommetee Ketson2017-06-252-26/+55
| | | | | |
* | | | | | Merge pull request #9347 from bojidar-bg/7312-quick-input-editRémi Verschelde2017-06-262-8/+123
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow input mappings to be edited
| * | | | | | Allow input mappings to be editedBojidar Marinov2017-06-252-8/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7312
* | | | | | | Merge pull request #9385 from toger5/theme_item_listRémi Verschelde2017-06-261-6/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | margins for item list
| * | | | | | | margins for item listtoger52017-06-261-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - without margins there are too little gaps on the left and the selecting looks weird - also changed the styles for selected and focus so they both have the same size
* | | | | | | | Merge pull request #9370 from bojidar-bg/c-9318-oneway-tilemapsRémi Verschelde2017-06-264-76/+181
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add one-way collisions and individual shape offsets for tilesets
| * | | | | | | | Add one-way collisions and individual shape offsets for tilesetsBojidar Marinov2017-06-254-76/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested in #9318 Accidentially fixes #2231 as well
* | | | | | | | | Merge pull request #9318 from bojidar-bg/readd-normal-tilemapRémi Verschelde2017-06-264-2/+29
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Add normal map to tilemaps and tilesets
| * | | | | | | | Add normal map to tilemaps and tilesetsBojidar Marinov2017-06-224-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9310
* | | | | | | | | Merge pull request #9401 from godotengine/revert-9400-revert-9379-regex_bind_fixRémi Verschelde2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Revert "Fixed RegEx::search missing return type hint""
| * | | | | | | | | Revert "Revert "Fixed RegEx::search missing return type hint""Rémi Verschelde2017-06-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9400 from godotengine/revert-9379-regex_bind_fixJuan Linietsky2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Fixed RegEx::search missing return type hint"
| * | | | | | | | | Revert "Fixed RegEx::search missing return type hint"Juan Linietsky2017-06-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9378 from nunodonato/selectimportRémi Verschelde2017-06-261-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update import dock when editing a resource from the inspector
| * | | | | | | | | Update import dock when editing a resource from the inspectorNuno Donato2017-06-251-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #9379 from leezh/regex_bind_fixRémi Verschelde2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed RegEx::search missing return type hint
| * | | | | | | | | | Fixed RegEx::search missing return type hintZher Huei Lee2017-06-261-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #9393 from leezh/regex_capture_fixesRémi Verschelde2017-06-261-9/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | RegEx fixes #9382
| * | | | | | | | | | Fixed inverted group thrown off by quantifiersZher Huei Lee2017-06-261-3/+4
| | | | | | | | | | |
| * | | | | | | | | | Fixes RegEx capture grabbing too much #9382Zher Huei Lee2017-06-261-6/+13
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorrect behaviour was caused when next->test was throwing off the results.
* | | | | | | | | | gitignore: Remove pre-.gen filenamesRémi Verschelde2017-06-261-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @Noshyaar was right to remove them in the first place, we need users with local clones to clean them up to prevent older .cpp files from being including by globbing.
* | | | | | | | | | ConeTwistJoint: Initialize 'm_angularOnly'.dotquixote2017-06-261-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #9384 from toger5/tree_bgcolor_draw_orderRémi Verschelde2017-06-261-16/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | tree fix drawing order for header and removed indentation for custom bg colours
| * | | | | | | | | | tree fix drawing order for header +toger52017-06-251-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - the collapse arrow gets drawn after the background so its not hidden underneath anymore - custom_bg_color no offset anymore
* | | | | | | | | | | Merge pull request #9383 from toger5/theme_margin_tree_fixRémi Verschelde2017-06-261-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | style box margins for Inspector and list.
| * | | | | | | | | | | style box margins for Inspector and list.toger52017-06-251-5/+7
| |/ / / / / / / / / /