Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 3ae57ae

Browse files
Reverting some unintentional changes
1 parent c4e1fd5 commit 3ae57ae

File tree

11 files changed

+153
-309
lines changed

11 files changed

+153
-309
lines changed

unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unity/PackageProject/ProjectSettings/DynamicsManager.asset

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ PhysicsManager:
1616
m_EnableAdaptiveForce: 0
1717
m_EnablePCM: 1
1818
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
19-
m_AutoSimulation: 1
20-
m_AutoSyncTransforms: 1

unity/PackageProject/ProjectSettings/Physics2DSettings.asset

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!19 &1
44
Physics2DSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 3
6+
serializedVersion: 2
77
m_Gravity: {x: 0, y: -9.81}
88
m_DefaultMaterial: {fileID: 0}
99
m_VelocityIterations: 8
@@ -13,18 +13,15 @@ Physics2DSettings:
1313
m_MaxAngularCorrection: 8
1414
m_MaxTranslationSpeed: 100
1515
m_MaxRotationSpeed: 360
16+
m_MinPenetrationForPenalty: 0.01
1617
m_BaumgarteScale: 0.2
1718
m_BaumgarteTimeOfImpactScale: 0.75
1819
m_TimeToSleep: 0.5
1920
m_LinearSleepTolerance: 0.01
2021
m_AngularSleepTolerance: 2
21-
m_DefaultContactOffset: 0.01
22-
m_AutoSimulation: 1
2322
m_QueriesHitTriggers: 1
2423
m_QueriesStartInColliders: 1
2524
m_ChangeStopsCallbacks: 0
26-
m_CallbacksOnDisable: 1
27-
m_AutoSyncTransforms: 1
2825
m_AlwaysShowColliders: 0
2926
m_ShowColliderSleep: 1
3027
m_ShowColliderContacts: 0

unity/TestProject/ProjectSettings/DynamicsManager.asset

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ PhysicsManager:
1616
m_EnableAdaptiveForce: 0
1717
m_EnablePCM: 1
1818
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
19-
m_AutoSimulation: 1
20-
m_AutoSyncTransforms: 1

unity/TestProject/ProjectSettings/Physics2DSettings.asset

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!19 &1
44
Physics2DSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 3
6+
serializedVersion: 2
77
m_Gravity: {x: 0, y: -9.81}
88
m_DefaultMaterial: {fileID: 0}
99
m_VelocityIterations: 8
@@ -13,18 +13,15 @@ Physics2DSettings:
1313
m_MaxAngularCorrection: 8
1414
m_MaxTranslationSpeed: 100
1515
m_MaxRotationSpeed: 360
16+
m_MinPenetrationForPenalty: 0.01
1617
m_BaumgarteScale: 0.2
1718
m_BaumgarteTimeOfImpactScale: 0.75
1819
m_TimeToSleep: 0.5
1920
m_LinearSleepTolerance: 0.01
2021
m_AngularSleepTolerance: 2
21-
m_DefaultContactOffset: 0.01
22-
m_AutoSimulation: 1
2322
m_QueriesHitTriggers: 1
2423
m_QueriesStartInColliders: 1
2524
m_ChangeStopsCallbacks: 0
26-
m_CallbacksOnDisable: 1
27-
m_AutoSyncTransforms: 1
2825
m_AlwaysShowColliders: 0
2926
m_ShowColliderSleep: 1
3027
m_ShowColliderContacts: 0

0 commit comments

Comments
 (0)