Skip to content

Commit eba16d5

Browse files
authored
Merge pull request #20 from Unity-Technologies/fix-throwangularvelocity
Change all m_ThrowAngularVelocityScale values to 1
2 parents cf12db7 + 67a4218 commit eba16d5

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

VR/Assets/Prefabs/LlamaBubbleGunPrefab.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ MonoBehaviour:
255255
m_PostInfinity: 2
256256
m_RotationOrder: 4
257257
m_ThrowVelocityScale: 1.5
258-
m_ThrowAngularVelocityScale: 0.25
258+
m_ThrowAngularVelocityScale: 1
259259
m_GravityOnDetach: 0
260260
--- !u!65 &306082267053725907
261261
BoxCollider:

VR/Assets/Scenes/WorldInteraction.unity

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ MonoBehaviour:
928928
m_PostInfinity: 2
929929
m_RotationOrder: 4
930930
m_ThrowVelocityScale: 1.5
931-
m_ThrowAngularVelocityScale: 0.25
931+
m_ThrowAngularVelocityScale: 1
932932
m_GravityOnDetach: 0
933933
--- !u!54 &233368269
934934
Rigidbody:
@@ -2176,7 +2176,7 @@ MonoBehaviour:
21762176
m_PostInfinity: 2
21772177
m_RotationOrder: 4
21782178
m_ThrowVelocityScale: 1.5
2179-
m_ThrowAngularVelocityScale: 0.25
2179+
m_ThrowAngularVelocityScale: 1
21802180
m_GravityOnDetach: 0
21812181
--- !u!54 &752517576
21822182
Rigidbody:
@@ -3272,7 +3272,7 @@ MonoBehaviour:
32723272
m_PostInfinity: 2
32733273
m_RotationOrder: 4
32743274
m_ThrowVelocityScale: 1.5
3275-
m_ThrowAngularVelocityScale: 0.25
3275+
m_ThrowAngularVelocityScale: 1
32763276
m_GravityOnDetach: 0
32773277
--- !u!54 &1088503777
32783278
Rigidbody:
@@ -3731,7 +3731,7 @@ MonoBehaviour:
37313731
m_PostInfinity: 2
37323732
m_RotationOrder: 4
37333733
m_ThrowVelocityScale: 1.5
3734-
m_ThrowAngularVelocityScale: 0.25
3734+
m_ThrowAngularVelocityScale: 1
37353735
m_GravityOnDetach: 0
37363736
--- !u!54 &1146976356
37373737
Rigidbody:
@@ -4602,7 +4602,7 @@ MonoBehaviour:
46024602
m_PostInfinity: 2
46034603
m_RotationOrder: 4
46044604
m_ThrowVelocityScale: 1.5
4605-
m_ThrowAngularVelocityScale: 0.25
4605+
m_ThrowAngularVelocityScale: 1
46064606
m_GravityOnDetach: 0
46074607
--- !u!54 &1438830973
46084608
Rigidbody:
@@ -5158,7 +5158,7 @@ MonoBehaviour:
51585158
m_PostInfinity: 2
51595159
m_RotationOrder: 4
51605160
m_ThrowVelocityScale: 1.5
5161-
m_ThrowAngularVelocityScale: 0.25
5161+
m_ThrowAngularVelocityScale: 1
51625162
m_GravityOnDetach: 0
51635163
--- !u!54 &1516089320
51645164
Rigidbody:
@@ -6465,7 +6465,7 @@ MonoBehaviour:
64656465
m_PostInfinity: 2
64666466
m_RotationOrder: 4
64676467
m_ThrowVelocityScale: 1.5
6468-
m_ThrowAngularVelocityScale: 0.25
6468+
m_ThrowAngularVelocityScale: 1
64696469
m_GravityOnDetach: 0
64706470
--- !u!54 &1875956803
64716471
Rigidbody:
@@ -7254,7 +7254,7 @@ MonoBehaviour:
72547254
m_PostInfinity: 2
72557255
m_RotationOrder: 4
72567256
m_ThrowVelocityScale: 1.5
7257-
m_ThrowAngularVelocityScale: 0.25
7257+
m_ThrowAngularVelocityScale: 1
72587258
m_GravityOnDetach: 0
72597259
--- !u!54 &2005941299
72607260
Rigidbody:

VR/Assets/Scenes/WorldInteractionDemo.unity

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7699,7 +7699,7 @@ MonoBehaviour:
76997699
m_PostInfinity: 2
77007700
m_RotationOrder: 4
77017701
m_ThrowVelocityScale: 1.5
7702-
m_ThrowAngularVelocityScale: 0.25
7702+
m_ThrowAngularVelocityScale: 1
77037703
m_GravityOnDetach: 0
77047704
--- !u!65 &1174435681032161
77057705
BoxCollider:
@@ -8031,7 +8031,7 @@ MonoBehaviour:
80318031
m_PostInfinity: 2
80328032
m_RotationOrder: 4
80338033
m_ThrowVelocityScale: 1.5
8034-
m_ThrowAngularVelocityScale: 0.25
8034+
m_ThrowAngularVelocityScale: 1
80358035
m_GravityOnDetach: 0
80368036
--- !u!65 &1544310753573365
80378037
BoxCollider:
@@ -8208,7 +8208,7 @@ MonoBehaviour:
82088208
m_PostInfinity: 2
82098209
m_RotationOrder: 4
82108210
m_ThrowVelocityScale: 1.5
8211-
m_ThrowAngularVelocityScale: 0.25
8211+
m_ThrowAngularVelocityScale: 1
82128212
m_GravityOnDetach: 0
82138213
--- !u!54 &1622505853958277
82148214
Rigidbody:
@@ -10887,5 +10887,10 @@ PrefabInstance:
1088710887
propertyPath: m_InteractionLayerMask.m_Bits
1088810888
value: 55
1088910889
objectReference: {fileID: 0}
10890+
- target: {fileID: 7606424657617587099, guid: cca5e4e0da45560479c022557d04fa1d,
10891+
type: 3}
10892+
propertyPath: m_ThrowAngularVelocityScale
10893+
value: 1
10894+
objectReference: {fileID: 0}
1089010895
m_RemovedComponents: []
1089110896
m_SourcePrefab: {fileID: 100100000, guid: cca5e4e0da45560479c022557d04fa1d, type: 3}

0 commit comments

Comments
 (0)