summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2015-12-20Merge pull request #3101 from Hinsbart/remapping-newpunto-
Better gamepad support
2015-12-20Merge pull request #3058 from akien-mga/pr-libpng-1.5.25Rémi Verschelde
Update to libpng 1.5.26
2015-12-19Update to libpng 1.5.26Rémi Verschelde
Includes numerous security fixes compared to the previous version which was around 1.5.7 or so. Fixes #2787
2015-12-18Use tabs instead of spaces for new gamepad codehondres
2015-12-18thread can't rename itself on initialization :(Ariel Manzur
2015-12-18naming the audio thread from within itselfAriel Manzur
2015-12-18thread renaming by core_bindAriel Manzur
2015-12-18thread rename for ios and osx (if called from the thread to be renamed)Ariel Manzur
2015-12-18Better gamepad supporthondres
2015-12-17Merge branch 'master' of https://github.com/godotengine/godotAriel Manzur
2015-12-17thread set nameAriel Manzur
2015-12-16Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky
2015-12-16-fix function calls in animationtree, closes #2789Juan Linietsky
2015-12-16Merge pull request #3090 from neikeq/fix_3088Rémi Verschelde
Fix Remove Item option in TileSet plugin
2015-12-16compile thingAriel Manzur
2015-12-16small fix for undo redoJuan Linietsky
2015-12-16added labels to sections and propertiesJuan Linietsky
2015-12-15Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky
2015-12-15-split view of property editor and editor settingsJuan Linietsky
2015-12-15Fix Remove Item option in TileSet pluginIgnacio Etcheverry
2015-12-15Merge pull request #3080 from akien-mga/pr-input-presetsRémi Verschelde
Prevent deleting input presets as it does not work
2015-12-15Merge pull request #3083 from TheHX/pr-file-dialogRémi Verschelde
Add editor setting for display mode on file dialog and filesystem dock
2015-12-15Add editor setting for display mode on file dialog and filesystem dockFranklin Sobrinho
2015-12-15Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky