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
63 Commits 1 Branch 0 Tags
Commit Graph

62 Commits

Author SHA1 Message Date
Sophie
7e52484cc9 UiTweaking + assets 2015-08-16 01:06: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
RosimInc
91fc0710de Fixed the generation algorithm 
Some points were ignored, and probabilities were wrong.

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-13 15:35:12 -04:00
Patrice Vignola
a548d1e7c4 - Merged the friendship/levelgenerator stuff in the gameplay scene 2015-08-13 14:10:50 -04:00
Patrice Vignola
ca79ca8381 - Removed some debug logs 2015-08-13 13:55:16 -04:00
RosimInc
bbf3de222f Finished the friendship randomization. 
Added a probability to spread out better the results.

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-13 03:16:42 -04:00
RosimInc
f91fcd3eb4 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-13 02:59:00 -04:00
RosimInc
c42bf9c4a3 Implemented level generation. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-13 02:58:43 -04:00
unknown
934f122179 started camera smooth zoom 2015-08-12 21:05:40 -04:00
RosimInc
5a01f17045 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-12 19:45:31 -04:00
RosimInc
626710331a Did person generation and started friendship generation. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-12 19:45:14 -04:00
Patrice Vignola
fdff933e13 - Quick fixes 2015-08-12 16:47:53 -04:00
unknown
36f638b4f8 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Tests/Center.cs
 2015-08-12 16:30:52 -04:00
unknown
e40981c2ff add sphere movement controls 2015-08-12 16:20:06 -04:00
Patrice Vignola
18e1ec4190 - Fixed a border glitch on the link image 2015-08-12 15:16:14 -04:00
Patrice Vignola
23a362b625 - Added the UI placeholders 2015-08-12 14:38:53 -04:00
Patrice Vignola
d414ed7f6e - Added the links highlighting when hovering on a node and stopping the 
sphere rotation when hovering over it
 2015-08-12 13:48:16 -04:00
Patrice Vignola
d6f894d453 - Added a slight rotation to the sphere 2015-08-12 12:00:00 -04:00