Juan Linietsky 954256268a Merge branch 'master' of https://github.com/okamstudio/godot ... Conflicts: demos/2d/motion/engine.cfg		2015-06-06 11:09:00 -03:00
..
2d	Merge branch 'master' of https://github.com/okamstudio/godot	2015-06-06 11:09:00 -03:00
3d	Merge pull request #1881 from NateWardawg/master	2015-05-16 13:47:04 -03:00
gui	Add input mapping GUI demo	2015-05-20 17:38:41 +02:00
misc	added a built-in scene changer API, closes #1928	2015-05-17 16:33:35 -03:00
viewport	-Fixed screen capture for viewports, added a screen capture demo, fixes #1529	2015-04-12 18:58:05 -03:00