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

2 Commits

Author SHA1 Message Date
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
c945b85947 - Added the friendship in the UI 2015-08-14 19:25:46 -04:00