Commit Graph

Select branches

Hide Pull Requests

StashBeforeJudgesPreview

master

Mono Color

• d623e15232 Added the main menu functionality - Demo build master RosimInc 2016-04-13 12:49:41 -04:00
• cfc6224f6d changed eject anim Sophie 2016-04-09 18:01:12 -04:00
• 4f72e5358f last commit Jean-Sébastien Gervais 2016-04-09 17:50:23 -04:00
• 5c2a39d4bc world manager Jean-Sébastien Gervais 2016-04-09 17:49:07 -04:00
• c1c7453ac2 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 17:42:17 -04:00
• bd90aa8936 Added main menu RosimInc 2016-04-09 17:42:10 -04:00
• 1b8597e15f Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 17:32:10 -04:00
• 39938c1408 removed buttons Sophie 2016-04-09 17:32:05 -04:00
• 53624d4eb5 Changé valeur critique exlosion pour 0.9 Jean-Sébastien Gervais 2016-04-09 17:29:22 -04:00
• db73333e2a Landing prouts revenus Jean-Sébastien Gervais 2016-04-09 17:24:26 -04:00
• 48bf509abe Exploding sound planet Jean-Sébastien Gervais 2016-04-09 17:17:36 -04:00
• ad03730dbb Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 17:09:37 -04:00
• d6a3295fa3 Started main menu RosimInc 2016-04-09 17:08:22 -04:00
• 13f5006e4c Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 17:02:58 -04:00
• 53bf519590 Réactivé boom naturel. PlanetManager vérifie combien de player restants Jean-Sébastien Gervais 2016-04-09 17:02:51 -04:00
• b3fc993edd Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 16:34:00 -04:00
• f966bf235c WorldManager singelton Sophie 2016-04-09 16:33:57 -04:00
• 6b5e27bd97 repush main Jean-Sébastien Gervais 2016-04-09 16:23:33 -04:00
• 4f76ffdc78 Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 16:22:05 -04:00
• 03fc23ed5c appliqué shake sur Earthquake Jean-Sébastien Gervais 2016-04-09 16:21:58 -04:00
• bf8d43e571 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 16:21:12 -04:00
• 9e0baf92a1 Added selection RosimInc 2016-04-09 16:20:45 -04:00
• 038748f96d Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 16:16:03 -04:00
• 412af97ba8 Camera shakeable Jean-Sébastien Gervais 2016-04-09 16:15:55 -04:00
• f793c4a962 Added missing dependencies RosimInc 2016-04-09 16:15:16 -04:00
• 1c3388a352 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 16:13:48 -04:00
• c1582a88a1 Applied earthquake RosimInc 2016-04-09 16:11:22 -04:00
• 076c8daf55 fixed ejecting failing because of stun Sophie 2016-04-09 16:02:17 -04:00
• bca04d6125 added colour to stun animation Sophie 2016-04-09 15:42:36 -04:00
• cba3383deb Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 15:39:10 -04:00
• f7e918afe6 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 15:39:06 -04:00
• 823631921a Ajouté son spécifique au dash Jean-Sébastien Gervais 2016-04-09 15:36:36 -04:00
• 3fe039adae Implemented stun & stun animation Sophie 2016-04-09 15:35:19 -04:00
• 7b11fad39c Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 15:20:13 -04:00
• 1ad1b4acf2 Detroy des particle effects une fois terminés Jean-Sébastien Gervais 2016-04-09 15:20:06 -04:00
• db6a7e1fe9 Fixed player controller RosimInc 2016-04-09 14:28:20 -04:00
• 656e25e293 Player height - fixed RosimInc 2016-04-09 14:27:40 -04:00
• 741c3cbf75 returned to idle after dash hit ground Sophie 2016-04-09 14:27:11 -04:00
• 3f148d1ed5 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 14:03:01 -04:00
• 1a4076cd77 starting stun implement Sophie 2016-04-09 14:02:58 -04:00
• 83d93d31d8 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 13:56:58 -04:00
• 63233c9e4d Modified player height RosimInc 2016-04-09 13:56:20 -04:00
• 1f1674f23a Added 4 players in main scene, diff colors Jean-Sébastien Gervais 2016-04-09 13:53:27 -04:00
• 49f9f102af Whizz ejecting player sound Jean-Sébastien Gervais 2016-04-09 13:46:10 -04:00
• ea0a08d91f Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 13:41:43 -04:00
• 42b7238a7f Earth crush shounds Jean-Sébastien Gervais 2016-04-09 13:41:32 -04:00
• 362c0769ec Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 13:30:53 -04:00
• dd1775acc3 Activated player 2 RosimInc 2016-04-09 13:30:47 -04:00
• 903b354209 sound level asteroid vs bg music Jean-Sébastien Gervais 2016-04-09 13:28:22 -04:00
• 296b0ca2b7 Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 13:23:35 -04:00
• 0a17a2c7d8 Added audio source and asteroid 3d surround sound! (left/right) Jean-Sébastien Gervais 2016-04-09 13:23:27 -04:00
• 8b43744827 Added shockzave pqrticles SarahRipley 2016-04-09 13:20:52 -04:00
• 74982f9f63 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 13:18:18 -04:00
• 9753ed511b win check RosimInc 2016-04-09 13:12:43 -04:00
• 990560f27a Walking animation Sophie 2016-04-09 13:11:32 -04:00
• 803bd94c77 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 11:58:06 -04:00
• ffb6237071 Player movement - functional Sophie 2016-04-09 11:57:59 -04:00
• b87d8e17d1 Temps avant que la plateforme oposée redescende d'elle même Jean-Sébastien Gervais 2016-04-09 11:46:09 -04:00
• 382aff681a Ajout nouveau background et atmosphere, recul camera. ajout délai avant que plateforme baisse à son état normal Jean-Sébastien Gervais 2016-04-09 11:34:24 -04:00
• c65ec6333e Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 11:10:24 -04:00
• 5bec826b3e PushWedge : appliquer différentiel de poussé seulement Jean-Sébastien Gervais 2016-04-09 11:10:11 -04:00
• 3abe330df1 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 11:06:20 -04:00
• 66e19edb03 aspi prefab anim settings RosimInc 2016-04-09 11:05:14 -04:00
• 26e9009cbf Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-09 11:01:21 -04:00
• 5d17f3575a Adapted movement - Started implementation Sophie 2016-04-09 11:01:15 -04:00
• fc2a807349 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 10:37:54 -04:00
• 796b5e6975 fixed last commit (astronaut prefab) RosimInc 2016-04-09 10:33:47 -04:00
• da216027d2 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-09 10:32:43 -04:00
• 97510a28f1 Exploisions autoplay, essais de gérer leur desctuction après fin de l'animation automatiquement, sans succès. Jean-Sébastien Gervais 2016-04-09 10:20:24 -04:00
• a53274aae3 Ajout musique de fond; AsteroidSpawner - arreter d'envoyer des asteroides vers un joueur éjecté Jean-Sébastien Gervais 2016-04-09 09:50:22 -04:00
• 2b2c52909a FEEDBACK : Pousser la plateforme avec le dash une fois qu'on touche au sol. (pas avant) Jean-Sébastien Gervais 2016-04-09 09:08:16 -04:00
• 5954106bf0 Arrangé les animations Astronaut (state machines et animations) et activé le spin eject speed Jean-Sébastien Gervais 2016-04-09 08:30:06 -04:00
• 5666779d20 Réglé problème Astronaute qui disparait au jump/dash Jean-Sébastien Gervais 2016-04-09 07:42:23 -04:00
• e74a016c9c Un earthquake peut aussi nous ejecter Jean-Sébastien Gervais 2016-04-09 07:32:44 -04:00
• 40ab26bde0 earthquake visual RosimInc 2016-04-09 01:58:41 -04:00
• 00a6812a96 remis vSpeed privée après debug Jean-Sébastien Gervais 2016-04-09 00:40:52 -04:00
• db498414a4 Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-09 00:34:06 -04:00
• 3a7d1de39f Ejection de l'astronaute sur impact plaque et si atteint le maximum hauteur et toujours au sol.. Jean-Sébastien Gervais 2016-04-09 00:34:00 -04:00
• 2be41bbd14 A - Added particleSystem destined to the Dash Impact Effect. Thibault Stones 2016-04-09 00:17:57 -04:00
• c0c7600e33 Ajout des explosions aux autres astéroides Jean-Sébastien Gervais 2016-04-08 23:48:56 -04:00
• b3dfa5d641 Des explosions, partout ! Jean-Sébastien Gervais 2016-04-08 23:19:00 -04:00
• 653cd7aecc A - Added an entier explosion particle made for meteors impacts. Thibault Stones 2016-04-08 22:32:41 -04:00
• 26bd529a1a erreur compile Jean-Sébastien Gervais 2016-04-08 22:38:24 -04:00
• 72d816a7cc Merge branch 'master' of github.com:ETSConjure/PixelSphinx Jean-Sébastien Gervais 2016-04-08 22:35:44 -04:00
• 2d63fef4a0 merge Jean-Sébastien Gervais 2016-04-08 22:34:39 -04:00
• f6269e20bb ajout gameobject pour ajouter des particle emitters aux Asteroids Jean-Sébastien Gervais 2016-04-08 22:33:50 -04:00
• 72b4975ab1 All merges accepted Sophie 2016-04-08 22:26:21 -04:00
• 9983916ebc Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-08 22:07:20 -04:00
• 8d80c2fbdc Corrected merge errors Sophie 2016-04-08 22:02:02 -04:00
• 2e8bfdb900 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-08 21:59:01 -04:00
• ddf091d610 fixed asteroid spawn opposite of player RosimInc 2016-04-08 21:58:50 -04:00
• de65b90941 Earthquake implemented and added prefabs Jean-Sébastien Gervais 2016-04-08 21:29:33 -04:00
• c73e09979a Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-08 21:22:23 -04:00
• 0a8ddfb1f4 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx Sophie 2016-04-08 21:21:17 -04:00
• 71bb17694f Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-08 21:13:19 -04:00
• d5ca619635 Background and kernel slow random rotation. Jean-Sébastien Gervais 2016-04-08 20:59:15 -04:00
• 6f39d6f841 character animation - idle, walk, dash, spin Sophie 2016-04-08 20:37:16 -04:00
• ba7adf42ae rotation asteroids et corrigé astronaute qui se tient pas debout (avant de se faire pogner par un asteroid). Reste a faire reset de son orientation quand passe état stun a idle) Jean-Sébastien Gervais 2016-04-08 20:34:38 -04:00
• d088224ec7 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx RosimInc 2016-04-08 20:23:48 -04:00
• 2344057072 Ajout rigid body à l'astronaute pour Stun si collision avec Asteroid Jean-Sébastien Gervais 2016-04-08 20:16:59 -04:00