godot/scene
Juan Linietsky 0a717ffee2 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java
2014-03-13 23:14:35 -03:00
..
2d -fix bug in cache for atlas import/export 2014-03-13 22:57:24 -03:00
3d -fixed bug importing skeletons 2014-02-23 10:35:05 -03:00
animation -fixed export templates not loading/exporting on Windows 2014-02-13 18:03:28 -03:00
audio GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00
gui Merge pull request #151 from marynate/PR-fix-line-edit-bind-select 2014-02-28 14:50:50 -02:00
io -fix bug in cache for atlas import/export 2014-03-13 22:57:24 -03:00
main -Added ATITC texture support 2014-02-26 10:08:17 -03:00
resources -fix bug in cache for atlas import/export 2014-03-13 22:57:24 -03:00
SCsub wtf 2014-02-19 18:09:52 -03:00
register_scene_types.cpp -added kinematic body 2014-02-22 20:28:19 -03:00
register_scene_types.h GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00
scene_binds.cpp GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00
scene_binds.h GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00
scene_string_names.cpp GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00
scene_string_names.h GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00