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

..

_Scenes

Added assets, input handlers

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

Art

Added assets, input handlers

2016-04-08 02:13:34 -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

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

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

Scripts

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

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

Sounds

Added assets, input handlers

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

Test

Added assets, input handlers

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

_Scenes.meta

Initial project

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

Art.meta

Initial project

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

ControllerMapper.asset

Added assets, input handlers

2016-04-08 02:13:34 -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

Plugins.meta

Added assets, input handlers

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

Prefabs.meta

Initial project

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

Scripts.meta

Initial project

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

Sounds.meta

Initial project

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

Test.meta

Added assets, input handlers

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