Patrice Vignola 025ee107eb Merge branch 'master' of https://github.com/ConjureETS/DeathBook ...

Conflicts:
	Assets/Scenes/Gameplay.unity

2015-08-16 03:22:10 -04:00

..

AwarenessBar.prefab

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

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

AwarenessBar.prefab.meta

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

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

FriendAwarenessBar.prefab

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

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

FriendAwarenessBar.prefab.meta

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

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

FriendshipLink.prefab

- More rotation related changes

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

FriendshipLink.prefab.meta

- Merged the friendship/levelgenerator stuff in the gameplay scene

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

NetworkingSphere.prefab

Added connection and disconnection times.

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

NetworkingSphere.prefab.meta

- Merged the friendship/levelgenerator stuff in the gameplay scene

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

PersonDetailsPanel.prefab

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

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

PersonDetailsPanel.prefab.meta

- Started the selection behavior when we click on a person node

2015-08-13 22:02:44 -04:00

PersonNode.prefab

- More rotation related changes

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

PersonNode.prefab.meta

- Merged the person nodes scripts into one Script and added the camera

2015-08-14 00:10:17 -04:00

UIFriendPicture.prefab

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

2015-08-15 23:21:12 -04:00

UIFriendPicture.prefab.meta

- Added the friendship in the UI

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