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
..
2015-08-15 23:11:45 -04:00
2015-08-12 11:03:39 -04:00
2015-08-15 23:11:45 -04:00
2015-08-12 11:03:39 -04:00
2015-08-11 03:18:31 -04:00
2015-08-15 23:11:45 -04:00
2015-08-11 03:18:31 -04:00
2015-08-15 23:11:45 -04:00
2015-08-11 03:18:31 -04:00
2015-08-15 23:11:45 -04:00
2015-08-15 23:11:45 -04:00
2015-08-15 23:11:45 -04:00
2015-08-11 03:18:31 -04:00
2015-08-14 19:25:46 -04:00
2015-08-14 17:25:18 -04:00
2015-08-12 11:03:39 -04:00
2015-08-11 03:18:31 -04:00
2015-08-12 11:03:39 -04:00
2015-08-11 03:18:31 -04:00
2015-08-12 11:03:39 -04:00
2015-08-11 03:18:31 -04:00
2015-08-15 23:11:45 -04:00
2015-08-15 23:11:45 -04:00