Commit graph

2722 commits

Author SHA1 Message Date
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
Ariel Manzur
6c3c20fc35 compile thing 2015-12-16 02:40:02 -03: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
Juan Linietsky
035bb03331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-15 09:19:00 -03:00
Juan Linietsky
b12a2f456c -fixes to theora video ending sooner than expected, fixes #3066 2015-12-15 09:17:32 -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
Rémi Verschelde
79ad04d6af Merge pull request #3078 from TheHX/pr-project-manager
Avoid project manager from processing gamepad input
2015-12-14 23:13:23 +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
Rémi Verschelde
566f8da3cc Merge pull request #3036 from slapin/animation-tree-player
Fix non-looping animations not being reset properly in AnimationTreePlayer
2015-12-14 20:02:01 +01:00
Rémi Verschelde
9e9e4f96a2 Merge pull request #3051 from eska014/add-export-hints
Add GDScript export hints for named bit flags, exponential ranges and global filesystem
2015-12-14 17:40:57 +01:00
eska
897cf2140c Add GDScript export hint for named bit flags
Syntax: `export( int, FLAGS, "A Flag", "Another Flag" ) var flags`
2015-12-14 17:32:31 +01:00
Rémi Verschelde
89629d35bb Merge pull request #3075 from neikeq/fix_editor_layouts
Fix editor layouts broken
2015-12-14 16:46:52 +01:00
Ignacio Etcheverry
6e4b1ff838 Fix editor layouts broken after 9a7ff65 2015-12-14 16:44:15 +01:00
Ariel Manzur
27e4c87869 no need to revert this actually 2015-12-14 11:10:16 -03:00
santiagopf
a9795d5826 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-14 10:58:26 -03: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
Juan Linietsky
83e0e97214 -implement arrows on tabs, when too many tabs are present, fixes #2806 2015-12-14 10:24:28 -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
Juan Linietsky
1312df7fdc implement point cloud function using convex hull for ConvexPolygonShape2D, fixes #2848 2015-12-14 09:06:53 -03: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
Ovnuniarchos
89efebbf56 New and corrected are override modes. 2015-12-14 02:56:49 +01:00
santiagopf
c8077de714 utf stuff on osx 2015-12-13 22:21:49 -03: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
7c39ebd05c -hash dictionaries properly instead of using pointer, fixes #2880 2015-12-13 15:20:58 -03:00
Juan Linietsky
39f345a9ae -deprecated pcz, replaced by just zip. Closes #2879 2015-12-13 14:15:55 -03:00
Juan Linietsky
a537c3ca34 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-13 12:56:04 -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
Juan Linietsky
8cec1b6544 Merge pull request #3052 from akien-mga/pr-cleanup-doc
Remove some outdated documentation and files
2015-12-13 09:56:41 -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