Skip to content

Commit c918bb3

Browse files
committed
Upgrading the project to Unity 6000.0.34f1
1 parent 132c3ff commit c918bb3

File tree

10 files changed

+213
-32
lines changed

10 files changed

+213
-32
lines changed

Assets/DevLocker/PhysicsUtils/DragRigidbodyBetter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ private void Update() {
9696

9797

9898
private IEnumerator DragObject(float distance) {
99-
var oldDrag = m_SpringJoint.connectedBody.drag;
100-
var oldAngularDrag = m_SpringJoint.connectedBody.angularDrag;
101-
m_SpringJoint.connectedBody.drag = Drag;
102-
m_SpringJoint.connectedBody.angularDrag = AngularDrag;
99+
var oldDrag = m_SpringJoint.connectedBody.linearDamping;
100+
var oldAngularDrag = m_SpringJoint.connectedBody.angularDamping;
101+
m_SpringJoint.connectedBody.linearDamping = Drag;
102+
m_SpringJoint.connectedBody.angularDamping = AngularDrag;
103103
var mainCamera = FindCamera();
104104
while (Input.GetMouseButton(0) && !Input.GetKeyDown(KeyToPinSpring)) {
105105
distance += Input.GetAxis("Mouse ScrollWheel") * ScrollWheelSensitivity;
@@ -122,8 +122,8 @@ private IEnumerator DragObject(float distance) {
122122

123123

124124
if (m_SpringJoint.connectedBody) {
125-
m_SpringJoint.connectedBody.drag = oldDrag;
126-
m_SpringJoint.connectedBody.angularDrag = oldAngularDrag;
125+
m_SpringJoint.connectedBody.linearDamping = oldDrag;
126+
m_SpringJoint.connectedBody.angularDamping = oldAngularDrag;
127127

128128
if (Input.GetKeyDown(KeyToPinSpring)) {
129129
m_SpringJoint = null;

Assets/DevLocker/_Examples/Physics/RagdollTestScene.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Assets/DevLocker/_Examples/Physics/RagdollTestScene/LightingData.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Assets/DevLocker/_Examples/Physics/RagdollTestScene/ReflectionProbe-0.exr.meta

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

Packages/manifest.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ai.navigation": "1.1.4",
6-
"com.unity.ide.rider": "3.0.24",
7-
"com.unity.ide.visualstudio": "2.0.18",
8-
"com.unity.ide.vscode": "1.2.5",
9-
"com.unity.test-framework": "1.1.33",
10-
"com.unity.timeline": "1.7.5",
11-
"com.unity.ugui": "1.0.0",
12-
"com.unity.xr.legacyinputhelpers": "2.1.10",
5+
"com.unity.ai.navigation": "2.0.5",
6+
"com.unity.ide.rider": "3.0.31",
7+
"com.unity.ide.visualstudio": "2.0.22",
8+
"com.unity.multiplayer.center": "1.0.0",
9+
"com.unity.test-framework": "1.4.5",
10+
"com.unity.timeline": "1.8.7",
11+
"com.unity.ugui": "2.0.0",
12+
"com.unity.xr.legacyinputhelpers": "2.1.11",
13+
"com.unity.modules.accessibility": "1.0.0",
1314
"com.unity.modules.androidjni": "1.0.0",
1415
"com.unity.modules.animation": "1.0.0",
1516
"com.unity.modules.audio": "1.0.0",

Packages/packages-lock.json

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"com.unity.ai.navigation": {
19-
"version": "1.1.4",
19+
"version": "2.0.5",
2020
"depth": 0,
2121
"source": "registry",
2222
"dependencies": {
@@ -25,14 +25,14 @@
2525
"url": "https://packages.unity.com"
2626
},
2727
"com.unity.ext.nunit": {
28-
"version": "1.0.6",
28+
"version": "2.0.5",
2929
"depth": 1,
3030
"source": "registry",
3131
"dependencies": {},
3232
"url": "https://packages.unity.com"
3333
},
3434
"com.unity.ide.rider": {
35-
"version": "3.0.24",
35+
"version": "3.0.31",
3636
"depth": 0,
3737
"source": "registry",
3838
"dependencies": {
@@ -41,46 +41,47 @@
4141
"url": "https://packages.unity.com"
4242
},
4343
"com.unity.ide.visualstudio": {
44-
"version": "2.0.18",
44+
"version": "2.0.22",
4545
"depth": 0,
4646
"source": "registry",
4747
"dependencies": {
4848
"com.unity.test-framework": "1.1.9"
4949
},
5050
"url": "https://packages.unity.com"
5151
},
52-
"com.unity.ide.vscode": {
53-
"version": "1.2.5",
52+
"com.unity.multiplayer.center": {
53+
"version": "1.0.0",
5454
"depth": 0,
55-
"source": "registry",
56-
"dependencies": {},
57-
"url": "https://packages.unity.com"
55+
"source": "builtin",
56+
"dependencies": {
57+
"com.unity.modules.uielements": "1.0.0"
58+
}
5859
},
5960
"com.unity.test-framework": {
60-
"version": "1.1.33",
61+
"version": "1.4.5",
6162
"depth": 0,
6263
"source": "registry",
6364
"dependencies": {
64-
"com.unity.ext.nunit": "1.0.6",
65+
"com.unity.ext.nunit": "2.0.3",
6566
"com.unity.modules.imgui": "1.0.0",
6667
"com.unity.modules.jsonserialize": "1.0.0"
6768
},
6869
"url": "https://packages.unity.com"
6970
},
7071
"com.unity.timeline": {
71-
"version": "1.7.5",
72+
"version": "1.8.7",
7273
"depth": 0,
7374
"source": "registry",
7475
"dependencies": {
76+
"com.unity.modules.audio": "1.0.0",
7577
"com.unity.modules.director": "1.0.0",
7678
"com.unity.modules.animation": "1.0.0",
77-
"com.unity.modules.audio": "1.0.0",
7879
"com.unity.modules.particlesystem": "1.0.0"
7980
},
8081
"url": "https://packages.unity.com"
8182
},
8283
"com.unity.ugui": {
83-
"version": "1.0.0",
84+
"version": "2.0.0",
8485
"depth": 0,
8586
"source": "builtin",
8687
"dependencies": {
@@ -89,7 +90,7 @@
8990
}
9091
},
9192
"com.unity.xr.legacyinputhelpers": {
92-
"version": "2.1.10",
93+
"version": "2.1.11",
9394
"depth": 0,
9495
"source": "registry",
9596
"dependencies": {
@@ -98,6 +99,12 @@
9899
},
99100
"url": "https://packages.unity.com"
100101
},
102+
"com.unity.modules.accessibility": {
103+
"version": "1.0.0",
104+
"depth": 0,
105+
"source": "builtin",
106+
"dependencies": {}
107+
},
101108
"com.unity.modules.ai": {
102109
"version": "1.0.0",
103110
"depth": 1,
@@ -131,6 +138,12 @@
131138
"com.unity.modules.animation": "1.0.0"
132139
}
133140
},
141+
"com.unity.modules.hierarchycore": {
142+
"version": "1.0.0",
143+
"depth": 1,
144+
"source": "builtin",
145+
"dependencies": {}
146+
},
134147
"com.unity.modules.imageconversion": {
135148
"version": "1.0.0",
136149
"depth": 0,
@@ -196,7 +209,8 @@
196209
"dependencies": {
197210
"com.unity.modules.ui": "1.0.0",
198211
"com.unity.modules.imgui": "1.0.0",
199-
"com.unity.modules.jsonserialize": "1.0.0"
212+
"com.unity.modules.jsonserialize": "1.0.0",
213+
"com.unity.modules.hierarchycore": "1.0.0"
200214
}
201215
},
202216
"com.unity.modules.unitywebrequest": {
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!655991488 &1
4+
MultiplayerManager:
5+
m_ObjectHideFlags: 0
6+
m_EnableMultiplayerRoles: 0
7+
m_StrippingTypes: {}

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2022.3.8f1
2-
m_EditorVersionWithRevision: 2022.3.8f1 (b5eafc012955)
1+
m_EditorVersion: 6000.0.34f1
2+
m_EditorVersionWithRevision: 6000.0.34f1 (5ab2d9ed9190)

0 commit comments

Comments
 (0)