Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot ... Conflicts: main/main.cpp		2015-11-24 10:52:41 -03:00
..
2d	-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260	2015-11-19 10:41:20 -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 #2870 from neikeq/submenu_pos_fix	2015-11-23 11:53:30 +01: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	2015-11-24 10:52:41 -03:00
SCsub	Cosmetic fixes to SCons buildsystem	2015-11-01 20:53:26 +01:00
register_scene_types.cpp	-work in progress resourceparser and .tscn parser. Still non-functional	2015-11-24 10:42:05 -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