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
151 Commits 2 Branches 0 Tags
Commit Graph

143 Commits

Author SHA1 Message Date
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
Jean-Sébastien Gervais
142e369543 fixed planet scene 2016-04-08 03:33:59 -04:00
Jean-Sébastien Gervais
9d0bb4a70b Merge branch 'master' of github.com:ETSConjure/PixelSphinx 2016-04-08 03:19:20 -04:00
Jean-Sébastien Gervais
1fefe8e788 Pushing wedges forth and back. (need to adjust planet radius with offest) 2016-04-08 03:19:09 -04:00
Sophie
0a92542f28 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 02:33:40 -04:00
Sophie
8a25f480ae random spawn around a circle 2016-04-08 02:33:23 -04:00
RosimInc
578963f0a6 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 
Conflicts:
	Assets/Prefabs/file.txt.meta
	Assets/Scripts/file.txt.meta
	Assets/Sounds/file.txt.meta
	Assets/_Scenes/file.txt.meta
 2016-04-08 02:20:15 -04:00
RosimInc
742952ee79 Added assets, input handlers 2016-04-08 02:13:34 -04:00
Jean-Sébastien Gervais
c19b71cfa8 Instatiation des WedgePrefab dans le planetManager 2016-04-08 02:07:58 -04:00
Sophie
8b8de8b58a starting spawn asteroid 2016-04-08 01:54:33 -04:00
Sophie
4810867fae Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 01:54:21 -04:00
Sophie
7fbc9e1d4e starting asteroid 2016-04-08 01:25:19 -04:00
Jean-Sébastien Gervais
6199b0e29f PlanetManager : pas commité bonne version apparamment. 2016-04-08 01:02:29 -04:00
Jean-Sébastien Gervais
c138e191f3 demo cube qui tourne d'une sphere 2016-04-08 00:47:22 -04:00
Jean-Sébastien Gervais
ef07f70d65 première ébauche PlanetManager 2016-04-08 00:44:04 -04:00
RosimInc
5546304506 Added temp files to keep folders 2016-04-08 00:05:36 -04:00
RosimInc
af49edb376 Initial project 2016-04-07 23:54:45 -04:00