summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-28Merge pull request #3146 from akien-mga/pr-argument-namesRémi Verschelde
Add missing argument names in GDScript bindings + related fixes
2015-12-28Merge branch 'master' of https://github.com/okamstudio/godotreduz
2015-12-28-fixed rich text label fill alignment, always works nowreduz
-made also sure it doesn't crash, fixes #2688
2015-12-28Add missing argument names in GDScript bindingsRémi Verschelde
All classes were reviewed apart from VisualServer for which no argument name is documented at all. While doing this review, I found quite a few bugs that were fixed either in earlier commits or this one (mostly documentation bugs though, i.e. some arguments were listed at the wrong place).
2015-12-28Fix wrong getters in ShaderGraphRémi Verschelde
2015-12-28Remove bogus argument in body_get_nodeRémi Verschelde
2015-12-28Remove bogus argument in sample_get_descriptionRémi Verschelde
Copy-paste mistake from the setter most likely.
2015-12-28Style fix for rounded_values methods in RangeRémi Verschelde
2015-12-27Sync doc with current sourceRémi Verschelde
2015-12-26Merge pull request #3140 from neikeq/fix_refresh_iconJuan Linietsky
Add reload icon to FileDialog's default theme
2015-12-26fixes crash/deadlock when video is paused and unpaused, might affect audio ↵Ariel Manzur
sync tho
2015-12-26Merge branch 'master' of https://github.com/okamstudio/godotreduz
2015-12-26small optimization improvement to rich text label tablesreduz
2015-12-26Added reload icon to FileDialog's default themeIgnacio Etcheverry
2015-12-26Merge pull request #3138 from Hinsbart/joy_hotplugpunto-
Fix joystick hotplugging on windows, using right indices now
2015-12-26Merge branch 'master' of https://github.com/okamstudio/godotreduz
2015-12-26-Added table support to RichTextLabelreduz
-Made help more readable, closes #2851
2015-12-26Fix joystick hotplugging on windows, using right indices nowHondres
2015-12-24Merge pull request #3120 from Marqin/masterRémi Verschelde
.travis.yml upgrade
2015-12-24Merge pull request #3131 from Hinsbart/missing_highlightRémi Verschelde
Add missing keyword highlights for Rect2 and NodePath.
2015-12-24Colorize Rect2 and NodePath in script editorhondres
2015-12-23upgrade .travis.ymlMarqin
Now it test 6 builds: * Ubuntu 14.04 - x11 (g++) * Ubuntu 14.04 - x11 (clang++) * Ubuntu 14.04 - windows (via MinGW) * OS X - osx (g++) * OS X - osx (clang++) * OS X - android * OS X - iphone Instead of just g++ on Ubuntu 12.04...
2015-12-23Merge pull request #3124 from mrezai/libpng-iospunto-
Fix ios libpng link error
2015-12-23removed -ffast-math on ios, compiler bug?Ariel Manzur
2015-12-23redundant TAB removedmrezai
2015-12-23Fix ios libpng link errormrezai
2015-12-22Merge pull request #3116 from Ovnuniarchos/DocArea2DRémi Verschelde
New area space override modes documented.
2015-12-22New area space override modes documented. Also, PhysicsBody2D, Area2D, and ↵Ovnuniarchos
CollisionObject2D.
2015-12-22Merge pull request #3071 from Ovnuniarchos/NewAreaCombinersJuan Linietsky
New and corrected area override modes.
2015-12-22threadsAriel Manzur
2015-12-22Merge pull request #3113 from Hinsbart/joy_fixJuan Linietsky
Check pkg-config for libudev and enable gamepad code only if found.
2015-12-22missing?Ariel Manzur
2015-12-22testing patch for aligned reads by webp in javascriptAriel Manzur
2015-12-21Check pkg-config for libudev and enable gamepad code only if found. Linux ↵hondres
only for now
2015-12-21threadAriel Manzur
2015-12-21-another approach to solving the deadlock problem :|Juan Linietsky
2015-12-21-fixed build system to use pkg-config for evdevJuan Linietsky
2015-12-21Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky
2015-12-21-different attempt to avod deadlock problemJuan Linietsky
2015-12-21too early to rename threadAriel Manzur
2015-12-21Merge branch 'master' of https://github.com/godotengine/godotAriel Manzur
2015-12-21Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky
2015-12-21-Fix to progress dialog, speding it upJuan Linietsky
-Fix potential deadlock in stream player -Fix collada to support broken files from ColladaMaya
2015-12-21audio threadsAriel Manzur
2015-12-21Merge pull request #3109 from mrezai/libpng-filter_neonRémi Verschelde
Fix libpng link errors on android
2015-12-21Fix libpng link errors on androidmrezai
2015-12-20windows resource version thingAriel Manzur
2015-12-20this failed on mingw on linux (but not on msvc) with 2 problems:Ariel Manzur
1) it didn't print the error to the console, only this: build_res_file(["platform/windows/godot_res.windows.tools.32.o"], ["platform/windows/godot_res.rc"]) scons: *** [platform/windows/godot_res.windows.tools.32.o] Error 1 I had to print the actual command and run it on a console to see the error. The builder should be able to print the command it's running and the error, like it does with compiler invocations, etc. 2) The actual error was a syntax error on line 11 of godot_res.rc. I looked up "FILEVERSION" and "PRODUCTVERSION" (here https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx), it says they take 4 numbers as parameters, so I added those 0s, but I'm not sure if they're in the right order. @masoudbh3 can you check it out? thanks It builds on msvc just fine with (and without) these changes.
2015-12-20this failed in msvc, didn't in linux and mingwAriel Manzur
2015-12-20fix debouncing in axis buttonsAriel Manzur