Skip to content

Commit 3df0a12

Browse files
committed
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dogfooding
* feature/bump-2021: Anything under ProjectSettings should be versioned. bumping to latest LTS chore: adding optional pre-commit hooks [MTT-3302] (#619) chore: Updated readme links to the doc site from doc restructure with Fatih. (#622)
2 parents 8f57887 + 7d3bd91 commit 3df0a12

10 files changed

+879
-37
lines changed

Packages/manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"com.unity.ai.navigation.components": "https://github.com/Unity-Technologies/NavMeshComponents.git#package",
55
"com.unity.cinemachine": "2.8.4",
66
"com.unity.collab-proxy": "1.15.15",
7-
"com.unity.ide.rider": "3.0.12",
7+
"com.unity.ide.rider": "3.0.13",
88
"com.unity.ide.visualstudio": "2.0.14",
99
"com.unity.ide.vscode": "1.2.5",
1010
"com.unity.learn.iet-framework": "2.1.1",
1111
"com.unity.memoryprofiler": "0.5.0-preview.1",
1212
"com.unity.multiplayer.tools": "1.0.0-pre.6",
1313
"com.unity.netcode.gameobjects": "1.0.0-pre.7",
14-
"com.unity.postprocessing": "3.2.0",
15-
"com.unity.render-pipelines.universal": "12.1.5",
14+
"com.unity.postprocessing": "3.2.1",
15+
"com.unity.render-pipelines.universal": "12.1.6",
1616
"com.unity.services.authentication": "1.0.0-pre.4",
1717
"com.unity.services.lobby": "1.0.0-pre.6",
1818
"com.unity.services.relay": "1.0.1-pre.5",

Packages/packages-lock.json

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"hash": "0fc6f532e4f47d66d173314efcb906bc7cf0d00f"
1717
},
1818
"com.unity.burst": {
19-
"version": "1.6.4",
19+
"version": "1.6.5",
2020
"depth": 1,
2121
"source": "registry",
2222
"dependencies": {
@@ -65,7 +65,7 @@
6565
"url": "https://packages.unity.com"
6666
},
6767
"com.unity.ide.rider": {
68-
"version": "3.0.12",
68+
"version": "3.0.13",
6969
"depth": 0,
7070
"source": "registry",
7171
"dependencies": {
@@ -158,14 +158,14 @@
158158
"url": "https://packages.unity.com"
159159
},
160160
"com.unity.nuget.newtonsoft-json": {
161-
"version": "2.0.2",
161+
"version": "2.0.0",
162162
"depth": 1,
163163
"source": "registry",
164164
"dependencies": {},
165165
"url": "https://packages.unity.com"
166166
},
167167
"com.unity.postprocessing": {
168-
"version": "3.2.0",
168+
"version": "3.2.1",
169169
"depth": 0,
170170
"source": "registry",
171171
"dependencies": {
@@ -174,14 +174,14 @@
174174
"url": "https://packages.unity.com"
175175
},
176176
"com.unity.profiling.core": {
177-
"version": "1.0.0",
177+
"version": "1.0.2",
178178
"depth": 1,
179179
"source": "registry",
180180
"dependencies": {},
181181
"url": "https://packages.unity.com"
182182
},
183183
"com.unity.render-pipelines.core": {
184-
"version": "12.1.5",
184+
"version": "12.1.6",
185185
"depth": 1,
186186
"source": "builtin",
187187
"dependencies": {
@@ -191,14 +191,14 @@
191191
}
192192
},
193193
"com.unity.render-pipelines.universal": {
194-
"version": "12.1.5",
194+
"version": "12.1.6",
195195
"depth": 0,
196196
"source": "builtin",
197197
"dependencies": {
198198
"com.unity.mathematics": "1.2.1",
199199
"com.unity.burst": "1.5.0",
200-
"com.unity.render-pipelines.core": "12.1.5",
201-
"com.unity.shadergraph": "12.1.5"
200+
"com.unity.render-pipelines.core": "12.1.6",
201+
"com.unity.shadergraph": "12.1.6"
202202
}
203203
},
204204
"com.unity.searcher": {
@@ -270,11 +270,11 @@
270270
"url": "https://packages.unity.com"
271271
},
272272
"com.unity.shadergraph": {
273-
"version": "12.1.5",
273+
"version": "12.1.6",
274274
"depth": 1,
275275
"source": "builtin",
276276
"dependencies": {
277-
"com.unity.render-pipelines.core": "12.1.5",
277+
"com.unity.render-pipelines.core": "12.1.6",
278278
"com.unity.searcher": "4.9.1"
279279
}
280280
},
@@ -363,22 +363,6 @@
363363
"dependencies": {},
364364
"hash": "bb3d5067e49e403d8b8ba15c036d313b4dd2c696"
365365
},
366-
"nuget.castle-core": {
367-
"version": "1.0.1",
368-
"depth": 2,
369-
"source": "registry",
370-
"dependencies": {},
371-
"url": "https://packages.unity.com"
372-
},
373-
"nuget.moq": {
374-
"version": "1.0.0",
375-
"depth": 1,
376-
"source": "registry",
377-
"dependencies": {
378-
"nuget.castle-core": "1.0.1"
379-
},
380-
"url": "https://packages.unity.com"
381-
},
382366
"com.unity.modules.ai": {
383367
"version": "1.0.0",
384368
"depth": 0,

ProjectSettings/MemorySettings.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:1e8379a461b10ae09f3f696911088c16875d63e87ed5f2d95df9e1892703f9fd
3+
size 1192

0 commit comments

Comments
 (0)