aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3146 from akien-mga/pr-argument-namesRémi Verschelde2015-12-2853-288/+726
|\
| * Add missing argument names in GDScript bindingsRémi Verschelde2015-12-2842-236/+234
| * Fix wrong getters in ShaderGraphRémi Verschelde2015-12-281-6/+6
| * Remove bogus argument in body_get_nodeRémi Verschelde2015-12-284-5/+3
| * Remove bogus argument in sample_get_descriptionRémi Verschelde2015-12-286-7/+5
| * Style fix for rounded_values methods in RangeRémi Verschelde2015-12-282-15/+18
| * Sync doc with current sourceRémi Verschelde2015-12-271-21/+462
* | Merge branch 'master' of https://github.com/okamstudio/godotreduz2015-12-285-2/+12
|\|
| * Merge pull request #3140 from neikeq/fix_refresh_iconJuan Linietsky2015-12-264-2/+11
| |\
| | * Added reload icon to FileDialog's default themeIgnacio Etcheverry2015-12-264-2/+11
| * | fixes crash/deadlock when video is paused and unpaused, might affect audio sy...Ariel Manzur2015-12-261-0/+1
* | | -fixed rich text label fill alignment, always works nowreduz2015-12-281-13/+22
|/ /
* | Merge branch 'master' of https://github.com/okamstudio/godotreduz2015-12-261-8/+16
|\ \
| * \ Merge pull request #3138 from Hinsbart/joy_hotplugpunto-2015-12-261-8/+16
| |\ \
| | * | Fix joystick hotplugging on windows, using right indices nowHondres2015-12-261-8/+16
* | | | small optimization improvement to rich text label tablesreduz2015-12-261-4/+14
|/ / /
* | | Merge branch 'master' of https://github.com/okamstudio/godotreduz2015-12-2670-3216/+4076
|\ \ \
| * \ \ Merge pull request #3120 from Marqin/masterRémi Verschelde2015-12-241-11/+45
| |\ \ \
| | * | | upgrade .travis.ymlMarqin2015-12-231-11/+45
| | |/ /
| * | | Merge pull request #3131 from Hinsbart/missing_highlightRémi Verschelde2015-12-241-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Colorize Rect2 and NodePath in script editorhondres2015-12-241-0/+2
| |/ /
| * | Merge pull request #3124 from mrezai/libpng-iospunto-2015-12-231-4/+5
| |\ \
| | * | redundant TAB removedmrezai2015-12-231-1/+1
| | * | Fix ios libpng link errormrezai2015-12-231-4/+5
| * | | removed -ffast-math on ios, compiler bug?Ariel Manzur2015-12-231-7/+7
| |/ /
| * | Merge pull request #3116 from Ovnuniarchos/DocArea2DRémi Verschelde2015-12-221-15/+114
| |\ \
| | * | New area space override modes documented. Also, PhysicsBody2D, Area2D, and Co...Ovnuniarchos2015-12-221-15/+114
| |/ /
| * | Merge pull request #3071 from Ovnuniarchos/NewAreaCombinersJuan Linietsky2015-12-2210-25/+62
| |\ \
| | * | New and corrected are override modes.Ovnuniarchos2015-12-1410-25/+62
| * | | threadsAriel Manzur2015-12-222-1/+8
| * | | Merge pull request #3113 from Hinsbart/joy_fixJuan Linietsky2015-12-225-12/+18
| |\ \ \
| | * | | Check pkg-config for libudev and enable gamepad code only if found. Linux onl...hondres2015-12-215-12/+18
| | | |/ | | |/|
| * | | missing?Ariel Manzur2015-12-221-0/+7
| * | | testing patch for aligned reads by webp in javascriptAriel Manzur2015-12-223-0/+17
| |/ /
| * | threadAriel Manzur2015-12-211-2/+1
| * | -another approach to solving the deadlock problem :|Juan Linietsky2015-12-213-27/+20
| * | -fixed build system to use pkg-config for evdevJuan Linietsky2015-12-212-3/+8
| * | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-211-4/+9
| |\ \
| | * | too early to rename threadAriel Manzur2015-12-211-1/+2
| | * | Merge branch 'master' of https://github.com/godotengine/godotAriel Manzur2015-12-2156-3162/+3822
| | |\ \
| | * | | audio threadsAriel Manzur2015-12-211-3/+7
| * | | | -different attempt to avod deadlock problemJuan Linietsky2015-12-213-11/+23
| | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-2153-3137/+3797
| |\ \ \
| | * \ \ Merge pull request #3109 from mrezai/libpng-filter_neonRémi Verschelde2015-12-213-2/+236
| | |\ \ \
| | | * | | Fix libpng link errors on androidmrezai2015-12-213-2/+236
| | |/ / /
| | * | | windows resource version thingAriel Manzur2015-12-201-2/+2
| | * | | this failed on mingw on linux (but not on msvc) with 2 problems:Ariel Manzur2015-12-201-3/+3
| | * | | this failed in msvc, didn't in linux and mingwAriel Manzur2015-12-202-5/+2
| | * | | fix debouncing in axis buttonsAriel Manzur2015-12-201-1/+6
| | * | | Merge pull request #3101 from Hinsbart/remapping-newpunto-2015-12-2015-530/+1714
| | |\ \ \