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

Conflicts:
	Assets/Scripts/Child.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>

2015-08-23 12:25:42 -04:00

..

AudioManager.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

DynamicsManager.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

EditorBuildSettings.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

EditorSettings.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

GraphicsSettings.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

InputManager.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

NavMeshAreas.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

NetworkManager.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

Physics2DSettings.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

ProjectSettings.asset

Added the player avatars

2015-08-23 12:20:40 -04:00

ProjectVersion.txt

Added the player avatars

2015-08-23 12:20:40 -04:00

QualitySettings.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

TagManager.asset

Tried stuff

2015-08-23 11:25:01 -04:00

TimeManager.asset

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00