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

114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unknown
0e9baa1a43 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 23:03:03 -04:00
unknown
0b59b64311 gravestone2 2015-08-16 23:02:59 -04:00
Patrice Vignola
21096cf405 - Added the game timer in the AM/PM format 2015-08-16 22:53:43 -04:00
Patrice Vignola
932e7e90c0 - Fixed the tutorial 2015-08-16 22:09:18 -04:00
Patrice Vignola
f661bbede2 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 21:26:23 -04:00
Patrice Vignola
9397215eb1 - Added anchors to the tutorial popups 2015-08-16 21:26:05 -04:00
unknown
947887341e fixed similar issue 2015-08-16 21:14:55 -04:00
unknown
65391d8489 fixed a small bug in tutorial 2015-08-16 21:07:00 -04:00
Patrice Vignola
4ff2acabe9 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 20:44:47 -04:00
Patrice Vignola
e75491c865 - Added the post statuses file 2015-08-16 20:44:27 -04:00
RosimInc
6a8f4124df Integrated strategies to the tutorial screen and NetworkingSphere prefab. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-16 19:40:17 -04:00
RosimInc
40bb309d72 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 19:35:09 -04:00
RosimInc
42647a7dd8 Better values for strategy. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-16 19:34:51 -04:00
RosimInc
d76ce92a63 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 19:23:54 -04:00
RosimInc
fd2aea25c1 Started implementing working game strategies. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-16 19:23:42 -04:00
unknown
711528b799 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 19:12:51 -04:00
unknown
0adaf2487c tutorial completed 2015-08-16 19:12:46 -04:00
Patrice Vignola
1f79a2b15e - Added the logo and fixed the global awareness bar 2015-08-16 19:01:15 -04:00
Patrice Vignola
2ce5fe16d8 - Added the global awareness bar 2015-08-16 16:55:58 -04:00
unknown
91faee41f2 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 16:31:09 -04:00
unknown
aaea581c62 starting the tutorial scene 2015-08-16 16:31:04 -04:00
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
79997ca4b5 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 
Conflicts:
	Assets/Scripts/NetworkingSphere.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-16 14:55:54 -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
5d71610a4d - Slightly increased the blood splatter speed 2015-08-16 14:10:25 -04:00
Patrice Vignola
16a88142be - Added the blood splatter when killing someone 2015-08-16 13:47:46 -04:00
Patrice Vignola
53d76e8953 Merge branch 'master' of https://github.com/ConjureETS/DeathBook 2015-08-16 12:54:34 -04:00
Patrice Vignola
4364c86cae - Added the new kill mechanic (slow x cross) 2015-08-16 12:53:04 -04:00
unknown
f8d9c4e606 splash script 2015-08-16 12:29:23 -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
23fedeabb4 updated splash screen 2015-08-16 07:25:08 -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
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