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

..

Art

- More rotation related changes

2015-08-15 23:11:45 -04:00

Materials

- Merged the friendship/levelgenerator stuff in the gameplay scene

2015-08-13 14:10:50 -04:00

Prefabs

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

2015-08-16 01:01:03 -04:00

Resources

- Added the friendship in the UI

2015-08-14 19:25:46 -04:00

Scenes

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

2015-08-16 01:01:03 -04:00

Scripts

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

2015-08-16 01:01:03 -04:00

Tests

- More rotation related changes

2015-08-15 23:11:45 -04:00

Art.meta

- Merged the friendship/levelgenerator stuff in the gameplay scene

2015-08-13 14:10:50 -04:00

Materials.meta

- Merged the friendship/levelgenerator stuff in the gameplay scene

2015-08-13 14:10:50 -04:00

Prefabs.meta

Implemented level generation.

2015-08-13 02:58:43 -04:00

Resources.meta

person graphical node: awareness color code, online/offline visuals

2015-08-13 19:52:52 -04:00

Scenes.meta

initial commit

2015-08-10 16:42:09 -04:00

Scripts.meta

Skeleton for model classes.

2015-08-11 03:18:31 -04:00

Tests.meta

- Added a prototype for the link between people

2015-08-11 12:32:20 -04:00