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

11144 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Herzog 90e37d58d5
Merge pull request #13060 from karroffel/gdnative-version-error 
[GDNative] (version-) error reporting + small API change
 2017-11-20 11:11:54 +01:00
Karroffel 33ffdba553 [GDNative] removed godot_string_c_str 2017-11-20 11:10:05 +01:00
Karroffel 0865365e21 [GDNative] loading error and version error procs 2017-11-20 11:09:55 +01:00
Rémi Verschelde 341bf71dc1
Merge pull request #13023 from tom95/particles-align-y-12865 
Make particles with DISABLE_Z active respect ALIGN_Y. Fixes #12865
 2017-11-20 10:59:34 +01:00
Mariano Suligoy bcfb0a09f8 Implement auto-tiling 2017-11-20 06:27:47 -03:00
Rémi Verschelde a0f49396d6
Merge pull request #13080 from Slowgames/bugfix/10721 
Basis accepts Vector3 as constructor argument.
 2017-11-20 10:15:08 +01:00
Chip Collier fd81c001fc Basis accepts Vector3 as constructor argument. 2017-11-20 09:59:42 +01:00
Rémi Verschelde 63e91029b1 Update AUTHORS and DONORS list 
New contributors added as AUTHORS:
@AndreaCatania, @sheepandshepherd, @poke1024, @DmitriySalnikov, @ianb96,
@hoelzl, @mhilbrunner, @n-pigeon.

[ci skip]
 2017-11-20 09:29:37 +01:00
Rémi Verschelde b91fa19582
Merge pull request #12644 from mrcdk/ogg_loop 
Added loop_begin and loop_end to OggVorbisStream
 2017-11-20 09:14:16 +01: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 d6dc909ebe
Merge pull request #12984 from willnationsdev/richtextlabel-hover-signal 
RichTextLabel: Adding ability for single meta hovering
 2017-11-20 09:10:52 +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 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