RosimInc fc2a807349 Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx ...

Conflicts:
	Assets/Prefabs/Astronaut.prefab
	Assets/Scripts/PlanetManager.cs

2016-04-09 10:37:54 -04:00

..

_Scenes

Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx

2016-04-09 10:37:54 -04:00

Art

Des explosions, partout !

2016-04-08 23:19:00 -04:00

Editor

Added assets, input handlers

2016-04-08 02:13:34 -04:00

Fonts

Added assets, input handlers

2016-04-08 02:13:34 -04:00

Plugins

Added assets, input handlers

2016-04-08 02:13:34 -04:00

Prefabs

fixed last commit (astronaut prefab)

2016-04-09 10:33:47 -04:00

Scripts

Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx

2016-04-09 10:37:54 -04:00

Sounds

Ajout musique de fond; AsteroidSpawner - arreter d'envoyer des asteroides vers un joueur éjecté

2016-04-09 09:50:22 -04:00

Test

merge

2016-04-08 22:34:39 -04:00

_Scenes.meta

starting asteroid

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

Art.meta

Initial project

2016-04-07 23:54:45 -04:00

Background.cs

Background and kernel slow random rotation.

2016-04-08 20:59:15 -04:00

Background.cs.meta

Background and kernel slow random rotation.

2016-04-08 20:59:15 -04:00

ControllerMapper.asset

Forced text meta files

2016-04-08 07:56:02 -04:00

ControllerMapper.asset.meta

Added assets, input handlers

2016-04-08 02:13:34 -04:00

Editor.meta

Added assets, input handlers

2016-04-08 02:13:34 -04:00

Fonts.meta

Added assets, input handlers

2016-04-08 02:13:34 -04:00

m_asteroid.mat

started earthquake

2016-04-08 08:54:05 -04:00

m_asteroid.mat.meta

starting asteroid

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

Plugins.meta

Added assets, input handlers

2016-04-08 02:13:34 -04:00

Prefabs.meta

Merge branch 'master' of https://github.com/ETSConjure/PixelSphinx

2016-04-08 01:54:21 -04:00

Scripts.meta

starting spawn asteroid

2016-04-08 01:54:33 -04:00

Sounds.meta

starting spawn asteroid

2016-04-08 01:54:33 -04:00

Test.meta

Added assets, input handlers

2016-04-08 02:13:34 -04:00