Skip to content

Change all m_ThrowAngularVelocityScale values to 1 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattdatwork merged 1 commit into from
Feb 20, 2020
Merged

Change all m_ThrowAngularVelocityScale values to 1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VR/Assets/Prefabs/LlamaBubbleGunPrefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!65 &306082267053725907
BoxCollider:
Expand Down
16 changes: 8 additions & 8 deletions VR/Assets/Scenes/WorldInteraction.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &233368269
Rigidbody:
Expand Down Expand Up @@ -2176,7 +2176,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &752517576
Rigidbody:
Expand Down Expand Up @@ -3272,7 +3272,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &1088503777
Rigidbody:
Expand Down Expand Up @@ -3731,7 +3731,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &1146976356
Rigidbody:
Expand Down Expand Up @@ -4602,7 +4602,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &1438830973
Rigidbody:
Expand Down Expand Up @@ -5158,7 +5158,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &1516089320
Rigidbody:
Expand Down Expand Up @@ -6465,7 +6465,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &1875956803
Rigidbody:
Expand Down Expand Up @@ -7254,7 +7254,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &2005941299
Rigidbody:
Expand Down
11 changes: 8 additions & 3 deletions VR/Assets/Scenes/WorldInteractionDemo.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7699,7 +7699,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!65 &1174435681032161
BoxCollider:
Expand Down Expand Up @@ -8031,7 +8031,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!65 &1544310753573365
BoxCollider:
Expand Down Expand Up @@ -8208,7 +8208,7 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25
m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0
--- !u!54 &1622505853958277
Rigidbody:
Expand Down Expand Up @@ -10887,5 +10887,10 @@ PrefabInstance:
propertyPath: m_InteractionLayerMask.m_Bits
value: 55
objectReference: {fileID: 0}
- target: {fileID: 7606424657617587099, guid: cca5e4e0da45560479c022557d04fa1d,
type: 3}
propertyPath: m_ThrowAngularVelocityScale
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cca5e4e0da45560479c022557d04fa1d, type: 3}