MarianoGNU a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot ... # Solved Conflicts: # tools/editor/property_editor.cpp		2015-10-16 23:21:39 -03:00
..
2d	-A little More control about pixel snapping in 2D	2015-10-13 15:53:34 -03:00
3d	Merge branch 'master' of https://github.com/okamstudio/godot	2015-10-13 01:19:32 -03:00
animation	HTML5 exporter Improvements	2015-09-10 00:10:54 -03:00
audio	Please enter the commit message for your changes. Lines starting	2015-10-08 12:59:12 -03:00
gui	Merge branch 'master' of https://github.com/okamstudio/godot	2015-10-16 23:21:39 -03:00
io	Fixed theora playback. Removed theoraplayer.	2015-09-26 14:50:42 -03:00
main	-fixes and more fixes to new scene system, seems stable now..	2015-10-16 19:11:23 -03:00
resources	Merge branch 'master' of https://github.com/okamstudio/godot	2015-10-16 23:21:39 -03: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	Build System Changes	2014-10-07 01:31:49 -03:00