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

..

file.txt

Added temp files to keep folders

2016-04-08 00:05:36 -04:00

file.txt.meta

PlanetManager : pas commité bonne version apparamment.

2016-04-08 01:02:29 -04:00

Main.unity

Earthquake implemented and added prefabs

2016-04-08 21:29:33 -04:00

Main.unity.meta

Début intégration scene Main

2016-04-08 16:50:13 -04:00

planet.unity

Début intégration scene Main

2016-04-08 16:50:13 -04:00

planet.unity.meta

PlanetManager : pas commité bonne version apparamment.

2016-04-08 01:02:29 -04:00

sophieScene.unity

character animation - idle, walk, dash, spin

2016-04-08 20:37:16 -04:00

sophieScene.unity.meta

starting asteroid

2016-04-08 01:25:19 -04:00