RosimInc bcbf97fa44 Merge branch 'master' of https://github.com/ConjureETS/DeathBook
Conflicts:
	Assets/Prefabs/NetworkingSphere.prefab
	Assets/Scenes/Gameplay.unity
	Assets/Scripts/Models/Person.cs
	Assets/Scripts/NetworkingSphere.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-16 01:01:03 -04:00
2015-08-10 17:29:43 -04:00
Description
No description provided
4.9 MiB
Languages
C# 92.6%
ShaderLab 6.9%
GLSL 0.5%