summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-13-fix bug in cache for atlas import/exportJuan Linietsky
-fix some menus -fixed bug in out transition curves -detect and remove file:/// in collada -remove multiscript for now -remove dependencies on mouse in OS, moved to Input -avoid fscache from screwing up (fix might make it slower, but it works) -funcref was missing, it's there now
2014-02-26Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-26fixieJuan Linietsky
2014-02-26Merge pull request #133 from vinzenz/masterokamstudio
More fixes to the build system
2014-02-26Merge pull request #136 from marynate/PR-fix-scenedock-instance-btnokamstudio
Instance button of SceneDock now working
2014-02-26Merge pull request #137 from marynate/PR-expose-f-key-to-center-selokamstudio
Add F key to center 3d viewport to selected node
2014-02-26Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-26Merge branch 'freebsd-cleanup' of https://github.com/robmessick/godot into ↵Juan Linietsky
robmessick-freebsd-cleanup
2014-02-26Merge pull request #141 from vinzenz/texture-import-plugin-typookamstudio
Typo in 'Atlas Texture' import menu entry
2014-02-26Merge pull request #144 from C4NCER/masterokamstudio
move away from deprecated Options class and update .gitignore
2014-02-26-Added ATITC texture supportJuan Linietsky
-Fixed bug of some tabs showing wrong names -Exported properties for viewport
2014-02-25-scripts are converted to bytecode on exportJuan Linietsky
-fix bug in doc where touchscreen events were not documented
2014-02-25add logo.h to .gitignoreC4NCER
2014-02-25Switch from using deprecated Options class to VariablesC4NCER
2014-02-24fixie readmeJuan Linietsky
2014-02-24-moved script to modulesJuan Linietsky
2014-02-24Typo in 'Atlas Texture' import menu entryVinzenz Feenstra
Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-23Unused comparison causes error on clang. Suspect this was a typo.Rob Messick
2014-02-23ifdef out body of probe_joystick and process_joysticks on freebsd until a ↵Rob Messick
working implementation is completed
2014-02-23Only include linux/joystick.h on linuxRob Messick
2014-02-23alloca() lives in stdlib.h on FreeBSDRob Messick
2014-02-23-fixed bug importing skeletonsJuan Linietsky
2014-02-23-Fix for parsing XML headerJuan Linietsky
2014-02-23hoJuan Linietsky
2014-02-23Add F key to center 3d viewport to selected nodemarynate
2014-02-23Instance button of SceneDock now workingmarynate
2014-02-22Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-22-added kinematic bodyJuan Linietsky
-added kinematic body demos
2014-02-22Fix for 64Bit builds with VC from command lineVinzenz Feenstra
Previously builds for 64 Bit targets on the x64 Native Tools Command Prompt failed while trying to link the 64Bit build godot objects with 32Bit vc libraries. This was due to wrong library directories. Since there are the environment variables INCLUDE and LIB which are containing the correct paths this patch uses those now to fix the linking issue. Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-22Fix handling for CFLAGS and LINKFLAGS like for CCFLAGSVinzenz Feenstra
Previously CFLAGS and LINKFLAGS were passed as a single quoted argument to the compiler or linker. This patch splits the paramters. Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
2014-02-21Merge pull request #132 from samsaga2/masterokamstudio
Removed OF
2014-02-21Removed OFVictor M
2014-02-20Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-20-run script in editorJuan Linietsky
-add search docs dialog that returns places string was found -added flash
2014-02-20Merge pull request #74 from rrockru/masterokamstudio
Fixed build issue on linux (missing webp include path).
2014-02-20Merge pull request #88 from marynate/PR-More_gitignoreokamstudio
More gitignore
2014-02-20Merge pull request #89 from marynate/PR-Fix_iOS_Simulator_Buildokamstudio
Fix iOS Simulator Build
2014-02-20Merge pull request #104 from Nr7/masterokamstudio
Fixed two incorrect bindings in Physics2DServer
2014-02-20Merge pull request #107 from bscranton/masterokamstudio
Windows StreamPeerWinsock::set_nodelay implementation
2014-02-20Merge pull request #109 from vinzenz/project-exportokamstudio
tools/editor/project_export: tree_vb already has a parent
2014-02-20Merge pull request #116 from olifly/masterokamstudio
Added function "get_tiles_ids" to TreeSet.
2014-02-20Merge pull request #123 from Terseus/fix-113_editor-settings-xml-corruptionokamstudio
Fix #113 editor_settings.xml corruption
2014-02-20Merge pull request #124 from kevinhartman/masterokamstudio
Fixed OS X retina initial videomode size
2014-02-20Merge pull request #128 from marynate/PR-stop-tracking-logo-hokamstudio
Stop tracking platform/server/logo.h for it will be autogenerated
2014-02-20Merge pull request #110 from vinzenz/108-fixokamstudio
Fix for Issue #108
2014-02-19wtfJuan Linietsky
2014-02-19Merge remote-tracking branch 'upstream/master'Olafur Haukur Flygenring
2014-02-19Stop tracking platform/server/logo.h for it will be autogeneratedmarynate
2014-02-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2014-02-19-improved physics ccdJuan Linietsky
-html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken