26 Commits

Author SHA1 Message Date
Patrice Vignola
c8fd3203a3 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 16:01:28 -04:00
Patrice Vignola
a8b7f403f9 - Added the names generator and improved the person details UI 2015-08-16 16:01:02 -04:00
RosimInc
2095a71739 Tested and integrated global awareness.
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-16 15:10:32 -04:00
RosimInc
b0dfa36552 Added strategy tweaks for awareness calculation and friend death noticing.
Implemented game global awareness.

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-16 14:48:35 -04:00
Patrice Vignola
579d0baace - Some look and feel improvement in the Gameplay scene 2015-08-16 03:36:38 -04:00
Patrice Vignola
291299ee74 - Added the friends count in the UI for better visibility 2015-08-16 03:28:50 -04:00
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
Patrice Vignola
2d64ca13ea - Added the awareness levels and restricted the focus to double clicks on
nodes
2015-08-16 03:15:08 -04:00
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
RosimInc
08f85edc51 Implemented color changes for friendship links
Online/offline functionality tested and running

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-16 00:43:36 -04:00
RosimInc
4d41e5948b Added connection and disconnection times.
Prevented killing online people.

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-15 23:43:45 -04:00
Patrice Vignola
deaff7055a - Started integrating the facebook UI changes in the Gameplay scene 2015-08-15 23:31:07 -04:00
Patrice Vignola
85ea5cf427 - Small fix 2015-08-15 23:23:53 -04:00
Patrice Vignola
97be3def6b Merge branch 'master' of https://github.com/ConjureETS/DeathBook
Conflicts:
	Assets/Prefabs/PersonNode.prefab
	Assets/Scenes/Gameplay.unity
	Assets/Scripts/FriendshipLink.cs.meta
	Assets/Scripts/Models/FriendshipLink.cs.meta
	Assets/Scripts/Models/Person.cs
	Assets/Scripts/NetworkingSphere.cs
	Assets/Scripts/PersonDetailsPanel.cs
	Assets/Scripts/PersonNode.cs
	Assets/Scripts/UIFriendPicture.cs.meta
2015-08-15 23:21:12 -04:00
Patrice Vignola
2d92c524ed - More rotation related changes 2015-08-15 23:11:45 -04:00
Patrice Vignola
e6fffc508c - Fixed the scroll wheel direction 2015-08-14 20:33:54 -04:00
Patrice Vignola
b9162ffd44 - Fixed the friends pictures in the UI 2015-08-14 19:43:56 -04:00
Patrice Vignola
c945b85947 - Added the friendship in the UI 2015-08-14 19:25:46 -04:00
RosimInc
9d06c3fe30 Started implementing game time, player awareness update after death.
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-14 18:51:31 -04:00
Patrice Vignola
ddf3407851 - Reduced the friends count in he Gameplay scene to reduce the clutter 2015-08-14 00:22:31 -04:00
Patrice Vignola
9c65f230e3 - Merged the person nodes scripts into one Script and added the camera
facing behavior
2015-08-14 00:10:17 -04:00
Patrice Vignola
f626c164dd - Started the selection behavior when we click on a person node 2015-08-13 22:02:44 -04:00
Patrice Vignola
0382c1bbe2 - Started the UI 2015-08-13 17:20:20 -04:00
Patrice Vignola
a548d1e7c4 - Merged the friendship/levelgenerator stuff in the gameplay scene 2015-08-13 14:10:50 -04:00
Patrice Vignola
fdff933e13 - Quick fixes 2015-08-12 16:47:53 -04:00
Patrice Vignola
23a362b625 - Added the UI placeholders 2015-08-12 14:38:53 -04:00