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

1453 commits

Author SHA1 Message Date
Mariano Suligoy bcfb0a09f8 Implement auto-tiling 2017-11-20 06:27:47 -03:00
Rémi Verschelde 91349290dc
Merge pull request #12717 from NathanWarden/material_import_fix 
Fixed a bug where materials and/or meshes weren't assigned to scene on first import.
 2017-11-20 09:13:36 +01:00
Rémi Verschelde 3dad0ce8f4
Merge pull request #12942 from sersoong/master-test 
3.0 - add open feture to dependency_editor.cpp(View Owner..)
 2017-11-20 09:12:14 +01:00
Rémi Verschelde 7b5c447301
Merge pull request #12952 from bojidar-bg/12392-export-enums 
Allow exporting enums from GDScript
 2017-11-20 09:11:46 +01:00
Rémi Verschelde 6d105aba9a
Merge pull request #12983 from ianb96/scene_add_tab 
Add Scene button and tab scrolling
 2017-11-20 09:11:31 +01:00
Rémi Verschelde 7f52db75c6
Merge pull request #13008 from Chaosus/assetstorefixes 
Few fixes for asset store browser
 2017-11-20 09:10:13 +01:00
Rémi Verschelde cab1a67fc3
Merge pull request #13075 from sersoong/master-test3 
[3.0] - Add close other tabs to Script Editor
 2017-11-20 09:04:57 +01:00
Rémi Verschelde 49a73182d3
Merge pull request #13041 from RandomShaper/unify-node-duplicate 
Let SceneTreeDock duplicate nodes via Node::duplicate()
 2017-11-20 08:59:40 +01:00
Rémi Verschelde 83e7287752
Merge pull request #13053 from akien-mga/methods-mkstr 
Remove need to _MKSTR version strings and rename "revision" to "build"
 2017-11-20 08:54:19 +01:00
sersoong 66f6a8b4b5 Add close other tabs to Script Editor 2017-11-20 15:06:52 +08:00
Chaosus f88f8e1a4a Few fixes for asset store browser 2017-11-20 10:01:40 +03:00
Rémi Verschelde d3889ad1b4 EditorSettings: Dehardcode major in config file name 
It was readded in panic after I mistakenly removed the hardcoded "-3" in #12988,
forgetting that Windows would still use the same path and thus conflict with 2.1
(contrarily to macOS and Linux).
 2017-11-20 07:40:06 +01:00
sersoong fcbec6331c Change editor_settings.tres to editor_settings-3.tres 2017-11-20 11:02:34 +08:00
Rémi Verschelde 6947bed015 Pass engine name and version parts as proper strings 
Removes the need for _MKSTR all over the place which has the drawback of
converting _MKSTR(UNKNOWN_DEFINE) to "UKNOWN_DEFINE" instead of throwing
a compilation error.
 2017-11-20 00:51:14 +01:00
Rémi Verschelde ecf80fbbba
Merge pull request #12988 from akien-mga/xdg-home-paths 
Add support for XDG Base Directory spec
 2017-11-20 00:42:51 +01:00
Rémi Verschelde bc26a5bd3a
Merge pull request #12936 from n-pigeon/planar_scale_gizmo 
Implemented planar scaling with two modes.
 2017-11-20 00:16:28 +01:00
Rémi Verschelde d826b043ad
Merge pull request #12950 from ianb96/code_folding 
Code Folding
 2017-11-20 00:15:10 +01:00
Rémi Verschelde 171c46120d
Merge pull request #13042 from gad-o/customIconFix 
Fix #10798: Fixes Change Type does not change icon
 2017-11-20 00:13:10 +01:00
Rémi Verschelde 9143df1597
Merge pull request #13059 from dragmz/13009 
Fix Regression: running current scene (unsaved) will ask for main scene
 2017-11-19 23:50:28 +01:00
Rémi Verschelde cc88a4cea6
Merge pull request #13030 from Krakean/master 
Add "View FPS" in 3D->Perspective's popup.
 2017-11-19 23:49:35 +01:00
Marcin Zawiejski a14bd70995 Fix Regression: running current scene (unsaved) will ask for main scene 2017-11-19 22:59:05 +01:00
Dmitry Koteroff 55f992942c Add "View FPS" in 3D->Perspective's popup. 
"Fixes" to make it acceptable by clang-format.

"Fixes" to make it acceptable by clang-format.
 2017-11-20 00:35:46 +03:00
Rémi Verschelde d2bc961388
Merge pull request #13000 from djrm/pr_import_fixes 
import fixes
 2017-11-19 21:59:11 +01:00
Pedro J. Estébanez 5a0be858f4 Let SceneTreeDock duplicate nodes via Node::duplicate() 
Helps with #11182.
 2017-11-19 21:30:17 +01:00
Rémi Verschelde 6e3f2f44af Use new XDG folders to dehardcode paths 2017-11-19 20:54:26 +01:00
Rémi Verschelde 32c12a92a5 Add initial support for the XDG Base Directory spec 
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html
(latest as of this commit).

Three virtual methods are added to OS for the various XDG paths we will use:
- OS::get_data_path gives XDG_DATA_HOME, or if missing:
  ~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_config_path gives XDG_CONFIG_HOME, or if missing:
  ~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows
- OS::get_cache_path gives XDG_CACHE_HOME, or if missing:
  ~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows

So for Windows there are no changes, for Linux we follow the full split spec
and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot.

Support for system-wide installation of templates on Unix was removed for now,
as it's a bit hackish and I don't think anyone uses it.

user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by
default, but when using the application/config/use_shared_user_dir option
it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame.

For now everything still goes in EditorSettings::get_settings_dir(), but
this will be changed in a later commit to make use of the new splitting
where relevant.

Part of #3513.
 2017-11-19 20:54:24 +01:00
Daniel J. Ramirez 5e56366eba Fix import obj as scene. 2017-11-19 13:51:05 -06:00
Rémi Verschelde 39a4a67776
Merge pull request #13043 from volzhs/post-import 
Restore post_import function
 2017-11-19 20:15:46 +01:00
Rémi Verschelde e89ec04be8
Merge pull request #13039 from sketchyfun/animation_key_selection_fix 
Fixed issues with clicking animation keys that are on frame 0
 2017-11-19 20:11:59 +01:00
Orkun 22bdad8bbe Fix #10798: Fixes Change Type does not change icon 
Problem : While replacing old node properties with new ones, we
also copy meta data of old node's icon

Solve: don't copy meta so don't override _editor_icon
 2017-11-19 20:46:30 +03:00
Poommetee Ketson f5e85c6103
Merge pull request #12955 from groud/editor_canvas_item_api_rework 
Editor canvas item api rework
 2017-11-20 00:19:00 +07:00
Rémi Verschelde 3c5ce7cd85
Merge pull request #13031 from YeldhamDev/dock_label 
Added a label to the Dock Positioner
 2017-11-19 18:07:59 +01:00
volzhs 30af5e81db Restore post_import function 2017-11-19 23:45:16 +09:00
BenH 09b7a651b8 Fixed issue with animation keys that are on frame 0 being difficult to click 2017-11-19 14:05:33 +00:00
Gilles Roudiere 8d1f2b1857 Rework the canvas_item API for further improves to the canvas item editor 2017-11-19 13:36:31 +01:00
Omar Al Halabi cb86f6fbf6 fix set_current_tab: Indexp_current=-1 out of size 2017-11-19 13:14:00 +02:00
Poommetee Ketson baaafc5829
Merge pull request #12999 from Hinsbart/dnd_import 
Editor: Drop files to copy them to project.
 2017-11-19 16:22:40 +07:00
Michael Alexsander Silva Dias fd52555bbe Added a label to the Dock Positioner. 2017-11-19 03:24:55 -02:00
Ian f8e8b7d1a2 add scene button and tab scrolling 2017-11-18 20:31:51 -05:00
Ian 1e59169d2d scrolling fixes 2017-11-18 20:07:53 -05:00
BenH 090a9abf84 Fixed issue where some of the animation editor buttons were difficult to click, mainly the add key button. This was due to an error in the offsets 2017-11-18 16:13:11 +00:00
Daniel J. Ramirez 59c2e8906a Improved packed scene previews. 2017-11-17 21:42:14 -06:00
Ian d350f506a0 TextEdit code folding 2017-11-17 21:49:43 -05:00
Rémi Verschelde 63283eca55
Merge pull request #12998 from djrm/pr_fixes 
some fixes
 2017-11-18 02:24:24 +01:00
Andreas Haas 3495190497
Editor: Drop files to copy to project. 2017-11-17 21:52:55 +01:00
Daniel J. Ramirez 7154baa010 Avoid spamming the console for editor settings initial sets. 2017-11-17 14:23:44 -06:00
Rémi Verschelde ad199c3964 EditorSettings: Rename settings_path to settings_dir 
Also to prepare for upcoming refactoring for XDG support.
 2017-11-17 20:55:09 +01:00
Juan Linietsky ebbe2bd572
Merge pull request #12930 from vnen/gdscrit-output-print 
Make tool scripts print on the editor Output panel
 2017-11-17 16:05:44 -03:00
Rémi Verschelde 0968c8d2f6
Merge pull request #12982 from tagcup/aabb_rename 
Rename Rect3 to AABB.
 2017-11-17 20:04:29 +01:00
Ferenc Arn d28763a4c1 Rename Rect3 to AABB. 
Fixes #12973.
 2017-11-17 11:01:41 -05:00
George Marques e90cfa6f82
Make resources edited by plugins be sent as reference 
This ensures that a plugin can save a resource using the ResourceSaver.
 2017-11-17 13:48:33 -02:00
Bojidar Marinov e4a36d0eda
Allow exporting enums from GDScript 
Use as `export(E) ...`
Closes #12392
 2017-11-17 14:33:36 +02:00
Rémi Verschelde 64caa4733c
Merge pull request #12977 from YeldhamDev/create_node_relationships 
Enabling relationship lines in the Scene Tree enables them in the Create New Node dialog as well
 2017-11-17 09:22:23 +01:00
Geequlim fab66af7e9 Move the remote scene tree to the scene tree dock. 
Ignore all script constants in the global section of the breakpoint stack.
Check property size before send to avoid too large of data be sent.
Fix crash while clear the remote objects from the debugger.
 2017-11-17 12:01:54 +08:00
Daniel J. Ramirez 8eb12806b8 Updated some icons. 2017-11-16 20:15:30 -06:00
geequlim c655fc7cd8 Better supported for remote object editing with the inspector with a simple dictionary editor implement 2017-11-17 09:20:33 +08:00
geequlim ccf76798d5 Send script members, contants and globals to debugger 
Remove remote inspector panel
 2017-11-17 09:20:32 +08:00
George Marques b96ee28acd
Add a print handler for the editor output panel 2017-11-16 21:57:02 -02:00
Rémi Verschelde b44cb4e3b9
Merge pull request #12583 from volzhs/select-multiple-files 
Not to be slow when select multiple files
 2017-11-17 00:37:01 +01:00
Rémi Verschelde 7ae8ba2d47
Merge pull request #12976 from Paulb23/scene_tree_add_undo_issue_6125 
Fixed scene tree updating when undo/redo root node creation, issue 6125
 2017-11-16 23:37:24 +01:00
Michael Alexsander Silva Dias 496e4e0d2f Enabling relationship lines in the Scene Tree enables them in the Create New Node dialog as well. 2017-11-16 20:24:33 -02:00
Paulb23 ad87dac77e Fixed scene tree updating when undoing root node creation, issue 6125 2017-11-16 22:22:51 +00:00
Rémi Verschelde 3330c4b4de
Merge pull request #12971 from Chaosus/saveandrunscenefix 
Fix current scene run when scene saved
 2017-11-16 22:31:38 +01:00
Chaosus acc45ccf41 Fix current scene run when scene saved 2017-11-16 21:47:10 +03:00
Rémi Verschelde bb1d1912ea
Merge pull request #12488 from djrm/pr_gridmap_fixes 
Several improvements to GridMap.
 2017-11-16 19:27:27 +01:00
Rémi Verschelde 763ca3dae1
Merge pull request #12970 from leezh/module_docs 
Added modules' doc files to make_doc_header
 2017-11-16 19:10:12 +01:00
Zher Huei Lee fbcb2edeeb Added modules' doc files to make_doc_header 
They were somehow never included. This fixes that.
 2017-11-17 01:57:28 +08:00
Rémi Verschelde 2070b80fc0
Merge pull request #12966 from SaracenOne/convcol 
Added 'convcol' flag for importing meshes as convex collision
 2017-11-16 16:38:38 +01:00
Saracen f8a95499bd Added 'convcol' flag for importing meshes as convex collision and completed code 
for parsing collision flags to mesh data.
 2017-11-16 13:06:30 +00:00
Juan Linietsky dc463e1e42 Add support for remote debug in scene tree. 2017-11-15 22:21:49 -03:00
Rémi Verschelde ed2b66f023 Improve code style of generated headers 2017-11-15 21:29:34 +01:00
Rémi Verschelde e7701bb2de doc: Rename "@Global Scope" to "@GlobalScope" 
Spaces in filenames are evil.
 2017-11-15 20:41:16 +01:00
Rémi Verschelde 967bfb0c4a doc: Remove revision.module_config from version string 
It is now "3.0-alpha" instead of "3.0.alpha.custom_build{,.mono}",
limits unnecessary diffs.
 2017-11-15 20:41:16 +01:00
Juan Linietsky 9543801d51
Merge pull request #12949 from karroffel/gdnative-export 
[GDNative] export plugin
 2017-11-15 14:05:21 -03:00
Karroffel f1099c7221 [GDNative] export plugin 2017-11-15 17:24:32 +01:00
Juan Linietsky 0130bbfac0 Make sure scan happens after all nodes enter scene (including plugins), fixes #9286 2017-11-15 12:42:08 -03:00
Juan Linietsky a5c3e3084a When script changes, defer tree updating. Fixes #9704 2017-11-15 10:41:31 -03:00
sersoong 13b07fef81 add open feture to dependency_editor.cpp 2017-11-15 14:26:38 +08:00
Przemysław Gołąb (n-pigeon) 9cc6d21d9f Implemented planar scaling with two modes. 
Modes:
- Scale uniformly on two axes
- Hold SHIFT to scale non uniformly
 2017-11-14 23:51:27 +01:00
Rémi Verschelde 61a693cf78
Merge pull request #12922 from eska014/engine-singletons 
Singleton management changes
 2017-11-14 20:44:55 +01:00
Juan Linietsky 04edfc090b Finalized ability to convert from CanvasItem/Spatial/Particles materials to ShaderMaterial, closes #10242 2017-11-14 15:45:30 -03:00
Leon Krause 9b7b46143d Move singleton management from ProjectSettings to Engine 2017-11-14 15:15:13 +01:00
Rémi Verschelde 4685674389
Merge pull request #12842 from ianb96/shader_editor_fix 
Shader Editor context menu and line operations and style fix
 2017-11-14 07:33:04 +01:00
Ian c478c1ded5 remove debug msg 2017-11-13 18:16:59 -05:00
Rémi Verschelde c4f9820c2f
Merge pull request #12909 from n-pigeon/tra_gizmo_fix_2 
Fix uninitialized bool. Breaks translation in release_debug target.
 2017-11-13 23:11:04 +01:00
Przemysław Gołąb (n-pigeon) 9a4f6d6689 Fix uninitialized bool. Breaks translation in release_debug target. 2017-11-13 22:54:33 +01:00
Rémi Verschelde 4755bc9e2b
Merge pull request #12854 from poke1024/fix-poly2d-editor-handle 
Fix minor drawing order glitch in polygon 2D editor
 2017-11-13 22:18:56 +01:00
Rémi Verschelde 05a780a101
Merge pull request #12869 from ianb96/script_list_move 
Script List Reorder
 2017-11-13 21:55:09 +01:00
George Marques 4c77f48067
Refresh import options when changing importer 2017-11-13 17:31:00 -02:00
Bernhard Liebl 89f7032c2e Fix drawing order of polygon 2d editor handles 2017-11-13 18:49:06 +01:00
Rémi Verschelde 390e957ba4
Merge pull request #12893 from Chaosus/dupsignals 
Duplicate signals fixes
 2017-11-13 17:13:11 +01:00
Chaosus 6496b53549 Duplicate signals fixes 2017-11-13 18:42:07 +03:00
Rémi Verschelde faf097d350
Merge pull request #12895 from volzhs/better-ttr-format 
Better TTR format
 2017-11-13 12:46:39 +01:00
volzhs 2e7345c00f Better TTR format 2017-11-13 20:37:28 +09:00
Przemysław Gołąb (n-pigeon) e2160afcd8 Fixed View plane local rotation. 
Plus some cleanups.
 2017-11-13 09:15:41 +01:00
Webster Sheets 05dce362d5 Fix for #12056, though GTLF import of that file is still incorrect. 2017-11-12 23:47:51 -05:00
Ian 9f6a06b992 add script list drag n drop 2017-11-12 15:45:42 -05:00
Ian 9126a2072c move item up/down context menu and shortcut 2017-11-12 15:45:42 -05:00
Ian 798a14eb33 add script editor list context menu 2017-11-12 15:45:42 -05:00
Rémi Verschelde 47e5b43160
Merge pull request #12852 from djrm/pr_import_fixes 
Update meshes when reimporting,
 2017-11-12 21:17:58 +01:00