mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,959 Commits 15 Branches 59 Tags 7.4 GiB
7f52db75c6
Commit Graph

10959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b1f037eeb9
Merge pull request #13049 from tagcup/pathfollow2d_parallel_transport 
Use parallel transport in PathFollow2D.
 2017-11-20 08:59:33 +01:00
Rémi Verschelde
fa8bc8ef13
Merge pull request #13061 from eska014/html5-export 
Export boot splash image and add option for custom HTML shell file in HTML5 export
 2017-11-20 08:59:23 +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
Rémi Verschelde
414b388499 Fix TextEdit::cursor_set_line bindings 
As spotted by @neikeq - fixes #13068.
 2017-11-20 08:11:31 +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
360343fb5a
Merge pull request #13065 from DoctorAlpaca/master 
Fix the prevention for sliding on slopes in the 2d version of move_and_slide
 2017-11-20 07:58:44 +01:00
Rémi Verschelde
ebdf9cee6b
Merge pull request #13073 from kosz78/android-compile-sdk-version 
Up android 'compileSdkVersion' to 24

[ci skip]
 2017-11-20 07:49:26 +01: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
Konstantin Zaitsev
79178e75cd Set android 'compileSdkVersion' to 24 2017-11-20 10:45:59 +07:00
George Marques
8e6c281a04
Merge pull request #13072 from sersoong/master-test2 
[3.0] - Change editor_settings.tres to editor_settings-3.tres
 2017-11-20 01:33:03 -02:00
sersoong
fcbec6331c Change editor_settings.tres to editor_settings-3.tres 2017-11-20 11:02:34 +08:00
Juan Linietsky
98cb49283d Ability to change indirect light energy. 2017-11-19 21:46:00 -03:00
Eric Wiltfang
7dd9e5c57c Fix the prevention for sliding on slopes in the 2d version of move_and_slide 
Done by using the same method the 3d counterpart uses.

Fixes #13063.
 2017-11-20 01:42:44 +01:00
Rémi Verschelde
3fd23da5ee Rename the version's "revision" to "build" 
That "revision" was inherited from SVN days but had been since then
used to give information about the build: "custom_build", "official",
"<some distro's build>".

It can now be overridden with the BUILD_NAME environment variable.
 2017-11-20 00:51:14 +01: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
9fc0b23210
Merge pull request #13051 from akien-mga/check-gles3-support 
Check whether GL context supports the expected API
 2017-11-20 00:13:28 +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
Leon Krause
ae859fb81e Export boot splash and add custom HTML file option in HTML5 export 2017-11-20 00:06:11 +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
a5939c2953
Merge pull request #13056 from RoyBerube/master 
Visual Studio project creation bug fix

[ci skip]
 2017-11-19 22:16:17 +01:00
Rémi Verschelde
d2bc961388
Merge pull request #13000 from djrm/pr_import_fixes 
import fixes
 2017-11-19 21:59:11 +01:00
RoyBerube
4d5a87a422 Visual Studio project creation bug fix 
A bug in the /drivers SCons script was preventing files in the /drivers and some in the /thirdparty directories from being added to the VS project.

This will only affect builds that use the 'vsproj=yes' option.
 2017-11-19 13:56:48 -07:00
Rémi Verschelde
d40b1825fc Revert "change low cpu delay to 1 usec, should make editor smoother and not really use" 
This reverts commit ca19403306.

See discussion in ca19403306 (commitcomment-25715906)
It also did not fix the issue it claimed to fix.
 2017-11-19 21:40:25 +01:00
Rémi Verschelde
469cff734f
Merge pull request #13018 from hoelzl/pr-cpp-hint 
Add cpp.hint file to improve IntelliSense
 2017-11-19 21:37:02 +01:00
Rémi Verschelde
6ace4011e4
Merge pull request #13045 from akien-mga/gles2-cleanup 
Cleanup old references to GLES2 renderer
 2017-11-19 21:36:00 +01:00
Rémi Verschelde
39204630a7
Merge pull request #13052 from djrm/pr_fixes 
Fix import obj as scene.
 2017-11-19 21:35:22 +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
Pedro J. Estébanez
7286966971 Remove out-of-logic assignment of instance's original scene 2017-11-19 21:30:17 +01:00
Rémi Verschelde
1552dbfb21
Merge pull request #13001 from capnm/fix_class_docs_inline_markup 
Fix the class docs for the rst-syntax errors.

[ci skip]
 2017-11-19 21:02:13 +01:00
Matthias Hoelzl
589976321c Add cpp.hint file to improve IntelliSense 2017-11-19 21:01:05 +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
c574be5566 Check whether GL context supports the expected API 
I couldn't test it yet myself (GPU supports GL 4.5), so we'll need to see if it behaves
as expected on systems that don't support OpenGL 3.3 or GL ES 3.0.
 2017-11-19 20:47:53 +01:00
Martin Capitanio
7c3ba6f72b Fix the class docs for the rst-syntax errors. 
- Generate a correkt rst-syntax for the [/code] inline markup.
  (http://www.sphinx-doc.org/en/1.6.5/rest.html#inline-markup)
- Fix xml souce bugs

for the sphinx's rst syntax werrors:

class_area.rst:319: WARNING: Inline literal start-string without end-string.
class_area2d.rst:287: WARNING: Inline literal start-string without end-string.
class_audioserver.rst:287: WARNING: Inline literal start-string without end-string.
class_control.rst:509: WARNING: Inline literal start-string without end-string.
class_image.rst:422: WARNING: Inline literal start-string without end-string.
class_image.rst:434: WARNING: Inline literal start-string without end-string.
class_inputevent.rst:74: WARNING: Inline literal start-string without end-string.
class_inputeventaction.rst:45: WARNING: Inline literal start-string without end-string.
class_inputmap.rst:47: WARNING: Inline literal start-string without end-string.
class_kinematicbody.rst:80: WARNING: Inline interpreted text or phrase reference start-string without end-string.
class_kinematicbody2d.rst:80: WARNING: Inline interpreted text or phrase reference start-string without end-string.
class_line2d.rst:182: WARNING: Inline literal start-string without end-string.
class_thread.rst:51: WARNING: Inline literal start-string without end-string.
class_treeitem.rst:160: WARNING: Inline literal start-string without end-string.
 2017-11-19 20:47:36 +01:00
Ferenc Arn
4e87f471d7 Use parallel transport in PathFollow2D. 
Fixes #12995.
 2017-11-19 14:38:53 -05:00
Rémi Verschelde
249c11784a
Merge pull request #13046 from AndreaCatania/kinfix 
Some Bullet bug fix
 2017-11-19 20:37:04 +01:00
Rémi Verschelde
f0795ae2fe
Merge pull request #13044 from eska014/enginejs 
Change HTML5 start-up API
 2017-11-19 20:18:00 +01: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
618450caec
Merge pull request #13040 from RandomShaper/fix-signals-dup 
Fix duplication of signals
 2017-11-19 20:14:29 +01:00