Conjure/DeathBook
6
0
Fork 0
mirror of https://github.com/ConjureETS/DeathBook.git synced 2026-03-25 13:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

Browse Source 
Conflicts:
	Assets/Scenes/sphereMove.unity
This commit is contained in:
Patrice Vignola 2015-08-14 00:11:45 -04:00
commit 88e3e12228
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Scenes/sphereMove.unity
View File

@ -159,6 +159,7 @@ Camera:
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: .0219999999 m_StereoSeparation: .0219999999
m_StereoMirrorMode: 0
--- !u!4 &61719365 --- !u!4 &61719365
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -258,13 +259,13 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2}
PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2} PersonObj: {fileID: 11406500, guid: d4b0e683ea5ec974987ea1f6741b333c, type: 2}
NumPeople: 50 NumPeople: 50
AvgNumFriends: 20 AvgNumFriends: 8
FriendshipLikeliness: .400000006 FriendshipLikeliness: .400000006
SphereRadius: 7 SphereRadius: 7
rotationSpeed: .699999988 rotationSpeed: .699999988
torqueForce: 35 torqueForce: .100000001
DetailsPanel: {fileID: 0} DetailsPanel: {fileID: 0}
--- !u!54 &736567790 --- !u!54 &736567790
Rigidbody: Rigidbody: