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

783 commits

Author SHA1 Message Date
reduz 9d9520f227 Merge branch 'master' of https://github.com/okamstudio/godot 2015-12-26 10:27:04 -03:00
reduz 13964f59c1 -Added table support to RichTextLabel 
-Made help more readable, closes #2851
 2015-12-26 10:25:17 -03:00
hondres b431c88146 Colorize Rect2 and NodePath in script editor 2015-12-24 04:20:26 +01:00
Juan Linietsky 15429d6ac9 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-21 09:07:06 -03:00
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 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 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
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
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