maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
19864 commits 10 branches 35 tags 1.1 GiB
Commit graph

3853 commits

Author SHA1 Message Date
Siddharth 13ead635d9 Merge branch 'master' of https://github.com/godotengine/godot into issue1 2019-03-23 20:09:08 +05:30
Siddharth 2d995372d8 Updated tile_set_editor_plugin.cpp And area.cpp# This is a combination of 2 commits. 
Updated tile_set_editor_plugin.cpp And area.cpp

Updated with clang-format

Updated tile_set_editor_plugin.cpp And area.cpp
 2019-03-23 20:03:59 +05:30
Pedro J. Estébanez 9c3ddf05cb Revert accidental commits 
This reverts commit fb37284c02.
This reverts commit 4db0f51b9a.
 2019-03-20 21:43:55 +01:00
Pedro J. Estébanez 4db0f51b9a Create live view dock [wip] 2019-03-20 20:44:43 +01:00
Paulb23 6f6d4a6c2e Fix script editor attempting to set current line to -1 on script open 2019-03-17 20:02:05 +00:00
Rémi Verschelde df7d3708c5
Merge pull request #27145 from YeldhamDev/editfilediag_favrm_remove 
Remove unused 'fav_rm' ToolButton in EditorFileDialog
 2019-03-16 17:07:15 -07:00
Michael Alexsander Silva Dias 579fffd97e Remove unused 'fav_rm' ToolButton in EditorFileDialog 2019-03-16 20:30:06 -03:00
Rémi Verschelde 3f631c2567
Merge pull request #27130 from akien-mga/editor-theme-hint-typo 
Fix misplaced hint for interface/theme/accent_color
 2019-03-16 14:26:45 -07:00
Rémi Verschelde e5a310cd38
Merge pull request #25782 from hsandt/feature/fix-toggle-comment-indent 
Feature/fix toggle comment indent
 2019-03-16 11:17:47 -07:00
Rémi Verschelde 43f147b5aa
Merge pull request #26308 from bojidar-bg/11722-meshlibrary-transforms 
Consider StaticBody and NavMesh position when converting to a MeshLibrary
 2019-03-16 11:15:15 -07:00
Rémi Verschelde c1fae20400
Merge pull request #26706 from YeldhamDev/multinode_scriptclear_fix 
Fix clearing scripts while multiple nodes are selected
 2019-03-16 11:09:40 -07:00
Rémi Verschelde 8965ff90ca
Merge pull request #26919 from jabcross/master 
Implement source lookup for class_name defined classes
 2019-03-16 11:06:34 -07:00
Rémi Verschelde ffd115dd6f
Merge pull request #26935 from qarmin/show_class_name_icon_in_tabs 
Show in tabs custom class icons
 2019-03-16 11:04:03 -07:00
Rémi Verschelde b17c8c0396 Fix misplaced hint for interface/theme/accent_color 
Supersedes #26992.
 2019-03-16 11:00:32 -07:00
Rémi Verschelde 06ebf4c3ad
Merge pull request #27123 from bojidar-bg/27113-rename-action 
Fix renaming actions in the Project settings
 2019-03-16 10:55:01 -07:00
Rémi Verschelde 18fa1846ea
Merge pull request #27115 from Janglee123/master 
Fix toggling snap mode while transforming the Spatial object
 2019-03-16 10:54:44 -07:00
Bojidar Marinov 699a3957ce
Fix renaming actions in the Project settings 
Fixes #27113, a regression from 6daed7d122
 2019-03-16 16:28:03 +02:00
janglee123 05446e8b53 fixed toggelling snap mode while transforming 2019-03-16 13:45:39 +05:30
Michael Alexsander Silva Dias ebabb0ea65 Make bottom panel only try to hide editors when they're visible 2019-03-16 03:39:49 -03:00
Rémi Verschelde cad371dd85
Merge pull request #26945 from shartte/allow-fewer-viewports-in-editor-state 
Be more tolerant about under-defined spatial viewport state
 2019-03-13 20:11:24 +01:00
Rémi Verschelde 04b04555d1 i18n: Sync translations with Weblate 2019-03-12 16:57:43 +01:00
Sebastian Hartte 7bab7fd777 Don't crash when the saved editor state contains fewer viewports than currently supported. 2019-03-12 12:17:17 +01:00
Rémi Verschelde 6d86450a83
Merge pull request #26941 from JFonS/add_gizmos_priority 
Add priority to gizmos and fix small issues
 2019-03-12 01:19:39 +01:00
JFonS 2658e5d03d Add priority to gizmos and fix small issues 
User defined gizmos will haave higher preference than editor gizmos by
default. Also fixed some inconsistencies in the gizmos menu when using
custom gizmos.
 2019-03-12 00:30:50 +01:00
qarmin 825a870f06 Show in tabs non default class icons 2019-03-11 22:54:23 +01:00
Pedro Ciambra e8fe174616 Implement source lookup for class_name defined classes 
Previous to this, classes defined with class_name had no
behavior when ctrl-clicked in the editor.

Fixes #26882
 2019-03-11 12:52:17 -03:00
Anish d6e4a08c61 Prevents a Null Reference in deleting Animations. 
A null Animation would cause a crash by accessing restricted memory.
Solved by checking if the animation track is null before using the
animation.

Fixes: #26829
 2019-03-11 17:04:02 +05:30
Rémi Verschelde 43184375b2 i18n: Sync translation template with current source 2019-03-10 11:04:59 +01:00
Rémi Verschelde 9a2fdef1fa i18n: Sync translations with Weblate 2019-03-10 11:03:26 +01:00
Rémi Verschelde 03664e26c5
Merge pull request #26687 from QbieShay/hang_server_build_fix 
Removed the resource preview thread from the server build
 2019-03-09 22:59:24 +01:00
Rémi Verschelde 0d728123c6
Merge pull request #26818 from vnen/class_name-inheritance 
Allow class_name scripts to have nested inheritance
 2019-03-09 14:27:43 +01:00
George Marques 25f9aee005
Allow class_name scripts to have nested inheritance 2019-03-09 00:47:27 -03:00
Juan Linietsky 95c6d9caba Fix crash in texture previeer, closes #26749, probably others 2019-03-08 14:18:12 -03:00
Rémi Verschelde a38bf5287a
Merge pull request #26781 from YeldhamDev/editfilediag_favdir_fix 
Fix "Favorite" button not being toggled when navigating to a faved folder manually
 2019-03-08 08:26:55 +01:00
qarmin 8c4051819e Fix error when trying to enter to folder/node directly via address bar 2019-03-08 06:15:42 +01:00
Michael Alexsander Silva Dias ec1c879746 Fix "Favorite" button not being toggled when navigating to a faved folder manually 2019-03-07 21:48:12 -03:00
Juan Linietsky 9af7fa193f Do not annoy unrelated textures with texture editor. 2019-03-07 13:54:05 -03:00
Rémi Verschelde b38f44e177
Merge pull request #26758 from qarmin/fix_error_dragging_empty_script_editor 
Fix error when dragging empty script list in Script Editor
 2019-03-07 17:40:42 +01:00
Juan Linietsky b376273f1b Force inspector to clean up on delete, fixes crash. 2019-03-07 12:39:53 -03:00
Juan Linietsky 6cb841edcb Ensure ETC2 textures are ALSO compressed to Po2 when have mipmaps. Fixes #26733 2019-03-07 12:16:20 -03:00
qarmin 7837276597 Fix error when dragging empty script list in Script Editor 2019-03-07 16:09:02 +01:00
Rémi Verschelde 2f2fa8db69
Merge pull request #26722 from MarianoGnu/fix_24238 
TileSetEditor: Don't draw invalid occlusion shapes. Fixes #24238
 2019-03-06 20:58:05 +01:00
Mariano Suligoy 6c08f4ea4e TileSetEditor: Don't draw invalid occlusion shapes. Fixes #24238 2019-03-06 15:31:16 -03:00
Michael Alexsander Silva Dias 73aaf06be7 Cleanup relationship line coding after 5f079e2 2019-03-06 14:33:26 -03:00
Juan Linietsky 6eac688952 Don't hide/show top editor if they did not change, fixes #26644 2019-03-06 12:42:01 -03:00
Juan Linietsky 5f079e2ef9 -Make tileset and meshlibrary edit in a separate inspector, fixes #26671 
-Made relationship lines appear based on theme settings, not previous hack
-Fix drawing of relationship lines (was broken)
-Fix double initialization of theme settings
 2019-03-06 12:12:42 -03:00
Rémi Verschelde 4d099e901b
Merge pull request #26705 from volzhs/fix-export 
Fix directory check when exporting project
 2019-03-06 15:31:42 +01:00
Juan Linietsky 9b5c6f539b Safer way to update animation if changed, fixes #26670 2019-03-06 10:22:38 -03:00
Michael Alexsander Silva Dias d3042d162d Fix clearing scripts while multiple nodes are selected 2019-03-06 09:58:47 -03:00
Juan Linietsky 4dd99701b0 Fix how settings change, closes #26692 2019-03-06 09:25:19 -03:00