23 Commits

Author SHA1 Message Date
Patrice Vignola
4364c86cae - Added the new kill mechanic (slow x cross) 2015-08-16 12:53:04 -04:00
Patrice Vignola
9c3a06dd56 - Same 2015-08-16 10:43:24 -04:00
Patrice Vignola
ad937fec34 - Single click now focuses on nodes 2015-08-16 10:37:50 -04:00
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
Sophie
e11989f2c3 Merge branch 'master' of https://github.com/ConjureETS/DeathBook
Conflicts:
	Assets/Scenes/UiTweaking.unity
2015-08-16 07:19:35 -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
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
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
1f055792f5 - Added the smooth rotation lerping when clicking on a node (to be tested
visually)
2015-08-15 22:15:26 -04:00
RosimInc
9bd0c1c182 Merge branch 'master' of https://github.com/ConjureETS/DeathBook
Conflicts:
	Assets/Prefabs/PersonNode.prefab
	Assets/Scenes/Gameplay.unity
	Assets/Scripts/Models/Person.cs
	Assets/Scripts/NetworkingSphere.cs

Known issues:
Picture F_30 is rotated
When clicking two people fast, one of them is killed in a crooked fashion

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-15 16:59:46 -04:00
RosimInc
d05abccd45 Implemented the death noticing and friendship beam coloring.
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-15 15:13:50 -04:00
Patrice Vignola
e6fffc508c - Fixed the scroll wheel direction 2015-08-14 20:33:54 -04:00
unknown
a8a4490a68 sphere zooming exception if on the right side of the screen 2015-08-14 20:13:51 -04:00
Patrice Vignola
b9162ffd44 - Fixed the friends pictures in the UI 2015-08-14 19:43:56 -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
unknown
c08af46d21 stupid scroll reimplemented 2015-08-14 16:14:15 -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
a548d1e7c4 - Merged the friendship/levelgenerator stuff in the gameplay scene 2015-08-13 14:10:50 -04:00