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

791 commits

Author SHA1 Message Date
Juan Linietsky 709de124c1 ability to export scene to zip 2015-12-13 01:08:36 -03:00
Rémi Verschelde aeb5ea5934 Move documentation python tools to doc/tools folder 2015-12-12 23:30:45 +01:00
Juan Linietsky bbb2a863f9 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-12 19:22:16 -03:00
Juan Linietsky 9f75dd086e no more time error, fixes #2892 2015-12-12 19:21:43 -03:00
Franklin Sobrinho df57239f7f Remove last remaining variables of PR-3043 2015-12-12 18:15:31 -03:00
Juan Linietsky 97fe073f33 Merge pull request #2933 from TheHX/pr-shader-loader 
Fix shader loading, making possible load .shd and .sgp from editor
 2015-12-12 17:36:52 -03:00
Juan Linietsky 5abe431361 better support for broken collada, fixes #2959 2015-12-12 14:55:16 -03:00
Franklin Sobrinho 3dead22454 Fix crash caused by a empty NavigationMesh 2015-12-12 14:06:27 -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
eska 829fa0cfdc Fix "Play Project" button 2015-12-08 19:33:50 +01: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
Franklin Sobrinho 1138103c63 Fix shader loading, making possible load .shd and .sgp from editor 2015-11-27 21:11:20 -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
Franklin Sobrinho 493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
Rémi Verschelde 0fd20e1002 Update copyright header in ios xcode templates 2015-11-27 19:34:55 +01:00
Rémi Verschelde 55d56d9b7c Replace hardcoded references to Okam Studio by Godot Engine 
Since the engine development is now independent.
Fixes #2836.
 2015-11-27 18:54:09 +01:00
Rémi Verschelde d1a07ee28b Merge pull request #2891 from TheHX/fix_matrix_property 
Fix property editor Matrix3 and Matrix32 editing
 2015-11-26 23:38:21 +01:00
Rémi Verschelde f8b8f7b873 Merge pull request #2912 from TheHX/pr-mesh-import-plugin 
Better import mesh warnings
 2015-11-25 14:41:41 +01:00
Franklin Sobrinho adf082a006 Better import mesh warnings 2015-11-25 10:28:46 -03:00
neikeq dc9ddfc6a0 Editor layouts menu 2015-11-25 13:28:41 +01:00
Rémi Verschelde d909942f25 Merge pull request #2895 from TheHX/oneshot_connection 
Add ability to set oneshot connection from Editor
 2015-11-25 08:50:54 +01:00
Rémi Verschelde 868a5a5be1 Merge pull request #2910 from est31/export_error_on_headless 
Print errors  to console when exporting
 2015-11-25 08:07:35 +01:00
Rémi Verschelde 7aa2a2e62c Merge pull request #2909 from neikeq/imp_2908 
Put 2D, 3D and Script editor table indexes in enum
 2015-11-25 07:24:58 +01:00
est31 5dc9770feb Print errors to console when exporting 
Now you the errors when exporting via godot server binary.
When exporting via non-headless godot, it is useful to have the error
on the console as well.

Also exit and print a list of valid export platforms when
the supplied platform was not found.
 2015-11-25 06:50:08 +01:00
neikeq 8d97eef0fe Put 2D, 3D and Script editor index in enum 
To avoid invalid index out of bounds mistakes.
 2015-11-25 00:46:44 +01:00
Rémi Verschelde a1059e3e3e Merge pull request #2908 from neikeq/fix_editor_select 
Fix bugs caused by merged Script and Help tabs
 2015-11-25 00:25:55 +01:00
neikeq 06957a8026 Fix Class Reference request from Inspector 2015-11-25 00:08:39 +01:00
neikeq bfe8df27bc Fix switching between 2D/3D/Script 2015-11-25 00:07:32 +01:00
Rémi Verschelde 5db398f67f Merge pull request #2907 from neikeq/fix_2887 
Fix Class Search dialog not showing
 2015-11-24 23:55:44 +01:00
neikeq 660e831e36 Fix Class Search dialog not showing up 2015-11-24 23:03:51 +01:00
neikeq c591293718 Remember last help search 2015-11-24 22:33:26 +01:00
Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	main/main.cpp
 2015-11-24 10:52:41 -03:00
Juan Linietsky ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional 
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
 2015-11-24 10:42:05 -03:00
Rémi Verschelde 96115ac975 Merge pull request #2872 from akien-mga/pr-load-main-scene 
Load main scene if defined when running editor from the command line
 2015-11-24 09:35:28 +01:00
Franklin Sobrinho e6047912fe Add ability to set oneshot connection from Editor 2015-11-23 17:38:15 -03:00
neikeq 62b9659c41 Import Sub-Scene as root's child if no node is selected 2015-11-23 20:22:42 +01:00
Franklin Sobrinho 2db2dd66de Fix property editor Matrix3 and Matrix32 editing 2015-11-23 15:34:54 -03:00
neikeq 0017c368c2 Allow selecting CanvasLayer children in canvas editor 2015-11-23 19:17:01 +01:00
Franklin Sobrinho 354bc0385b Add StaticBody collision generation for all selected MeshInstance nodes 2015-11-22 20:08:50 -03:00
Rémi Verschelde f99b630993 Load main scene if defined when running editor from the command line 
If no main scene is defined, or if it's an empty string, the previous behaviour will still be used, i.e. launch the project manager.
A small fix was also added not to maximize the window when opening the project manager via -editor (i.e. "godot" and "godot -e" will behave the same when no project is in the path).

Fixes #2869.
 2015-11-22 17:36:03 +01:00
Franklin Sobrinho e956677f44 Better PropertyEditor search 2015-11-22 13:05:55 -03:00
Franklin Sobrinho 82c8190013 Implement name filter to PropertyEditor 
- Add search bar to Inspector tab and to Project and Editor settings dialog
 2015-11-21 13:42:15 -03:00
Juan Linietsky cf3ae61a7f Merge pull request #2825 from StraToN/fix-tabclose-confirmation 
Ask confirmation on closing a scene tab
 2015-11-20 08:17:53 -03:00
eska fa12ab8f02 Fix help display 2015-11-20 01:12:29 +01:00
Juan Linietsky f858adf150 -small fix to avoid warnings 2015-11-19 20:24:43 -03:00
Juan Linietsky 06d842566c Merge pull request #2830 from Ovnuniarchos/ShapeLine2DXPolygonEditor 
Corrections to #2808 (2D shapes editor update)
 2015-11-19 19:35:18 -03:00
Juan Linietsky dccbd3b4f8 Merge pull request #2831 from neikeq/select_menu_patch 
Show select menu on button pressed (instead of released)
 2015-11-19 19:34:50 -03:00
Alexander Holland 5ee443bcc0 fix with refactoring, refrash re-run icon 2015-11-19 21:06:49 +01:00
Ovnuniarchos 1396ae274a get_handle_value implemented for LINE_SHAPE. Normal length normalized. 2015-11-19 16:13:45 +01:00
neikeq 6b0423b191 Show select menu on button pressed (instead of released) 2015-11-19 15:47:04 +01:00
Juan Linietsky b7a1599845 removed iconv dependency from pe_bliss 2015-11-19 11:15:32 -03:00
Juan Linietsky fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/export/export.h
 2015-11-19 10:44:13 -03:00
Juan Linietsky d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Julian Murgia - StraToN 6d20ded6d7 Ask confirmation on closing a scene tab 2015-11-19 14:15:17 +01:00
Juan Linietsky 232b1a3fef Merge pull request #2822 from kurikaesu/master 
HTTPClient docs & request functionality + fixes
 2015-11-19 09:18:09 -03:00