Commit Graph

7 Commits

Author SHA1 Message Date
Rémi Verschelde 097eedbc73 Port 2D demos to TSCN/TRES formats
Part of #4196.
2016-04-02 14:39:08 +02:00
Rémi Verschelde 71341fc1c1 Add icons to all demos that can have a meaningful one 2015-11-19 23:45:37 +01:00
Bojidar Marinov b8b3b0ff57 Resolved a merge conflict. 2015-06-13 14:43:12 +03:00
Juan Linietsky 70b89fb092 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	demos/2d/motion/engine.cfg
2015-06-06 11:09:00 -03:00
Juan Linietsky 0370a976f1 small fixes 2015-06-01 23:35:23 -03:00
Juan Linietsky e2c589765e -fix bug in animation editor
-fix crash bug in physics motion, closes #1993
2015-05-27 17:30:50 -03:00
Juan Linietsky a74cf7cd22 -small motion demo, to better troubleshoot 2015-05-16 17:05:56 -03:00