Conjure/PixelSphinx
6
0
Fork 0
mirror of https://github.com/ConjureETS/PixelSphinx.git synced 2026-03-24 10:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
136 Commits 2 Branches 0 Tags
Commit Graph

128 Commits

Author SHA1 Message Date
Jean-Sébastien Gervais
4f76ffdc78 Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 16:22:05 -04:00
Jean-Sébastien Gervais
03fc23ed5c appliqué shake sur Earthquake 2016-04-09 16:21:58 -04:00
RosimInc
bf8d43e571 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 16:21:12 -04:00
RosimInc
9e0baf92a1 Added selection 2016-04-09 16:20:45 -04:00
Jean-Sébastien Gervais
038748f96d Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 16:16:03 -04:00
Jean-Sébastien Gervais
412af97ba8 Camera shakeable 2016-04-09 16:15:55 -04:00
RosimInc
f793c4a962 Added missing dependencies 2016-04-09 16:15:16 -04:00
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
RosimInc
c1582a88a1 Applied earthquake 2016-04-09 16:11:22 -04:00
Sophie
076c8daf55 fixed ejecting failing because of stun 2016-04-09 16:02:17 -04:00
Sophie
bca04d6125 added colour to stun animation 2016-04-09 15:42:36 -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
7b11fad39c Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 15:20:13 -04:00
Jean-Sébastien Gervais
1ad1b4acf2 Detroy des particle effects une fois terminés 2016-04-09 15:20:06 -04:00
RosimInc
db6a7e1fe9 Fixed player controller 2016-04-09 14:28:20 -04:00
RosimInc
656e25e293 Player height - fixed 2016-04-09 14:27:40 -04:00
Sophie
741c3cbf75 returned to idle after dash hit ground 2016-04-09 14:27:11 -04:00
Sophie
3f148d1ed5 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 14:03:01 -04:00
Sophie
1a4076cd77 starting stun implement 2016-04-09 14:02:58 -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
Jean-Sébastien Gervais
49f9f102af Whizz ejecting player sound 2016-04-09 13:46:10 -04:00
Jean-Sébastien Gervais
ea0a08d91f Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 13:41:43 -04:00
Jean-Sébastien Gervais
42b7238a7f Earth crush shounds 2016-04-09 13:41:32 -04:00
RosimInc
362c0769ec Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 13:30:53 -04:00
RosimInc
dd1775acc3 Activated player 2 2016-04-09 13:30:47 -04:00
Jean-Sébastien Gervais
903b354209 sound level asteroid vs bg music 2016-04-09 13:28:22 -04:00
Jean-Sébastien Gervais
296b0ca2b7 Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 13:23:35 -04:00
Jean-Sébastien Gervais
0a17a2c7d8 Added audio source and asteroid 3d surround sound! (left/right) 2016-04-09 13:23:27 -04:00
SarahRipley
8b43744827 Added shockzave pqrticles 2016-04-09 13:21:03 -04:00
RosimInc
74982f9f63 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/Astronaut.cs
	Assets/Scripts/PlanetManager.cs
 2016-04-09 13:18:18 -04:00
RosimInc
9753ed511b win check 2016-04-09 13:12:43 -04:00
Sophie
990560f27a Walking animation 2016-04-09 13:11:32 -04:00
Sophie
803bd94c77 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 11:58:06 -04:00
Sophie
ffb6237071 Player movement - functional 2016-04-09 11:57:59 -04:00
Jean-Sébastien Gervais
b87d8e17d1 Temps avant que la plateforme oposée redescende d'elle même 2016-04-09 11:46:09 -04:00
Jean-Sébastien Gervais
382aff681a Ajout nouveau background et atmosphere, recul camera. ajout délai avant que plateforme baisse à son état normal 2016-04-09 11:34:24 -04:00
Jean-Sébastien Gervais
c65ec6333e Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 11:10:24 -04:00
Jean-Sébastien Gervais
5bec826b3e PushWedge : appliquer différentiel de poussé seulement 2016-04-09 11:10:11 -04:00
Sophie
3abe330df1 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 11:06:20 -04:00
RosimInc
66e19edb03 aspi prefab anim settings 2016-04-09 11:05:14 -04:00
Sophie
26e9009cbf Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 11:01:21 -04:00
Sophie
5d17f3575a Adapted movement - Started implementation 2016-04-09 11:01:15 -04:00
RosimInc
fc2a807349 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Prefabs/Astronaut.prefab
	Assets/Scripts/PlanetManager.cs
 2016-04-09 10:37:54 -04:00
RosimInc
796b5e6975 fixed last commit (astronaut prefab) 2016-04-09 10:33:47 -04:00
RosimInc
da216027d2 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/PlanetManager.cs
 2016-04-09 10:32:43 -04:00