Patrice Vignola 0511637874 Merge branch 'master' of https://github.com/ConjureETS/PillowFight ...

Conflicts:
	Assets/Scripts/Child.cs
	ProjectSettings/TagManager.asset

2015-08-22 02:30:06 -04:00

..

AudioManager.asset

Initial commit

2015-08-21 22:09:30 -04:00

DynamicsManager.asset

Initial commit

2015-08-21 22:09:30 -04:00

EditorBuildSettings.asset

Initial commit

2015-08-21 22:09:30 -04:00

EditorSettings.asset

Initial commit

2015-08-21 22:09:30 -04:00

GraphicsSettings.asset

Initial commit

2015-08-21 22:09:30 -04:00

InputManager.asset

Initial commit

2015-08-21 22:09:30 -04:00

NavMeshAreas.asset

Initial commit

2015-08-21 22:09:30 -04:00

NetworkManager.asset

Initial commit

2015-08-21 22:09:30 -04:00

Physics2DSettings.asset

Initial commit

2015-08-21 22:09:30 -04:00

ProjectSettings.asset

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

ProjectVersion.txt

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

QualitySettings.asset

Initial commit

2015-08-21 22:09:30 -04:00

TagManager.asset

Merge branch 'master' of https://github.com/ConjureETS/PillowFight

2015-08-22 02:30:06 -04:00

TimeManager.asset

Initial commit

2015-08-21 22:09:30 -04:00