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

Conflicts:
	Assets/Scenes/Gameplay.unity
	Assets/Scripts/NetworkingSphere.cs
	Assets/Scripts/PersonDetailsPanel.cs

2015-08-16 07:20:33 -04:00

..

Art

- Added the awareness levels and restricted the focus to double clicks on

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

Materials

- Added the awareness levels and restricted the focus to double clicks on

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

Prefabs

- Added the friends count in the UI for better visibility

2015-08-16 03:28:50 -04:00

Resources

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

2015-08-16 07:19:35 -04:00

Scenes

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

2015-08-16 07:20:33 -04:00

Scripts

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

2015-08-16 07:20:33 -04:00

Shaders

- Added the awareness levels and restricted the focus to double clicks on

2015-08-16 03:15:08 -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

Shaders.meta

- Added the awareness levels and restricted the focus to double clicks on

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

Tests.meta

- Added a prototype for the link between people

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