18 Commits

Author	SHA1	Message	Date
RosimInc	1c3388a352	Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx ... Conflicts: Assets/Art/T_Char_Stunned_03.png.meta Assets/Prefabs/Astronaut.prefab Assets/_Scenes/Main.unity	2016-04-09 16:13:48 -04:00
Sophie	cba3383deb	Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx	2016-04-09 15:39:10 -04:00
Sophie	f7e918afe6	Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx ... Conflicts: Assets/Scripts/AstronautAnimator.cs Assets/_Scenes/Main.unity	2016-04-09 15:39:06 -04:00
Jean-Sébastien Gervais	823631921a	Ajouté son spécifique au dash	2016-04-09 15:36:36 -04:00
Sophie	3fe039adae	Implemented stun & stun animation	2016-04-09 15:35:19 -04:00
Jean-Sébastien Gervais	1ad1b4acf2	Detroy des particle effects une fois terminés	2016-04-09 15:20:06 -04:00
RosimInc	656e25e293	Player height - fixed	2016-04-09 14:27:40 -04:00
RosimInc	83d93d31d8	Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx	2016-04-09 13:56:58 -04:00
RosimInc	63233c9e4d	Modified player height	2016-04-09 13:56:20 -04:00
Jean-Sébastien Gervais	1f1674f23a	Added 4 players in main scene, diff colors	2016-04-09 13:53:27 -04:00
Sophie	990560f27a	Walking animation	2016-04-09 13:11:32 -04:00
RosimInc	66e19edb03	aspi prefab anim settings	2016-04-09 11:05:14 -04:00
Jean-Sébastien Gervais	5954106bf0	Arrangé les animations Astronaut (state machines et animations) et activé le spin eject speed	2016-04-09 08:30:06 -04:00
Jean-Sébastien Gervais	5666779d20	Réglé problème Astronaute qui disparait au jump/dash	2016-04-09 07:42:23 -04:00
Jean-Sébastien Gervais	2d63fef4a0	merge	2016-04-08 22:34:39 -04:00
Jean-Sébastien Gervais	2344057072	Ajout rigid body à l'astronaute pour Stun si collision avec Asteroid	2016-04-08 20:16:59 -04:00
RosimInc	7e82a2b543	Forced text meta files	2016-04-08 07:56:02 -04:00
RosimInc	616594cab8	Started implementing and animating the character	2016-04-08 05:51:08 -04:00