4 commits

Author	SHA1	Message	Date
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
Juan Linietsky	31ce3c5fd0	-fix bug in cache for atlas import/export ... -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-03-13 22:57:24 -03:00
sanikoyes	87fd153215	fixed editor NodePath property	2014-03-11 13:38:30 +08:00
Juan Linietsky	0b806ee0fc	GODOT IS OPEN SOURCE	2014-02-09 22:10:30 -03:00