aboutsummaryrefslogtreecommitdiff
path: root/editor
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18595 from AlexHoratio/script_pos_columnsRémi Verschelde2018-05-041-1/+14
|\ | | | | Script Editor now displays positional column
| * Script Editor now displays positional columnUnknown2018-05-031-1/+14
| | | | | | This solves #17931 and makes the script editor consistent with other text editors(Sublime, Gedit, Vim) in displaying the position rather than the raw number of characters.
* | Merge pull request #18601 from YeldhamDev/string_changesRémi Verschelde2018-05-042-55/+3
|\ \ | | | | | | Small changes for some strings
| * | Small changes for some strings.Michael Alexsander Silva Dias2018-05-032-55/+3
| | |
* | | Skeleton for 2D WIPJuan Linietsky2018-05-032-12/+65
|/ /
* | Merge pull request #16358 from JFonS/particlesgizmo_box_fixRémi Verschelde2018-05-032-4/+15
|\ \ | | | | | | ParticlesGizmo solid box now follows actual visibility_aabb position.
| * | ParticlesGizmo solid box now follows actual visibility_aabb position.JFonS2018-02-142-4/+15
| | |
* | | Merge pull request #16418 from bojidar-bg/15961-gdscript-array-exportRémi Verschelde2018-05-031-6/+18
|\ \ \ | | | | | | | | Allow exporting arrays of resources in GDScript
| * | | Allow exporting arrays of resources in GDScriptBojidar Marinov2018-02-051-6/+18
| | | | | | | | | | | | | | | | Fixes #15961
* | | | Remove unused duplicate wireframe shortcut, fixes #18067Robin Hübner2018-05-031-2/+0
| |_|/ |/| | | | | | | | It also happens to do nothing currently.
* | | Merge pull request #18552 from Falke117/trailingSpaceRémi Verschelde2018-05-032-2/+4
|\ \ \ | | | | | | | | Folder name with trailing space fix
| * | | Fix for Issue#18457 - Folder name with trailing space on WindowsFelix Yang2018-05-032-2/+4
| | | |
* | | | i18n: Sync translation templates with current sourceRémi Verschelde2018-05-0347-262/+2188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 056348a8c0ee065cb99e4f33da45525d69d6bcff) Note: Still syncing with the 3.0 code for now to allow updating translations in the 3.0 branch. We'll eventually switch Weblate to use the strings of the 3.1-dev branch once it is stable enough.
* | | | i18n: Sync translations with WeblateRémi Verschelde2018-05-0329-1752/+9642
| | | | | | | | | | | | | | | | (cherry picked from commit ddbe559c040d30cd145d3c572dbd3bc6c7664310)
* | | | Merge pull request #18451 from volzhs/node-nameRémi Verschelde2018-05-021-3/+4
|\ \ \ \ | | | | | | | | | | Check invalid node name
| * | | | Check invalid node namevolzhs2018-05-031-3/+4
| | | | |
* | | | | WIP Polygon2D weight editingJuan Linietsky2018-05-024-7/+428
| | | | |
* | | | | Merge pull request #18400 from groud/fix_lock_and_groupsRémi Verschelde2018-05-022-49/+59
|\ \ \ \ \ | | | | | | | | | | | | Fixes locks and groups on 2d editor
| * | | | | Fixes locks and groups on 2d editorgroud2018-05-022-49/+59
| | | | | |
* | | | | | Merge pull request #17059 from Jason0214/BugFix_favorite_updatingRémi Verschelde2018-05-023-22/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | Editor: update favorite dirs when dir got deleted
| * | | | | | remove favorited dirs if original dir deletedJason02142018-05-023-22/+45
| | | | | | |
* | | | | | | Merge pull request #17196 from RandomShaper/improve-gui-touchRémi Verschelde2018-05-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement universal translation of touch to mouse (3.1)
| * | | | | | | Implement universal translation of touch to mousePedro J. Estébanez2018-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now generating mouse events from touch is optional (on by default) and it's performed by `InputDefault` instead of having each OS abstraction doing it. (*) The translation algorithm waits for a touch index to be pressed and tracks it translating its events to mouse events until it is raised, while ignoring other pointers. Furthermore, to avoid an stuck "touch mouse", since not all platforms may report touches raised when the window is unfocused, it checks if touches are still down by the time it's focused again and if so it resets the state of the emulated mouse. *: In the case of Windows, since it already provides touch-to-mouse translation by itself, "echo" mouse events are filtered out to have it working like the rest. On X11 a little hack has been needed to avoid a case of a spurious mouse motion event that is generated during touch interaction. Plus: Improve/fix tracking of current mouse position. ** Summary of changes to settings: ** - `display/window/handheld/emulate_touchscreen` becomes `input/pointing_devices/emulate_touch_from_mouse` - New setting: `input/pointing_devices/emulate_mouse_from_touch`
* | | | | | | | Merge pull request #18338 from Zylann/fix_find_in_filesRémi Verschelde2018-05-021-8/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix Find in Files
| * | | | | | | Fix Find in Files:Marc Gilleron2018-05-011-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FileAccess was accessed null (remains of GDScript port) - `_current_file` wasn't going up correctly in case a scanned directory had no subdirectories - Paths stored in `_files_to_scan` were not full paths
* | | | | | | | Merge pull request #18259 from Superwaitsum/MoveIconsRémi Verschelde2018-05-021-6/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Changed Sprite Frame buttons for icons
| * | | | | | | Changed Sprite Frame move buttons for iconsSuperwaitsum2018-04-301-6/+20
| | | | | | | |
* | | | | | | | Merge pull request #18508 from AlexHolly/hide-tab-changed-debug-printRémi Verschelde2018-05-011-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | hide tab changed debug print
| * | | | | | | | hide tab changed debug printAlexander Holland2018-04-301-2/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #18291 from akien-mga/coverity-uninitialized-scalar-varRémi Verschelde2018-05-017-50/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Coverity reports of uninitialized scalar variable
| * | | | | | | | | Fix Coverity reports of uninitialized scalar variableRémi Verschelde2018-04-197-50/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes most current reports on Coverity Scan of uninitialized scalar variable (CWE-457): https://cwe.mitre.org/data/definitions/457.html These happen most of the time (in our code) when instanciating structs without a constructor (or with an incomplete one), and later returning the instance. This is sometimes intended though, as some parameters are only used in some situations and should not be double-initialized for performance reasons (e.g. `constant` in ShaderLanguage::Token).
* | | | | | | | | | Merge pull request #16502 from Paulb23/multi_group_editorRémi Verschelde2018-05-012-1/+502
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added multi group editor dialog, issue 13997
| * | | | | | | | | | Added multi group editor dialog, issue 13997Paulb232018-04-152-1/+502
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Adds z-index properties to TileSets.Pieter-Jan Briers2018-05-011-0/+1
| | | | | | | | | |
* | | | | | | | | | Revert "Added a more specific error message on export"Rémi Verschelde2018-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00c689d625d0243577c225612aa86aa6a85274c4. Reason: "Missing template" is just one possible explanation for `err` being != OK here, it does not make sense to hardcode it in the generic error message (and break translations doing so).
* | | | | | | | | | Merge pull request #18434 from YeldhamDev/animation_autoplay_fixRémi Verschelde2018-05-011-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed deleting an animation marked to autoplay in the editor affecting the creation of one with the same name
| * | | | | | | | | | Made the Pin button disable when no AnimationPlayer is selected.Michael Alexsander Silva Dias2018-04-271-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Fixed deleting an animation marked to autoplay in the editor affecting the ↵Michael Alexsander Silva Dias2018-04-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation of one with the same name.
* | | | | | | | | | | Merge pull request #18380 from groud/fix_spacebar_panningRémi Verschelde2018-05-012-40/+68
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes 2d editor panning not working
| * | | | | | | | | | | Fixes 2d editor panning not workinggroud2018-04-232-40/+68
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #18321 from Crazy-P/Fixes-logically-dead-codeRémi Verschelde2018-05-014-33/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes logically dead code (Coverity)
| * | | | | | | | | | | | Fixes logically dead code (Coverity)Crazy-P2018-04-214-33/+20
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes reported logically dead codes by Coverity * image.cpp: Doesn't really need any modification. But to remove the bug report then we have to move the MAX call away from the for loop statement. * rasterizer_gles3.cpp: Removes unnecessary elif condition since it is checked earlier in the function * collada.cpp: If stamement never reached due to macro ERR_CONTINUE does the same. * navigation_mesh.cpp: Variables should always be null - however, also checked for the very same condition in their function call. Leaving this for review (whether the function call is necessary or not) * path_editor_plugin.cpp: If cancel is true, then it should restore the edited value to the original provided. http://docs.godotengine.org/en/3.0/classes/class_editorspatialgizmo.html#class-editorspatialgizmo-commit-handle * spatial_editor_gizmos.cpp: the very condition of i >= 3 is predetermined in the if case right before it. Thus case 1 is always '1' and case 2 is always '-1' * grid_map_editor.cpp: Same as above in spatial_editor_gizmos.cpp * voxel_light_baker.cpp: Same as above in spatial_editor_gizmos.cpp * visual_server.cpp: Same as above in spatial_editor_gizmos.cpp * visual_script_expression.cpp: char '-' is already true in the switch case mechanism. Thus it can never reach to default case. * particles.cpp: Case 'PARAM_MAX' is unreachable due to index checking right before the switch execution. * shader_language.cpp: Invalid index is handled in switch default case. `type < TYPE_FLOAT && type > TYPE_VEC4` -> `(type < TYPE_FLOAT || type > TYPE_VEC4`) Fixes the "always false problem" in TODO comment.
* | | | | | | | | | | | Merge pull request #18373 from KidRigger/workingMax Hilbrunner2018-04-301-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces CTRL with CMD in TileMapEditor for MacOS.
| * | | | | | | | | | | | Replaces CTRL with CMD in TileMapEditor for MacOS.Anish2018-04-231-3/+12
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing CTRL with CMD makes sense dure to consistency with MacOS and avoiding conflict with the accessibility hotkey (ctrl+lmb = rmb) Fixes: #18238
* | | | | | | | | | | | Merge pull request #18381 from groud/fix_hard_to_select_node2dMax Hilbrunner2018-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes hard to select Node2D
| * | | | | | | | | | | | Fixes hard to select Node2Dgroud2018-04-231-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #18489 from Calinou/tweak-property-hint-rangesMax Hilbrunner2018-04-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak the property hint ranges of caret blink and line length guideline
| * | | | | | | | | | | | Tweak the property hint ranges of caret blink and line length guidelineHugo Locurcio2018-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for more precise adjustments.
* | | | | | | | | | | | | Merge pull request #18506 from AlexHolly/export-more-specific-error-messageMax Hilbrunner2018-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a more specific error message on export
| * | | | | | | | | | | | | Added a more specific error message on exportAlexander Holland2018-04-291-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |