Commit graph

810 commits

Author SHA1 Message Date
Juan Linietsky
81f62fb78c -Fix to progress dialog, speding it up
-Fix potential deadlock in stream player
-Fix collada to support broken files from ColladaMaya
2015-12-21 09:05:49 -03:00
Ariel Manzur
a5fe71a0e9 this failed in msvc, didn't in linux and mingw 2015-12-20 11:42:55 -03:00
Rémi Verschelde
bf5453e429 Remove padding in bottom HBoxContainer of scene tree dock
This way the new "Create new scene from node(s)" button does not make the bar overflow
2015-12-19 10:41:45 +01:00
Rémi Verschelde
ed1c4d83a6 Merge pull request #3090 from neikeq/fix_3088
Fix Remove Item option in TileSet plugin
2015-12-16 10:18:20 +01:00
Juan Linietsky
fb01d18251 small fix for undo redo 2015-12-16 00:42:34 -03:00
Juan Linietsky
d3cd1250bd added labels to sections and properties 2015-12-16 00:08:50 -03:00
Juan Linietsky
686c65a354 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-15 23:40:29 -03:00
Juan Linietsky
a1142225bf -split view of property editor and editor settings 2015-12-15 23:39:36 -03:00
Ignacio Etcheverry
d74c56289f Fix Remove Item option in TileSet plugin 2015-12-15 23:35:35 +01:00
Rémi Verschelde
08cab3a17a Merge pull request #3080 from akien-mga/pr-input-presets
Prevent deleting input presets as it does not work
2015-12-15 19:21:57 +01:00
Rémi Verschelde
9cb4798f6b Merge pull request #3083 from TheHX/pr-file-dialog
Add editor setting for display mode on file dialog and filesystem dock
2015-12-15 19:15:56 +01:00
Franklin Sobrinho
d9f4d3952d Add editor setting for display mode on file dialog and filesystem dock 2015-12-15 14:36:04 -03:00
Rémi Verschelde
87a415f275 Prevent deleting input presets as it does not work
Follow-up of #3076.
Now the only thing possible to do with input presets is to add/remove key bindings. It was already the case previously but it's now clearer in the UI.
2015-12-15 08:45:34 +01:00
Rémi Verschelde
69c79c0d4a Merge pull request #3076 from neikeq/rename_actions
Option to rename input actions
2015-12-14 23:33:06 +01:00
Ignacio Etcheverry
577bbcc6b3 Forbid renaming input presets 2015-12-14 22:36:53 +01:00
Ignacio Etcheverry
fa085a9c2c Added input actions renaming 2015-12-14 20:44:57 +01:00
Franklin Sobrinho
fd59d17b22 Avoid project manager from processing gamepad input 2015-12-14 16:31:37 -03:00
Ignacio Etcheverry
6e4b1ff838 Fix editor layouts broken after 9a7ff65 2015-12-14 16:44:15 +01:00
Rémi Verschelde
bfaa179e70 Merge pull request #3074 from neikeq/editor_layouts_patch
Editor layout dialog: name field grabs focus on popup
2015-12-14 14:26:25 +01:00
Juan Linietsky
4713bcccf3 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-14 10:25:19 -03:00
Ignacio Etcheverry
d558ced434 Editor layout dialog: name field grabs focus on popup 2015-12-14 14:16:29 +01:00
Rémi Verschelde
c262becd7b Merge pull request #3073 from TheHX/pr-editor-dialogs
Implement double-click on remaining dialogs
2015-12-14 13:22:35 +01:00
Franklin Sobrinho
12bfb55c6c Implement double-click on remaining dialogs 2015-12-14 08:43:56 -03:00
Juan Linietsky
f2183a5e09 replaced :var by :Variant in documentation, fixes #2897 2015-12-14 08:28:01 -03:00
Juan Linietsky
534c8e74b9 do not open dominant script if external editor is selected, fixes #3067 2015-12-14 08:21:18 -03:00
Rémi Verschelde
7155f75e22 Merge pull request #3061 from TheHX/pr-tree-dialogs
Double-click item for reparent and choose a node in NodePath dialog
2015-12-14 07:39:51 +01:00
Rémi Verschelde
55684dbea4 Merge pull request #3065 from TheHX/pr-array-editor
Fix array editor NodePath being relative to editor
2015-12-14 07:39:17 +01:00
Juan Linietsky
7f96f0603e -scenes are properly reloaded when a dependency changes, fixes #2896
(it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-13 20:39:01 -03:00
Juan Linietsky
72ff61963b fixed and improved selection and list selection, closes #2852 2015-12-13 17:16:13 -03:00
Juan Linietsky
95a469ad28 added binary API to StreamPeer, fixes #2863 2015-12-13 12:53:29 -03:00
Franklin Sobrinho
2e8ed75d8d Fix array editor NodePath being relative to editor 2015-12-13 11:42:29 -03:00
Franklin Sobrinho
4523a591d3 Double-click item for reparent and choose a node in NodePath dialog 2015-12-13 08:47:54 -03:00
Juan Linietsky
451b1d9144 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-13 08:01:14 -03:00
Juan Linietsky
450926693f fix zip export 2015-12-13 07:50:07 -03:00
Rémi Verschelde
cdf07327bc Merge pull request #3045 from TheHX/pr-nav-mesh
Fix crash caused by a empty NavigationMesh
2015-12-13 10:10:49 +01:00
Rémi Verschelde
8c005e2b73 Merge pull request #3047 from eska014/fix-play-project-button
Fix "Play Project" button icon
2015-12-13 10:10:08 +01:00
Rémi Verschelde
3e733afaaa Merge pull request #3053 from TheHX/pr-revert-3043
Remove last remaining variables of PR-3043
2015-12-13 10:09:23 +01:00
Juan Linietsky
709de124c1 ability to export scene to zip 2015-12-13 01:08:36 -03: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
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
Franklin Sobrinho
493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
Rémi Verschelde
20efb48101 Moved subscene creation from scene menu to an icon on the scene dock
Based on @Fiona's PR #2220.
The previous "subscene" concept is also renamed to "new scene", as those subscene are just like regular scenes.
2015-11-27 21:42:48 +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
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
daf3182442 Revert "Ignore alpha materials in baked light ray-tracer." 2015-11-19 00:50:25 -03:00
Juan Linietsky
068b177c12 Merge pull request #2292 from blackwc/can_export
Improve export validation
2015-11-19 00:35:04 -03:00
Juan Linietsky
a0564efb65 Merge pull request #2349 from neikeq/dock_patch
Hide right UR and BR dock slots by default
2015-11-19 00:31:09 -03:00
Juan Linietsky
9a7769f194 Merge pull request #2444 from TheHX/issue_2117
Fix for problem when drawing CollisionPolygon when parented (#2117)
2015-11-19 00:23:17 -03:00
Juan Linietsky
fe449a6235 Merge pull request #2445 from TheHX/issue_2113
Possible fix for crash on replacing Path2D node (#2113)
2015-11-19 00:22:53 -03:00
Juan Linietsky
2dac9ab2ef Merge pull request #2447 from TheHX/issue_1275
Fix crash after undo when editing Polygon2D (#1275)
2015-11-19 00:21:46 -03:00
Juan Linietsky
6a3484260d Merge pull request #2451 from PeaceSells50/FixForFilesystemAdd
Fixed bug with adding an instance from the FIleSystem dialog.
2015-11-19 00:20:54 -03:00
Juan Linietsky
ea035f308b Merge pull request #2644 from Ovnuniarchos/BBCodeDocs
BBCode is now allowed anywhere in the inline documentation.
2015-11-19 00:07:32 -03:00
Juan Linietsky
6a7ae77847 Merge pull request #2696 from AlexHolly/restart-feature-on-running
replay on play if already playing for scene and main + switch icon to…
2015-11-19 00:06:34 -03:00
Juan Linietsky
33aa019e4f Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation
Visual studio 2015 compilation
2015-11-18 23:56:06 -03:00
Juan Linietsky
3118c192bd Merge pull request #2786 from neikeq/node_select_menu
Added selection menu to spatial and canvas editors
2015-11-18 23:46:46 -03:00
Ovnuniarchos
a9a330645b Merge branch 'master' into BBCodeDocs 2015-11-19 01:19:19 +01:00
neikeq
f84dc8e59d Added selection menu to spatial and canvas editors 2015-11-19 00:19:00 +01:00
Juan Linietsky
94fdd01241 Merge pull request #2702 from TheHX/fix_align_with_view
Fix 3D editor align with current view
2015-11-18 19:58:52 -03:00
Juan Linietsky
0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Juan Linietsky
fce4c6eecb Merge pull request #2716 from SaracenOne/animation_saving_fix
Added missing saving support to animation editor.
2015-11-18 19:35:57 -03:00
Juan Linietsky
ba9ebe6b03 Merge pull request #2717 from SaracenOne/light_baker_transluscent
Ignore alpha materials in baked light ray-tracer.
2015-11-18 19:35:42 -03:00
Juan Linietsky
18ab04c102 Merge pull request #2812 from eska014/split-anim-tracks-button
Split up AnimationPlayer tracks editor `Tracks` button
2015-11-18 19:25:16 -03:00
Juan Linietsky
3b2c25e77d Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-library
Added tooltip for a few buttons in sample library editor
2015-11-18 19:21:29 -03:00
Juan Linietsky
551925475b Merge pull request #2626 from TheHX/editor_dialogs
Small fixes in some editor dialogs
2015-11-18 19:17:55 -03:00