5 Commits

Author SHA1 Message Date
jventalon
0819f51529 Player health 2015-11-19 21:24:31 -05:00
jventalon
1daff51b46 Merge branch 'master' into justine_develop
Conflicts:
	Assets/Prefabs.meta
2015-11-19 12:06:19 -05:00
jventalon
23424c7b2d health added 2015-11-19 11:58:17 -05:00
FrancisGallant
97abe3ae11 shoot de missile et tuer les ennemis 2015-11-16 18:24:36 -05:00
FrancisGallant
8426a784f8 prefab ennemy et floor pour patrol 2015-11-11 18:42:02 -05:00