aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #12639 from bojidar-bg/x-add-rest-template-listingRémi Verschelde2017-11-051-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change URL of the mirror list
| * | | | | | | | | | | | | | | | | Change URL of the mirror listBojidar Marinov2017-11-041-4/+12
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #12638 from poke1024/fixcreateRémi Verschelde2017-11-052-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes random sorting order in Create New Node dialog
| * | | | | | | | | | | | | | | | | Fixes random sorting order in Create New Node dialogBernhard Liebl2017-11-042-3/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Convert DOS line endings to Unix line endingsRémi Verschelde2017-11-0516-3520/+3520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix issues some of us have with `misc/dist/uwp_template/AppxManifest.xml` always showing up as modified. Might cause issues on Windows due to the removal of BOMs or change of line endings in some of the Mono, UWP or gradlew.bat files, we will test and adapt if need be.
* | | | | | | | | | | | | | | | | Merge pull request #12641 from AndreaCatania/bulletRémi Verschelde2017-11-05699-1/+230736
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | Bullet physics wrapper
| * | | | | | | | | | | | | | | | Bullet physics engine implementationAndreaCatania2017-11-0451-1/+9847
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bullet wrapper that allows Godot to use Bullet physics and benefit about all features. Also it support all specific Godot physics functionality like multi shape body, areas, RayShape, etc.. It improve the Joints, Trimesh shape, and add support to soft body even if Godot is not yet ready to it.
| * | | | | | | | | | | | | | | | Vendor thirdparty Bullet source for upcoming physics server backendAndreaCatania2017-11-04648-0/+220889
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #12647 from leezh/dedent_returnPoommetee Ketson2017-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dedent() binding did not return result
| * | | | | | | | | | | | | | | | Fixed dedent() binding did not return resultZher Huei Lee2017-11-051-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #12630 from karroffel/configfile-orderedhashmapThomas Herzog2017-11-053-34/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | make ConfigFile sections ordered
| * | | | | | | | | | | | | | | make ConfigFile sections orderedKarroffel2017-11-043-34/+18
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #12612 from karroffel/gdnative-poolarray-accessorsThomas Herzog2017-11-043-1/+791
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | [GDNative] added Read and Write accessors to pool arrays
| * | | | | | | | | | | | | | | [GDNative] added Read and Write accessors to pool arraysKarroffel2017-11-033-1/+791
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #12593 from DmDerbin/masterPoommetee Ketson2017-11-043-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AStar: implementation of get_point_connections
| * | | | | | | | | | | | | | | | AStar: implementation of get_point_connectionsDmDerbin2017-11-043-0/+40
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #12262 from AndreaCatania/pplugJuan Linietsky2017-11-0328-152/+286
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Physics server plug
| * | | | | | | | | | | | | | | | Implemented physics plugAndreaCatania2017-11-0428-152/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
* | | | | | | | | | | | | | | | | Merge pull request #12557 from BastiaanOlij/arvr_add_rumble_supportBastiaan Olij2017-11-047-1/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | Adding rumble support to ARVR controllers
| * | | | | | | | | | | | | | | | Adding rumble support to ARVR controllers (if implemented on the ARVR interface)Bastiaan Olij2017-11-017-1/+73
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #12610 from karroffel/gdnative-api-fixesRémi Verschelde2017-11-035-8/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | [GDNative] small API bug fixes
| * | | | | | | | | | | | | | | [GDNative] small API bug fixesKarroffel2017-11-035-8/+31
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #12608 from karroffel/configfile-orderedhashmapThomas Herzog2017-11-033-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | make ConfigFile use OrderedHashMap
| * | | | | | | | | | | | | | make ConfigFile use OrderedHashMapKarroffel2017-11-033-10/+11
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #12566 from bncastle/select_anim_fixRémi Verschelde2017-11-021-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | Select correct animation on creation of a new one
| * | | | | | | | | | | | | Select correct animation on creation of a new onebncastle2017-11-011-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Select the correct animation when creating a new one. - Removed unneeded new_name variable.
* | | | | | | | | | | | | | SCons: make use_lto a global option and opt-in for iphoneRémi Verschelde2017-11-024-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supersedes #12553, see discussion in #12552.
* | | | | | | | | | | | | | Merge pull request #12577 from Keetz/masterRémi Verschelde2017-11-021-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed AnimationPlayer.get_autoplay() returning empty string [ci skip]
| * | | | | | | | | | | | | | Fixed AnimationPlayer.get_autoplay() returning empty stringRasmus Ketelsen2017-11-021-1/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #12575 from leezh/richtext_newline_fixRémi Verschelde2017-11-021-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed RichTextLabel::add_newline() Fixes #12564
| * | | | | | | | | | | | | | Fixed RichTextLabel::add_newline() #12564Zher Huei Lee2017-11-021-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* / | | | | | | | | | | | | -Modules can now add custom version info (added it for Mono)Juan Linietsky2017-11-018-11/+268
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Version string takes this version info -Ability to download templates from the interweb (listing does not work yet)
* | | | | | | | | | | | | Merge pull request #12568 from starry-abyss/vs2013_fixRémi Verschelde2017-11-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compilation on Visual Studio 2013 again. [ci skip]
| * | | | | | | | | | | | Fix compilation on Visual Studio 2013 again.scorched2017-11-011-3/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #10618 from poke1024/polygon2d-selectionGilles Roudiere2017-11-014-157/+315
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Proposal for modified Polygon2D editor controls
| * | | | | | | | | | | | adds alternative editing of nodes: you can select nodes, use del to delete ↵Bernhard Liebl2017-10-234-157/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nodes, and split edges by simply clicking into edge
* | | | | | | | | | | | | Merge pull request #12559 from Cradmon/filesystemDockFixRémi Verschelde2017-11-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Fix to issue #12554, due to error in refactoring in PR #10261
| * | | | | | | | | | | | Fix to issue #12554, due to error in refactoring in PR #10261Cradmon2017-11-011-3/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #12538 from akien-mga/editorsettingsRémi Verschelde2017-11-012-544/+539
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Code quality refactoring in EditorSettings
| * | | | | | | | | | | | Some more harmonization of EditorSettings codeRémi Verschelde2017-10-312-41/+41
| | | | | | | | | | | | |
| * | | | | | | | | | | | Reorder EditorSettings code for better legibilityRémi Verschelde2017-10-312-535/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change, only moving stuff around.
* | | | | | | | | | | | | Merge pull request #12548 from SaracenOne/vertex_compression_import_fixRémi Verschelde2017-11-013-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restores functionality of the use_compression flag in Collada import
| * | | | | | | | | | | | | Restores functionality of the use_compression flag in the Collada importer.Saracen2017-11-013-13/+17
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #12025 from leezh/dedentRémi Verschelde2017-11-014-4/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Added String::dedent() to remove text indentation
| * | | | | | | | | | | | Added String::dedent() to remove text indentationZher Huei Lee2017-11-014-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functions similarly to Python's textwrap.dedent() It's also been applied to doc_data.cpp to remove extra whitespace while parsing the XML.
* | | | | | | | | | | | | Merge pull request #12547 from cooperra/specially-vs-especiallyPoommetee Ketson2017-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proofreading: Change a usage of "specially" to "especially" [ci skip]
| * | | | | | | | | | | | | Proofreading: Change a usage of "specially" to "especially"Robbie Cooper2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See PR godotengine/godot-docs#561. This file generates documentation touched by that PR, so must be changed to stay in sync. I couldn't find any other usages in this repo that needed changing. I looked in all files matching *.cpp *.h *.md *.txt *.xml *.html *.rst.
* | | | | | | | | | | | | | Merge pull request #12549 from neikeq/seriously-do-theyIgnacio Etcheverry2017-11-014-3/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono cleanup fixes
| * | | | | | | | | | | | | | Fix thread checking to queue instances for deletionIgnacio Etcheverry2017-11-012-3/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make sure gchandle bindings are released before cleanupIgnacio Etcheverry2017-11-012-0/+15
| |/ / / / / / / / / / / / /