aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Respect style boxes for Button states other than "normal""2.1.3-stableRémi Verschelde2017-04-111-10/+5
| | | | | This reverts commit 98f01f914333eb5e70174c4adf4a5f910a38d645. This made icons in the editor "jumpy" on hover.
* Release 2.1.3-stableRémi Verschelde2017-04-102-3/+3
|
* Move VERSION_MKSTRING logic to version.hRémi Verschelde2017-04-105-13/+41
| | | | | Fixes a bug where the VERSION_PATCH define is not yet in scope if typedefs.h is included before version.h at compilation time.
* 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
| | | | Also sort alphabetically for clarity.
* Re-add ouya gamepad mapping.Andreas Haas2017-04-101-0/+2
| | | | Also adds yet another type of ps4 controller.
* Merge pull request #8327 from akien-mga/2.1-godot3-exporterRémi Verschelde2017-04-092-20/+261
|\ | | | | Godot3 exporter: Convert engine.cfg properly
| * Godot3 exporter: Convert engine.cfg properlyRémi Verschelde2017-04-092-20/+261
| | | | | | | | | | Use a map to keep track of renamings as done for other properties. The saving is a bit hackish, there might be simpler solutions.
* | Merge pull request #8320 from RandomShaper/zero-preprocess-particles2d-2.1Rémi Verschelde2017-04-091-1/+1
|\ \ | | | | | | Allow a preprocess time of 0 for Particles2D (2.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
| | | | | | | | | | | | (cherry picked from commit d463b6e3d005ddef1a0e4ff8f297cfc60de1d764)
* | | opus: Update to upstream version 1.1.4Rémi Verschelde2017-04-092-2/+3
| | | | | | | | | | | | (cherry picked from commit dd8655aac93dacc24e5e1c7778209ef8b610640b)
* | | squish: Update to upstream version 1.15Rémi Verschelde2017-04-094-9/+31
| | | | | | | | | | | | | | | | | | Also fix clang-format pre-commit hook to ignore thirdparty files. (cherry picked from commit fa2d5b91dc390a11262859e5309351ba58842901)
* | | 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).
| * | | Particles2D: Fix flip property (again).Andreas Haas2017-04-091-4/+4
|/ / / | | | | | | | | | should have flipped the dst_rect..
* | | Merge pull request #8317 from RandomShaper/fix-area-monitoring-2.1Rémi Verschelde2017-04-084-18/+23
|\ \ \ | |_|/ |/| | Fix side effects of the bookkepping of Area/Area2D's monitoring (2.1)
| * | Fix side effects of the bookkepping of Area/Area2D's monitoringPedro J. Estébanez2017-04-084-18/+23
| | | | | | | | | | | | | | | - Fix monitoring flag being reset when the scene is out of the tree (happens on save all if the current scene is not the focused one, therefore on save-on-run as well) - Fix the inability to reset the monitoring flag while the area is out of the tree
* | | Merge pull request #8311 from BastiaanOlij/format_mm_2.1Rémi Verschelde2017-04-0812-1271/+1143
|\ \ \ | | | | | | | | Spaces to tabs and layout adjustments on .mm files
| * | | Spaces to tabs and layout adjustments on .mm filesBastiaanOlij2017-04-0812-1271/+1143
| | | |
* | | | Revert "Make inline blocks in GDScript more pythonic"Rémi Verschelde2017-04-081-9/+1
| |_|/ |/| | | | | | | | | | | This reverts commit 0c650c2511a69dc8af1069546aad4ff4d989923d. Fixes #8315.
* | | Revert "8145 - Mouse Position is unknown until first mouse event on X11 & Win"Rémi Verschelde2017-04-082-11/+1
| | | | | | | | | | | | | | | This reverts commit e5d63aaece5310aee39ba1da9a595fc7a8410a50. Same reasoning as #8291.
* | | Style: Fix some badly formatted filesRémi Verschelde2017-04-087-42/+43
| | |
* | | Add "Godot Engine contributors" copyright lineRémi Verschelde2017-04-081329-0/+1329
| | |
* | | Add AUTHORS list crediting developersRémi Verschelde2017-04-081-0/+76
|/ / | | | | | | (cherry picked from commit 21bcb71b2caa6e833338e40c915f7e353a377754)
* | Merge pull request #8307 from RandomShaper/optimize-out-debug-n-non-tools-2.1Rémi Verschelde2017-04-073-5/+36
|\ \ | | | | | | Optimize-out some debug and/or non-tools methods (2.1)
| * | Optimize-out some debug and/or non-tools methodsPedro J. Estébanez2017-04-073-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible. is_node_being_edited() already showed a similar optimization effort and has been adapted to this change. Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds. This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
* | | classref: Sync with current sourceRémi Verschelde2017-04-071-57/+264
| | |
* | | i18n: Sync translations with WeblateRémi Verschelde2017-04-0715-1348/+1514
| | |
* | | i18n: Add WIP Czech, Danish, Greek, Dutch and Thai translationsRémi Verschelde2017-04-075-0/+33956
| | |
* | | i18n: Update template with current sourceRémi Verschelde2017-04-071-7/+31
| |/ |/|
* | Merge pull request #8303 from ↵Rémi Verschelde2017-04-071-2/+6
|\ \ | |/ |/| | | | | RandomShaper/reset-folded-on-reset-edit-children-2.1 Reset display folded for an instanced scene if editable children is toggled off (2.1)
| * Reset display folded for an instanced scene if editable children is toggled offPedro J. Estébanez2017-04-071-2/+6
| | | | | | | | This avoids the display folded flag needlessly getting into the scene file (potentially forever) and also gives more visual feedback if the user re-enables editable children so it will display unfolded at first.
* | Merge pull request #8202 from williamd1k0/add-script-buttonRémi Verschelde2017-04-079-29/+264
|\ \ | | | | | | Add Attach and Clear Script buttons (2.1)
| * | Re-add attach button and context menu from ↵William Tumeo2017-03-294-87/+100
| | | | | | | | | | | | 1880238c3e54f57a14361d2c347387edebc6391b
| * | Re-add clear script button and context menu from ↵William Tumeo2017-03-292-3/+38
| | | | | | | | | | | | ce5200b30e6d262905912c6571d51ba6f5979bd7
| * | Re-add script icons from 544194053a54870320d860f1cf333f45723758b9William Tumeo2017-03-294-2/+98
| | |
| * | Re-add create/load script button and context menuWilliam Tumeo2017-03-294-6/+81
| | | | | | | | | | | | | | | - create from f51b202566e9b2a9deb3eb4836f6e00fb30e8500 - load from 41329f9750379b3c2e506d1e9ed7f6195c812920
| * | Re-add script button from b77200728e7f2b2dd446a9717c83a20c9aac0ce4William Tumeo2017-03-292-1/+17
| | |
* | | Merge pull request #8294 from RandomShaper/sample-players-priority-2.1Rémi Verschelde2017-04-0714-17/+116
|\ \ \ | |_|/ |/| | Add priority to samples in a library (2.1)
| * | Add priority to samples in a libraryPedro J. Estébanez2017-04-0614-17/+116
|/ /
* | Merge pull request #8293 from Faless/2.1-enumRémi Verschelde2017-04-063-0/+107
|\ \ | | | | | | [2.1] Cherry pick GDScript enum support ( #6292 )
| * | Add enum naming, by assinging a given enum's values to a DictBojidar Marinov2017-04-061-0/+20
| | | | | | | | | | | | (cherry picked from commit 88430f0962403779670c3e82bbbc3ef3f6022169)
| * | Adds enums to GDScriptBojidar Marinov2017-04-063-0/+87
| | | | | | | | | | | | | | | | | | Fixes #2966 (cherry picked from commit 4ee82a2c38c57fb980df1ed4727d47959ba9e983)
* | | Merge pull request #8292 from RandomShaper/spatial-audio-play-on-free-2.1Rémi Verschelde2017-04-062-6/+24
|\ \ \ | |/ / |/| | Make spatial AudioServers prefer inactive voices (2.1)
| * | Make spatial AudioServers prefer inactive voicesPedro J. Estébanez2017-04-062-6/+24
| | | | | | | | | | | | instead of unconditionally playing on the next voice slot; that will be the fallback if no inactive voice is found
* | | Merge pull request #8273 from RandomShaper/fix-android-x86-2.1Rémi Verschelde2017-04-051-0/+2
|\ \ \ | | | | | | | | Fix crash on Android-x86 (2.1)
| * | | Fix crash on Android-x86Pedro J. Estébanez2017-04-051-0/+2
| |/ /
* | | Fixer looping timer accumulation in _processRémi Verschelde2017-04-051-3/+2
| | | | | | | | | | | | | | | | | | Follow-up to #8251. (cherry picked from commit 5b5a825c7fdb3a1f158a377e5febef7ab7b77903)
* | | previous value of time_left is added to wait_time before assigning to time_leftNikhil Shagrithaya2017-04-051-2/+1
| | | | | | | | | | | | (cherry picked from commit ea4fbee8f2778bc864cb930c69016cb175812da7)