6 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
2d92c524ed - More rotation related changes 2015-08-15 23:11:45 -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
Patrice Vignola
f626c164dd - Started the selection behavior when we click on a person node 2015-08-13 22:02:44 -04:00