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
..
2d	Merge branch 'master' of https://github.com/okamstudio/godot	2015-03-03 14:41:36 -03:00
3d	support for 2D shadow casters	2015-03-02 00:54:43 -03:00
animation	Add call deferred support for Tween	2015-01-07 19:46:01 +08:00
audio	-refresh play options in property when setting samplelibrary (#1016)	2015-01-02 14:32:05 -03:00
gui	support for light and normal mapping in 2D	2015-02-18 19:40:02 -03:00
io	Bug Fixes	2014-11-02 11:31:01 -03:00
main	added option to disable automatic clearing of viewport render buffer	2015-02-21 01:35:06 -08:00
resources	merges from okam repo	2015-03-03 14:39:13 -03:00
SCsub	Build System Changes	2014-10-07 01:31:49 -03:00
register_scene_types.cpp	support for 2D shadow casters	2015-03-02 00:54:43 -03:00
register_scene_types.h	GODOT IS OPEN SOURCE	2014-02-09 22:10:30 -03:00
scene_string_names.cpp	support for 2D shadow casters	2015-03-02 00:54:43 -03:00
scene_string_names.h	support for 2D shadow casters	2015-03-02 00:54:43 -03:00