5 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	cde48d0c9c	fix gdscript path parse error	2014-03-11 13:30:33 +08:00
Juan Linietsky	b2ce682f6e	-scripts are converted to bytecode on export ... -fix bug in doc where touchscreen events were not documented	2014-02-25 09:31:47 -03:00
Juan Linietsky	4b07eb8deb	-moved script to modules	2014-02-24 09:53:33 -03:00