6 commits

Author	SHA1	Message	Date
Juan Linietsky	2c2894ceb6	Merge branch 'master' of https://github.com/okamstudio/godot ... Conflicts: modules/gdscript/gd_tokenizer.cpp scene/resources/shader_graph.h	2015-03-03 14:41:36 -03:00
Juan Linietsky	4d2198110b	merges from okam repo	2015-03-03 14:39:13 -03:00
Rhody Lugo	d67e866788	add support for CADisplayLink	2015-02-10 22:10:10 -04:30
Juan Linietsky	d5cb758d36	NavMesh ... -=-=-=- -Fixed NavMesh API -New NavMesh demo -Support for animated Particles2D -Fixes for native video playback on iOS	2014-11-17 07:46:11 -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
Juan Linietsky	0b806ee0fc	GODOT IS OPEN SOURCE	2014-02-09 22:10:30 -03:00