Commit graph

6 commits

Author SHA1 Message Date
Rémi Verschelde
9d22501630 Add icons to all demos that can have a meaningful one 2015-11-19 23:45:37 +01:00
Bojidar Marinov
5a0de04eb7 Resolved a merge conflict. 2015-06-13 14:43:12 +03:00
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
Juan Linietsky
0e1510214a small fixes 2015-06-01 23:35:23 -03:00
Juan Linietsky
f62961aba3 -fix bug in animation editor
-fix crash bug in physics motion, closes #1993
2015-05-27 17:30:50 -03:00
Juan Linietsky
1e382dbb18 -small motion demo, to better troubleshoot 2015-05-16 17:05:56 -03:00