Conjure/DeathBook
6
0
Fork 0
mirror of https://github.com/ConjureETS/DeathBook.git synced 2026-03-24 04:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
130 Commits 1 Branch 0 Tags
Commit Graph

128 Commits

Author SHA1 Message Date
Sophie
e11989f2c3 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Scenes/UiTweaking.unity
 2015-08-16 07:19:35 -04:00
RosimInc
8cc63306a0 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 03:54:07 -04:00
Patrice Vignola
579d0baace - Some look and feel improvement in the Gameplay scene 2015-08-16 03:36:38 -04:00
RosimInc
cd236c05b7 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 03:34:27 -04:00
RosimInc
d768704b68 Started the exhaustive awareness functions 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-16 03:34:18 -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
Sophie
7e52484cc9 UiTweaking + assets 2015-08-16 01:06:26 -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
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
Sophie
2ff4a20a3c new scene to bring facebook feel 2015-08-15 14:38:44 -04:00
Patrice Vignola
45d68b00a8 - Reduced the outline on the person nodes 2015-08-14 20:48:15 -04:00
Patrice Vignola
e6fffc508c - Fixed the scroll wheel direction 2015-08-14 20:33:54 -04:00
unknown
136fa855a4 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-14 20:14:00 -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
4718a57fda - Increased the scroll sensitivity on the friends panel 2015-08-14 20:04:02 -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
50cd8d1014 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-14 17:25:52 -04:00
Patrice Vignola
459ccc052e - Added 185 male and 185 female pictures 2015-08-14 17:25:18 -04:00
unknown
c08af46d21 stupid scroll reimplemented 2015-08-14 16:14:15 -04:00
RosimInc
1a05475a6a Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Scripts/Models/Person.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-14 00:42:48 -04:00
RosimInc
1b71e17d99 Merged and fixed the person constructor. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-14 00:31:03 -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
e6167ec67a - Merge 2015-08-14 00:14:07 -04:00
Patrice Vignola
88e3e12228 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Scenes/sphereMove.unity
 2015-08-14 00:11:45 -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
RosimInc
46f1f7a320 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Scripts/Models/Person.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-14 00:09:16 -04:00
RosimInc
bfef2ae1ab Continued person models 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-14 00:06:32 -04:00
Sophie
ab86132ca8 updated sphereMove scene 2015-08-13 23:46:27 -04:00
Patrice Vignola
d573ece233 - Fixed the observer not subscribing to the observable 2015-08-13 22:19:33 -04:00
Patrice Vignola
91739e47a0 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-13 22:03:04 -04:00
Patrice Vignola
f626c164dd - Started the selection behavior when we click on a person node 2015-08-13 22:02:44 -04:00
RosimInc
67ea8902c5 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-13 21:57:54 -04:00
RosimInc
768e1b2673 Started implementing the person model 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-13 21:57:44 -04:00
Sophie
22c60b3af4 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Tests/SphereSR.cs
 2015-08-13 19:58:52 -04:00
Sophie
48d4f15c41 person graphical node: awareness color code, online/offline visuals 2015-08-13 19:52:52 -04:00
Patrice Vignola
c04fa49a39 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-13 17:20:36 -04:00
Patrice Vignola
0382c1bbe2 - Started the UI 2015-08-13 17:20:20 -04:00
RosimInc
43451b9be4 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Scenes/Creator.unity

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-13 15:40:00 -04:00