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

10 Commits

Author SHA1 Message Date
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
Sophie
0a92542f28 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx 2016-04-08 02:33:40 -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
Jean-Sébastien Gervais
6199b0e29f PlanetManager : pas commité bonne version apparamment. 2016-04-08 01:02:29 -04:00
RosimInc
5546304506 Added temp files to keep folders 2016-04-08 00:05:36 -04:00