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

66 Commits

Author SHA1 Message Date
Sophie
9983916ebc Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/Astronaut.cs
	Assets/Scripts/PlanetManager.cs
 2016-04-08 22:07:20 -04:00
Sophie
8d80c2fbdc Corrected merge errors 2016-04-08 22:02:02 -04:00
RosimInc
2e8bfdb900 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 21:59:01 -04:00
RosimInc
ddf091d610 fixed asteroid spawn opposite of player 2016-04-08 21:58:50 -04:00
Jean-Sébastien Gervais
de65b90941 Earthquake implemented and added prefabs 2016-04-08 21:29:33 -04:00
Sophie
c73e09979a Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 21:22:23 -04:00
Sophie
0a8ddfb1f4 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/Astronaut.cs
	Assets/Scripts/PlanetManager.cs
 2016-04-08 21:21:17 -04:00
RosimInc
71bb17694f Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 21:13:19 -04:00
Jean-Sébastien Gervais
d5ca619635 Background and kernel slow random rotation. 2016-04-08 20:59:15 -04:00
Sophie
6f39d6f841 character animation - idle, walk, dash, spin 2016-04-08 20:37:16 -04:00
Jean-Sébastien Gervais
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) 2016-04-08 20:34:38 -04:00
RosimInc
d088224ec7 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 20:23:48 -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
6df5feff80 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 20:00:00 -04:00
RosimInc
290ffe8e36 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/Astronaut.cs
 2016-04-08 19:59:46 -04:00
Jean-Sébastien Gervais
a20f6027dd Random asteroids, driers and tv's. Don't ask. 2016-04-08 19:57:39 -04:00
RosimInc
e755120ef0 player movement - dash & eject 2016-04-08 19:53:04 -04:00
Jean-Sébastien Gervais
28295aadee MOAR arts ! :) 2016-04-08 19:31:18 -04:00
Jean-Sébastien Gervais
9388d356e1 Ajout arts asteroid 1 2016-04-08 19:26:28 -04:00
Jean-Sébastien Gervais
7082931f3a déasctivé R pour le dash, se fait maintenant par un double jump. 2016-04-08 19:17:22 -04:00
Jean-Sébastien Gervais
6c11a27e46 corrections de bogues d'intégration 2016-04-08 18:50:26 -04:00
Jean-Sébastien Gervais
4d6094b40f corrigé bug dashing et angle négatif (trouvais pas l'index des plateaux) 2016-04-08 18:34:01 -04:00
Jean-Sébastien Gervais
119ae969c3 Dashin implemented 2016-04-08 17:23:40 -04:00
Jean-Sébastien Gervais
adbceaa387 Début intégration scene Main 2016-04-08 16:50:13 -04:00
Jean-Sébastien Gervais
bbb5ab64fa Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-08 16:37:26 -04:00
Jean-Sébastien Gervais
3625a7ee78 Modifs class Earthquake 2016-04-08 16:37:08 -04:00
RosimInc
9468107334 Small modifications to remove debug logs 2016-04-08 16:31:05 -04:00
RosimInc
adbd24478f Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Scripts/testRotate.cs
 2016-04-08 16:02:46 -04:00
RosimInc
715c2df17d Player movement - left right + jump + hitting walls 2016-04-08 16:00:44 -04:00
Jean-Sébastien Gervais
9b705e5044 Génération des astéroiride vers les players. 2016-04-08 15:11:57 -04:00
Jean-Sébastien Gervais
106f953436 Collider des asteroid, ca fonctionne mieux avec des rigid body... 2016-04-08 13:48:48 -04:00
Jean-Sébastien Gervais
45ad56e044 Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-08 13:09:36 -04:00
Jean-Sébastien Gervais
0695a19964 AsteroidSpawner + collider asteroides et plateformes en cours . (doesn't trigger ?!?) 2016-04-08 12:59:00 -04:00
Sophie
b714044b32 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 12:15:27 -04:00
Sophie
1f5e0ac5a8 changed z offset of planet parts 2016-04-08 12:15:16 -04:00
Jean-Sébastien Gervais
b0b38d8be4 Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-08 10:14:06 -04:00
Jean-Sébastien Gervais
25fba668c7 ajouté variable stepSize,on a ajustera 2016-04-08 10:13:24 -04:00
RosimInc
4cb9578e10 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 09:55:54 -04:00
RosimInc
146301cc2f Started implementing player movement 2016-04-08 09:54:49 -04:00
Sophie
a112925d97 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 09:43:12 -04:00
Jean-Sébastien Gervais
7cad78c038 Ajouté des valeur min max pour les ratios, activé la randomisation pour le reset des plateformes 2016-04-08 09:38:11 -04:00
Jean-Sébastien Gervais
78b679ac01 Restaurer les plateformes à leur état normal 2016-04-08 09:13:58 -04:00
Sophie
82609a582b Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 08:54:27 -04:00
Sophie
546bfa405e started earthquake 2016-04-08 08:54:05 -04:00
Jean-Sébastien Gervais
07e970554d fixed merge 2016-04-08 08:11:29 -04:00
Jean-Sébastien Gervais
85295aaece Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-08 08:07:04 -04:00
Jean-Sébastien Gervais
eb3b66e787 PlanetManager, new prefab avec le pivot sur la pointe à 0,0; seulement une rotation de l'object. Scaling pour le déplacement, GetPlayerCoord prend en compte le scaling de la pointe selon la position theta du player 2016-04-08 08:06:55 -04:00
RosimInc
7e82a2b543 Forced text meta files 2016-04-08 07:56:02 -04:00
RosimInc
34f4bf3a46 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 05:51:23 -04:00
RosimInc
616594cab8 Started implementing and animating the character 2016-04-08 05:51:08 -04:00