Saracen dd00452997 Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color ... Conflicts: drivers/gles2/shader_compiler_gles2.cpp		2015-11-18 23:18:10 +00:00
..
2d	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
3d	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
animation	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
audio	Cosmetic fixes to SCons buildsystem	2015-11-01 20:53:26 +01:00
gui	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
io	Cosmetic fixes to SCons buildsystem	2015-11-01 20:53:26 +01:00
main	Merge pull request #2707 from akien-mga/master	2015-11-18 19:43:28 -03:00
resources	Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color	2015-11-18 23:18:10 +00:00
register_scene_types.cpp	-fixes and more fixes to new scene system, seems stable now..	2015-10-16 19:11:23 -03:00
register_scene_types.h	Updated copyright year in all headers	2015-04-18 14:38:54 -03:00
scene_string_names.cpp	Several performance improvements, mainly in loading and instancing scenes and resources.	2015-06-29 00:29:49 -03:00
scene_string_names.h	Several performance improvements, mainly in loading and instancing scenes and resources.	2015-06-29 00:29:49 -03:00
SCsub	Cosmetic fixes to SCons buildsystem	2015-11-01 20:53:26 +01:00