aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12421 from TheSofox/parallax-overhaulRémi Verschelde2017-11-205-16/+27
|\ | | | | Overhauled the ParallaxBackground system
| * Overhauled the ParallaxBackground system so that it works properly ↵Sofox2017-10-265-16/+27
| | | | | | | | regardless of the zoom of the camera.
* | Merge pull request #12555 from kosz78/export-pckRémi Verschelde2017-11-201-1/+9
|\ \ | | | | | | Add command line support to export pck or zip
| * | Add command line support to export pck or zipKonstantin Zaitsev2017-11-011-1/+9
| | |
* | | Merge pull request #13092 from godotengine/revert-12644-ogg_loopJuan Linietsky2017-11-203-72/+22
|\ \ \ | | | | | | | | Revert "Added loop_begin and loop_end to OggVorbisStream"
| * | | Revert "Added loop_begin and loop_end to OggVorbisStream"Juan Linietsky2017-11-203-72/+22
|/ / /
* | | Merge pull request #13006 from hoelzl/pr-placement-deleteRémi Verschelde2017-11-202-0/+28
|\ \ \ | | | | | | | | Add placement deletes to avoid warnings on VC++
| * | | Add placement deletes to avoid warnings on VC++Matthias Hoelzl2017-11-192-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling with VC++ 2017, Godot generates huge numbers of C4291 warnings about missing placement delete. I have not found a way to disable these warnings using compiler options: AFAICT there is no equivalent to `-f-no-exceptions` for VC++ (there is only /EH to change the exception-handling model, /GX is deprecated) and adding /wd4291 to the `disable_nonessential_warnings` list in the `SConstruct` file or even compiling with `warnings=no` does not disable the messages. Placement delete is only called when placement new throws an exception, since Godot doesn't use exceptions this change should have no runtime effect. Fixes #12654 (probably, difficult to say without log)
* | | | Make old scenes readable againJuan Linietsky2017-11-201-1/+1
| | | |
* | | | Merge pull request #13082 from groud/fix_err_class_registrationPoommetee Ketson2017-11-201-2/+0
|\ \ \ \ | | | | | | | | | | Fixes a double class registration error
| * | | | Fixes a double class registering errorGilles Roudiere2017-11-201-2/+0
| | | | |
* | | | | Merge pull request #13060 from karroffel/gdnative-version-errorThomas Herzog2017-11-207-27/+49
|\ \ \ \ \ | | | | | | | | | | | | [GDNative] (version-) error reporting + small API change
| * | | | | [GDNative] removed godot_string_c_strKarroffel2017-11-203-13/+0
| | | | | |
| * | | | | [GDNative] loading error and version error procsKarroffel2017-11-204-14/+49
| | | | | |
* | | | | | Merge pull request #13023 from tom95/particles-align-y-12865Rémi Verschelde2017-11-201-3/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Make particles with DISABLE_Z active respect ALIGN_Y. Fixes #12865
| * | | | | Make particles with DISABLE_Z active respect ALIGN_Y. Fixes #12865Tom Beckmann2017-11-191-3/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #13080 from Slowgames/bugfix/10721Rémi Verschelde2017-11-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Basis accepts Vector3 as constructor argument.
| * | | | | Basis accepts Vector3 as constructor argument.Chip Collier2017-11-201-0/+1
| | | | | |
* | | | | | Update AUTHORS and DONORS listRémi Verschelde2017-11-202-11/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New contributors added as AUTHORS: @AndreaCatania, @sheepandshepherd, @poke1024, @DmitriySalnikov, @ianb96, @hoelzl, @mhilbrunner, @n-pigeon. [ci skip]
* | | | | | Merge pull request #12644 from mrcdk/ogg_loopRémi Verschelde2017-11-203-22/+72
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added loop_begin and loop_end to OggVorbisStream
| * | | | | Add loop_begin and loop_end to OggVorbisStreamMrCdK2017-11-043-22/+72
| | | | | |
* | | | | | Merge pull request #12717 from NathanWarden/material_import_fixRémi Verschelde2017-11-201-7/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed a bug where materials and/or meshes weren't assigned to scene on first import.
| * | | | | | Fixed a bug where materials weren't assigned to scene on first import.Nathan Warden2017-11-071-7/+13
| | | | | | |
* | | | | | | Merge pull request #12942 from sersoong/master-testRémi Verschelde2017-11-203-3/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 3.0 - add open feture to dependency_editor.cpp(View Owner..)
| * | | | | | | add open feture to dependency_editor.cppsersoong2017-11-153-3/+68
| | | | | | | |
* | | | | | | | Merge pull request #12952 from bojidar-bg/12392-export-enumsRémi Verschelde2017-11-203-16/+100
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow exporting enums from GDScript
| * | | | | | | | Allow exporting enums from GDScriptBojidar Marinov2017-11-173-16/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use as `export(E) ...` Closes #12392
* | | | | | | | | Merge pull request #12983 from ianb96/scene_add_tabRémi Verschelde2017-11-204-64/+145
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Scene button and tab scrolling
| * | | | | | | | | add scene button and tab scrollingIan2017-11-184-64/+145
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12984 from willnationsdev/richtextlabel-hover-signalRémi Verschelde2017-11-203-3/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | RichTextLabel: Adding ability for single meta hovering
| * | | | | | | | | Adding ability for single meta hoveringWill Nations2017-11-173-3/+40
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13008 from Chaosus/assetstorefixesRémi Verschelde2017-11-201-15/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Few fixes for asset store browser
| * | | | | | | | | | Few fixes for asset store browserChaosus2017-11-201-15/+28
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #13075 from sersoong/master-test3Rémi Verschelde2017-11-202-1/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [3.0] - Add close other tabs to Script Editor
| * | | | | | | | | | Add close other tabs to Script Editorsersoong2017-11-202-1/+39
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13041 from RandomShaper/unify-node-duplicateRémi Verschelde2017-11-204-88/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Let SceneTreeDock duplicate nodes via Node::duplicate()
| * | | | | | | | | | | Let SceneTreeDock duplicate nodes via Node::duplicate()Pedro J. Estébanez2017-11-194-84/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Helps with #11182.
| * | | | | | | | | | | Remove out-of-logic assignment of instance's original scenePedro J. Estébanez2017-11-191-4/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13049 from tagcup/pathfollow2d_parallel_transportRémi Verschelde2017-11-202-29/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use parallel transport in PathFollow2D.
| * | | | | | | | | | | | Use parallel transport in PathFollow2D.Ferenc Arn2017-11-192-29/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12995.
* | | | | | | | | | | | | Merge pull request #13061 from eska014/html5-exportRémi Verschelde2017-11-201-12/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export boot splash image and add option for custom HTML shell file in HTML5 export
| * | | | | | | | | | | | | Export boot splash and add custom HTML file option in HTML5 exportLeon Krause2017-11-201-12/+56
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #13053 from akien-mga/methods-mkstrRémi Verschelde2017-11-2016-38/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove need to _MKSTR version strings and rename "revision" to "build"
| * | | | | | | | | | | | | Rename the version's "revision" to "build"Rémi Verschelde2017-11-205-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | Pass engine name and version parts as proper stringsRémi Verschelde2017-11-2015-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | Fix TextEdit::cursor_set_line bindingsRémi Verschelde2017-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As spotted by @neikeq - fixes #13068.
* | | | | | | | | | | | | | Merge pull request #13065 from DoctorAlpaca/masterRémi Verschelde2017-11-201-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the prevention for sliding on slopes in the 2d version of move_and_slide
| * | | | | | | | | | | | | | Fix the prevention for sliding on slopes in the 2d version of move_and_slideEric Wiltfang2017-11-201-1/+4
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done by using the same method the 3d counterpart uses. Fixes #13063.
* | | | | | | | | | | | | | Merge pull request #13073 from kosz78/android-compile-sdk-versionRémi Verschelde2017-11-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up android 'compileSdkVersion' to 24 [ci skip]
| * | | | | | | | | | | | | | Set android 'compileSdkVersion' to 24Konstantin Zaitsev2017-11-201-1/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |