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

144 Commits

Author SHA1 Message Date
Jean-Sébastien Gervais
4f72e5358f last commit 2016-04-09 17:50:23 -04:00
Jean-Sébastien Gervais
5c2a39d4bc world manager 2016-04-09 17:49:07 -04:00
RosimInc
c1c7453ac2 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 17:42:17 -04:00
RosimInc
bd90aa8936 Added main menu 2016-04-09 17:42:10 -04:00
Sophie
1b8597e15f Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 17:32:10 -04:00
Sophie
39938c1408 removed buttons 2016-04-09 17:32:05 -04:00
Jean-Sébastien Gervais
53624d4eb5 Changé valeur critique exlosion pour 0.9 2016-04-09 17:29:22 -04:00
Jean-Sébastien Gervais
db73333e2a Landing prouts revenus 2016-04-09 17:24:26 -04:00
Jean-Sébastien Gervais
48bf509abe Exploding sound planet 2016-04-09 17:17:36 -04:00
RosimInc
ad03730dbb Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/PlanetManager.cs
 2016-04-09 17:09:37 -04:00
RosimInc
d6a3295fa3 Started main menu 2016-04-09 17:08:22 -04:00
Jean-Sébastien Gervais
13f5006e4c Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-09 17:02:58 -04:00
Jean-Sébastien Gervais
53bf519590 Réactivé boom naturel. PlanetManager vérifie combien de player restants 2016-04-09 17:02:51 -04:00
Sophie
b3fc993edd Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-09 16:34:00 -04:00
Sophie
f966bf235c WorldManager singelton 2016-04-09 16:33:57 -04:00
Jean-Sébastien Gervais
6b5e27bd97 repush main 2016-04-09 16:23:33 -04:00
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