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

Conflicts:
	Assets/Scripts/Astronaut.cs

2016-04-08 19:59:46 -04:00

..

_Scenes

Dashin implemented

2016-04-08 17:23:40 -04:00

Art

MOAR arts ! :)

2016-04-08 19:31:18 -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

Ajout arts asteroid 1

2016-04-08 19:26:28 -04:00

Scripts

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

2016-04-08 19:59:46 -04:00

Sounds

Added assets, input handlers

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

Test

player movement - dash & eject

2016-04-08 19:53:04 -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

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