31 Commits

Author SHA1 Message Date
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
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
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
Patrice Vignola
d573ece233 - Fixed the observer not subscribing to the observable 2015-08-13 22:19:33 -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
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
c42bf9c4a3 Implemented level generation.
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-13 02:58:43 -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
RosimInc
95caf44538 Removed unneeded files
Added Friendship
Created a namespace for models

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-12 11:03:39 -04:00
RosimInc
0847c89e2e Tested the sphere positioning
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-12 01:41:00 -04:00
RosimInc
7362541eaf Skeleton for model classes.
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-11 03:18:31 -04:00