asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10988 commits 1 branch 0 tags 2.2 GiB
Commit graph

1396 commits

Author SHA1 Message Date
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