aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix compile error when use "android_add_jni_dir"volzhs2017-05-121-0/+1
* Merge pull request #8435 from hikari-no-yume/scene_import_rigidonly_flagRémi Verschelde2017-05-021-10/+18
|\
| * Scene importer: add -rigidonly flag for empties (fixes #8430)Andrea Faulds2017-04-301-10/+18
* | Merge pull request #8561 from volzhs/modulate-transparency-2.1Rémi Verschelde2017-05-024-2/+22
|\ \
| * | Show transparency and accurate color for propertyvolzhs2017-04-284-2/+22
| |/
* | Merge pull request #8542 from RandomShaper/opt-out-capitalization-2.1Rémi Verschelde2017-05-025-8/+14
|\ \
| * | Add setting to opt-out of capitalization in the property inspectorPedro J. Estébanez2017-04-275-8/+14
* | | Ignore gles3 artifacts to ease git branch switchingRémi Verschelde2017-04-281-0/+1
| |/ |/|
* | Merge pull request #8536 from volzhs/tr-fallbackRémi Verschelde2017-04-261-1/+1
|\ \
| * | Fix wrong fallback for localevolzhs2017-04-261-1/+1
* | | Merge pull request #8534 from volzhs/android-obb-2.1Rémi Verschelde2017-04-261-1/+5
|\ \ \
| * | | Fix error or download again if use obb for Androidvolzhs2017-04-261-1/+5
| |/ /
* | | Merge pull request #8529 from volzhs/auto-accept-quitRémi Verschelde2017-04-261-1/+1
|\ \ \ | |/ / |/| |
| * | Fix auto_accept_quit option to workvolzhs2017-04-251-1/+1
|/ /
* | Merge pull request #8474 from allkhor/pr-fix-cherry-2.1Rémi Verschelde2017-04-241-16/+17
|\ \
| * | ScriptEditor: Fixes bug where menu option would be handled twice (2.1)allkhor2017-04-211-16/+17
* | | Merge pull request #8272 from MattUV/2.1Rémi Verschelde2017-04-242-1/+43
|\ \ \ | |/ / |/| |
| * | Add set/get_collision_layer/mask_bit() to TileMapsMattUV2017-04-112-1/+43
* | | Merge pull request #8466 from RandomShaper/fix-ik-2.1Rémi Verschelde2017-04-201-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix IK not being solved while dragging a bonePedro J. Estébanez2017-04-201-2/+2
* | | Merge pull request #8358 from volzhs/script-filename-2.1Rémi Verschelde2017-04-201-2/+6
|\ \ \
| * | | Show script filename instead of thumbnailvolzhs2017-04-121-2/+6
* | | | Adapt Godot 3 exporter to new project file extensionRémi Verschelde2017-04-201-1/+1
* | | | Drop EXEC PATHP?? super verbose info messageRémi Verschelde2017-04-201-1/+0
* | | | Merge pull request #8442 from volzhs/error-load-icon-2.1Rémi Verschelde2017-04-181-0/+1
|\ \ \ \
| * | | | Fix error for loading icon image at start upvolzhs2017-04-181-0/+1
* | | | | Merge pull request #8429 from RandomShaper/fix-sample-lib-editor-2.1Rémi Verschelde2017-04-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix inability to remove samples from librariesPedro J. Estébanez2017-04-171-1/+1
| | |/ / | |/| |
* | | | Merge pull request #8390 from volzhs/inspector-button-margin-2.1Andreas Haas2017-04-141-0/+1
|\ \ \ \
| * | | | Make buttons closer in Inspector panelvolzhs2017-04-131-0/+1
| |/ / /
* | | | Merge pull request #8369 from volzhs/fix-stylebox-2.1Andreas Haas2017-04-141-10/+4
|\ \ \ \
| * | | | Fix editor style box for ToolButtonvolzhs2017-04-121-10/+4
| |/ / /
* | | | Merge pull request #8355 from volzhs/texture-view-2.1Andreas Haas2017-04-141-0/+8
|\ \ \ \
| * | | | Prevent to take too much space for long vertical texturevolzhs2017-04-111-0/+8
| | |/ / | |/| |
* | | | Revert "Respect style boxes for Button states other than "normal""2.1.3-stableRémi Verschelde2017-04-111-10/+5
| |/ / |/| |
* | | Release 2.1.3-stableRémi Verschelde2017-04-102-3/+3
* | | Move VERSION_MKSTRING logic to version.hRémi Verschelde2017-04-105-13/+41
* | | Mark Godot 3.0 exporter as work in progressRémi Verschelde2017-04-1022-22/+22
* | | .gitignore: Add app_icon.h and splash.h generated headersRémi Verschelde2017-04-101-18/+19
* | | Re-add ouya gamepad mapping.Andreas Haas2017-04-101-0/+2
|/ /
* | Merge pull request #8327 from akien-mga/2.1-godot3-exporterRémi Verschelde2017-04-092-20/+261
|\ \
| * | Godot3 exporter: Convert engine.cfg properlyRémi Verschelde2017-04-092-20/+261
* | | Merge pull request #8320 from RandomShaper/zero-preprocess-particles2d-2.1Rémi Verschelde2017-04-091-1/+1
|\ \ \
| * | | Allow a preprocess time of 0 for Particles2DPedro J. Estébanez2017-04-081-1/+1
* | | | libpng: Update to upstream version 1.6.29Rémi Verschelde2017-04-099-41/+139
* | | | opus: Update to upstream version 1.1.4Rémi Verschelde2017-04-092-2/+3
* | | | squish: Update to upstream version 1.15Rémi Verschelde2017-04-094-9/+31
* | | | Style: Apply clang-format (3.9.1) to Obj-C++ filesRémi Verschelde2017-04-0914-681/+630
* | | | Merge pull request #8326 from Hinsbart/particle_flipRémi Verschelde2017-04-091-4/+4
|\ \ \ \
| * | | | Particles2D: Fix flip property (again).Andreas Haas2017-04-091-4/+4
|/ / / /