Skip to content

Commit baab546

Browse files
committed
Maroon Update Unity to 6000.0.70f1
1 parent 13846b5 commit baab546

5 files changed

Lines changed: 28 additions & 27 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ ExportedObj/
9393
*.csproj
9494
*.unityproj
9595
*.sln
96+
*.slnx
9697
*.suo
9798
*.tmp
9899
*.user

unity/Assets/Maroon/GlobalEntities/PlayerManager/MaroonInputActions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.14.2
4+
// version 1.19.0
55
// from Assets/Maroon/GlobalEntities/PlayerManager/MaroonInputActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

unity/Packages/manifest.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
"com.gear.serializeproperty": "https://github.com/GameLabGraz/Utilities.git#package/serializeproperty",
1010
"com.unity.2d.sprite": "1.0.0",
1111
"com.unity.2d.tilemap": "1.0.0",
12-
"com.unity.ai.navigation": "2.0.9",
12+
"com.unity.ai.navigation": "2.0.12",
1313
"com.unity.analytics": "3.8.1",
14-
"com.unity.collab-proxy": "2.9.3",
15-
"com.unity.ide.rider": "3.0.38",
16-
"com.unity.ide.visualstudio": "2.0.23",
17-
"com.unity.inputsystem": "1.14.2",
14+
"com.unity.collab-proxy": "2.12.4",
15+
"com.unity.ide.rider": "3.0.39",
16+
"com.unity.ide.visualstudio": "2.0.27",
17+
"com.unity.inputsystem": "1.19.0",
1818
"com.unity.multiplayer.center": "1.0.0",
19-
"com.unity.postprocessing": "3.5.0",
19+
"com.unity.postprocessing": "3.5.4",
2020
"com.unity.progrids": "3.0.3-preview.6",
21-
"com.unity.purchasing": "4.12.2",
21+
"com.unity.purchasing": "4.14.2",
2222
"com.unity.test-framework": "1.6.0",
23-
"com.unity.timeline": "1.8.9",
23+
"com.unity.timeline": "1.8.12",
2424
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
2525
"com.unity.ugui": "2.0.0",
2626
"com.unity.xr.legacyinputhelpers": "2.1.12",
27-
"com.unity.xr.management": "4.5.1",
27+
"com.unity.xr.management": "4.5.4",
2828
"com.valvesoftware.unity.openvr": "https://github.com/ValveSoftware/unity-xr-plugin.git?path=/com.valve.openvr#v1.1.4",
2929
"com.unity.modules.accessibility": "1.0.0",
3030
"com.unity.modules.ai": "1.0.0",

unity/Packages/packages-lock.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
},
7979
"com.unity.ai.navigation": {
80-
"version": "2.0.9",
80+
"version": "2.0.12",
8181
"depth": 0,
8282
"source": "registry",
8383
"dependencies": {
@@ -96,7 +96,7 @@
9696
"url": "https://packages.unity.com"
9797
},
9898
"com.unity.collab-proxy": {
99-
"version": "2.9.3",
99+
"version": "2.12.4",
100100
"depth": 0,
101101
"source": "registry",
102102
"dependencies": {},
@@ -109,7 +109,7 @@
109109
"dependencies": {}
110110
},
111111
"com.unity.ide.rider": {
112-
"version": "3.0.38",
112+
"version": "3.0.39",
113113
"depth": 0,
114114
"source": "registry",
115115
"dependencies": {
@@ -118,16 +118,16 @@
118118
"url": "https://packages.unity.com"
119119
},
120120
"com.unity.ide.visualstudio": {
121-
"version": "2.0.23",
121+
"version": "2.0.27",
122122
"depth": 0,
123123
"source": "registry",
124124
"dependencies": {
125-
"com.unity.test-framework": "1.1.9"
125+
"com.unity.test-framework": "1.1.33"
126126
},
127127
"url": "https://packages.unity.com"
128128
},
129129
"com.unity.inputsystem": {
130-
"version": "1.14.2",
130+
"version": "1.19.0",
131131
"depth": 0,
132132
"source": "registry",
133133
"dependencies": {
@@ -151,10 +151,11 @@
151151
"url": "https://packages.unity.com"
152152
},
153153
"com.unity.postprocessing": {
154-
"version": "3.5.0",
154+
"version": "3.5.4",
155155
"depth": 0,
156156
"source": "registry",
157157
"dependencies": {
158+
"com.unity.modules.imgui": "1.0.0",
158159
"com.unity.modules.physics": "1.0.0"
159160
},
160161
"url": "https://packages.unity.com"
@@ -169,7 +170,7 @@
169170
"url": "https://packages.unity.com"
170171
},
171172
"com.unity.purchasing": {
172-
"version": "4.12.2",
173+
"version": "4.14.2",
173174
"depth": 0,
174175
"source": "registry",
175176
"dependencies": {
@@ -182,18 +183,18 @@
182183
"url": "https://packages.unity.com"
183184
},
184185
"com.unity.services.analytics": {
185-
"version": "6.1.0",
186+
"version": "6.3.0",
186187
"depth": 1,
187188
"source": "registry",
188189
"dependencies": {
189190
"com.unity.ugui": "1.0.0",
190-
"com.unity.services.core": "1.12.4",
191+
"com.unity.services.core": "1.16.0",
191192
"com.unity.modules.jsonserialize": "1.0.0"
192193
},
193194
"url": "https://packages.unity.com"
194195
},
195196
"com.unity.services.core": {
196-
"version": "1.14.0",
197+
"version": "1.16.0",
197198
"depth": 1,
198199
"source": "registry",
199200
"dependencies": {
@@ -245,7 +246,7 @@
245246
}
246247
},
247248
"com.unity.timeline": {
248-
"version": "1.8.9",
249+
"version": "1.8.12",
249250
"depth": 0,
250251
"source": "registry",
251252
"dependencies": {
@@ -276,7 +277,7 @@
276277
}
277278
},
278279
"com.unity.xr.core-utils": {
279-
"version": "2.5.3",
280+
"version": "2.6.0",
280281
"depth": 1,
281282
"source": "registry",
282283
"dependencies": {
@@ -295,11 +296,10 @@
295296
"url": "https://packages.unity.com"
296297
},
297298
"com.unity.xr.management": {
298-
"version": "4.5.1",
299+
"version": "4.5.4",
299300
"depth": 0,
300301
"source": "registry",
301302
"dependencies": {
302-
"com.unity.modules.vr": "1.0.0",
303303
"com.unity.modules.xr": "1.0.0",
304304
"com.unity.xr.core-utils": "2.2.1",
305305
"com.unity.modules.subsystems": "1.0.0",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 6000.0.60f1
2-
m_EditorVersionWithRevision: 6000.0.60f1 (61dfb374e36f)
1+
m_EditorVersion: 6000.0.75f1
2+
m_EditorVersionWithRevision: 6000.0.75f1 (26349cd2a5c8)

0 commit comments

Comments
 (0)