Commit graph

733 commits

Author SHA1 Message Date
Juan Linietsky
9f75dd086e no more time error, fixes #2892 2015-12-12 19:21:43 -03:00
Juan Linietsky
5abe431361 better support for broken collada, fixes #2959 2015-12-12 14:55:16 -03:00
Juan Linietsky
e19f176765 fix broken merge 2015-12-12 10:21:22 -03:00
Juan Linietsky
a2d817405e Merge branch 'master' of https://github.com/godotengine/godot 2015-12-12 10:14:13 -03:00
Juan Linietsky
cd4c3f4d12 -added option to keep debugger open, fixes #3031 2015-12-12 10:09:50 -03:00
Franklin Sobrinho
4d644ca997 Script debugger remains visible when using Debug->Show Debugger 2015-12-12 10:04:51 -03:00
Juan Linietsky
990690f9f5 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-11 09:38:41 -03:00
Juan Linietsky
fbda3c5d88 -remove (can be added back in editor settings) icons from property editor
-remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 09:37:34 -03:00
Rémi Verschelde
964a57cb2a Merge pull request #2883 from TheHX/mesh_editor_plugin
Add StaticBody collision generation for all selected MeshInstance nodes
2015-12-10 15:19:30 +01:00
Rémi Verschelde
2d84943a2b Merge pull request #3027 from TheHX/pr-project-manager-font
Fix project manager not picking up custom font
2015-12-09 16:45:45 +01:00
Franklin Sobrinho
c2ce39c424 Fix project manager not picking custom font 2015-12-09 12:35:20 -03:00
Juan Linietsky
aadced2f72 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-09 09:10:00 -03:00
Juan Linietsky
6bc6b8fcf2 -ability to change scripts in external editor and still have properties reloaded in godot UI, fixes #3003 2015-12-09 09:08:41 -03:00
Rémi Verschelde
efbb834936 Merge pull request #2986 from TheHX/pr-shader-editor
Fix shader editor focus when switching tabs
2015-12-09 07:48:51 +01:00
Juan Linietsky
88c653a9e5 -made it add the node name from the file, closes #3010 2015-12-08 18:35:42 -03:00
Juan Linietsky
c26f66abde Merge pull request #2873 from neikeq/editor_layouts
Editor layouts menu
2015-12-08 17:09:38 -03:00
Juan Linietsky
f93fbbe1d2 Merge pull request #2888 from TheHX/item_list_plugin
Make ItemListEditor plugin functional
2015-12-08 17:07:32 -03:00
Juan Linietsky
ee09c5dbd9 Merge pull request #2919 from TheHX/pr-groups-editor
Update Groups Editor
2015-12-08 17:07:05 -03:00
Juan Linietsky
eff81965af Merge pull request #2956 from est31/add_system_wide_export_path
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
Juan Linietsky
9637460331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 11:23:23 -03:00
Juan Linietsky
3c33b705d1 added option to add_child, to use the same deduplication convention as in the editor, closes #3017 2015-12-08 11:21:12 -03:00
Franklin Sobrinho
97a3fa3f12 Fix shader editor focus when switching tabs 2015-12-06 20:11:56 -03:00
Franklin Sobrinho
42eef3cdc6 Better hidden folders display preferences for editor file dialogs 2015-12-06 19:35:31 -03:00
Franklin Sobrinho
b3ce127e31 Script Editor: maintain cursor column after duplicate a line 2015-12-06 15:34:09 -03:00
Franklin Sobrinho
118f3cdcf6 Update Groups Editor 2015-12-06 11:02:35 -03:00
Juan Linietsky
3ecc9e07b7 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-05 14:19:19 -03:00
Juan Linietsky
200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
Rémi Verschelde
98c54827ae Merge pull request #2989 from StraToN/2967fix_button_breaklines
Set default destination filename of imported font
2015-12-04 22:32:44 +01:00
Rémi Verschelde
96a39edeaf Merge pull request #2990 from neikeq/file_dialog_refresh
Add refresh button to file dialogs
2015-12-04 22:29:46 +01:00
neikeq
71eaa2d547 Add refresh button to file dialogs 2015-12-04 19:33:30 +01:00
Julian Murgia - StraToN
6ffe1fff2d Set default destination filename of imported font to be input font filename
if destination filename was ".fnt" (ie. no filename set by user)
2015-12-04 19:29:27 +01:00
neikeq
a5947161ef Fix 'Save Scene' doing nothing on new scenes 2015-12-04 16:51:36 +01:00
Juan Linietsky
35fa048af5 missing pngs 2015-12-04 10:22:45 -03:00
Juan Linietsky
bb392bde16 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-04 10:19:58 -03:00
Juan Linietsky
da113fe40d -Upgraded webp to a MUCH newer version. Hoping it fixes some bugs in the process. Keeping old version just in case for now.
-Added ability to convert xml and tscn scenes to binary on export, makes loading of larger scenes faster
2015-12-04 10:18:28 -03:00
Franklin Sobrinho
d6d335f20c Make ItemListEditor plugin functional 2015-12-03 15:17:56 -03:00
Franklin Sobrinho
868832bca7 Fix editor crash after closing scene with certain types of nodes 2015-12-03 12:42:58 -03:00
Rémi Verschelde
7ac31a7209 Merge pull request #2969 from neikeq/fix_bracket_complete
Fix auto bracket completion disabled on newly open scripts
2015-12-01 21:01:48 +01:00
Rémi Verschelde
7b9dd1ea76 Merge pull request #2968 from neikeq/line_duplicate
Fix script editor not clonning down last line
2015-12-01 21:01:05 +01:00
neikeq
fc7e313074 Fix script editor not clonning down last line 2015-12-01 19:43:51 +01:00
neikeq
4cbabf9691 ScriptTextEditor: fix auto bracket completion not enabled 2015-12-01 17:43:18 +01:00
Rémi Verschelde
f1f3468f70 Merge pull request #2890 from neikeq/cl_select_children
Allow selecting CanvasLayer children in canvas editor
2015-12-01 11:20:48 +01:00
est31
e1d02e4831 Make the setting unix-only.
For this, put the detection into the OS class and its subclass.
2015-11-30 02:35:59 +01:00
est31
15f6d3cebf Add way to look for templates at system wide level too
Useful for everybody wanting to package godot.
Fixes #1026.

-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
2015-11-30 01:36:08 +01:00
koalefant
c93a005fb6 Script Editor: automatic indentation after a colon 2015-11-29 17:13:29 +01:00
Juan Linietsky
46c5fda91d -orphan resource explorer dialog + tools menu 2015-11-29 01:08:31 -03:00
Juan Linietsky
68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky
7aa39b7cae -Fixed bug with scene inheritance, should work again
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
Franklin Sobrinho
553ec52300 Fix message - ERROR: get_path: Condition ' !is_inside_tree() ' is true - when closing the editor 2015-11-28 16:58:10 -03:00
Rémi Verschelde
274b17b636 Merge pull request #2932 from TheHX/pr-editor-help-scroll
Fix editor help scroll to result
2015-11-28 00:15:02 +01:00