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
DeathBook/Assets/Prefabs
History
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
..
FriendshipLink.prefab
- More rotation related changes
2015-08-15 23:11:45 -04:00
FriendshipLink.prefab.meta
- Merged the friendship/levelgenerator stuff in the gameplay scene
2015-08-13 14:10:50 -04:00
NetworkingSphere.prefab
- More rotation related changes
2015-08-15 23:11:45 -04:00
NetworkingSphere.prefab.meta
- Merged the friendship/levelgenerator stuff in the gameplay scene
2015-08-13 14:10:50 -04:00
PersonDetailsPanel.prefab
Merge branch 'master' of https://github.com/ConjureETS/DeathBook
2015-08-15 23:21:12 -04:00
PersonDetailsPanel.prefab.meta
- Started the selection behavior when we click on a person node
2015-08-13 22:02:44 -04:00
PersonNode.prefab
- More rotation related changes
2015-08-15 23:11:45 -04:00
PersonNode.prefab.meta
- Merged the person nodes scripts into one Script and added the camera
2015-08-14 00:10:17 -04:00
UIFriendPicture.prefab
Merge branch 'master' of https://github.com/ConjureETS/DeathBook
2015-08-15 23:21:12 -04:00
UIFriendPicture.prefab.meta
- Added the friendship in the UI
2015-08-14 19:25:46 -04:00