Sitelet https://github.com/ronja-tutorials/ShaderTutorials/commit/2e0fcbafa6c8fa00ce82e82d948813ae2096a91f
Skip to content

Commit 2e0fcba

Browse files
totallyRonjatotallyRonja
committed
upgrade to 2020.1
1 parent 924eb55 commit 2e0fcba

8 files changed

Lines changed: 398 additions & 27 deletions

File tree

‎Logs/Packages-Update.log‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ The following packages were updated:
4343
com.unity.timeline from version 1.0.0 to 1.2.6
4444
The following packages were removed:
4545
com.unity.package-manager-ui@2.1.2
46+
47+
=== Sun Jul 26 10:26:39 2020
48+
49+
Packages were changed.
50+
Update Mode: updateDependencies
51+
52+
The following packages were added:
53+
com.unity.ide.visualstudio@2.0.2
54+
The following packages were updated:
55+
com.unity.ide.rider from version 1.1.4 to 1.2.1
56+
com.unity.ide.vscode from version 1.1.4 to 1.2.1
57+
com.unity.postprocessing from version 2.2.2 to 2.3.0

‎Packages/manifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.ide.rider": "1.1.4",
5-
"com.unity.ide.vscode": "1.1.4",
6-
"com.unity.immediate-window": "1.1.0-preview.3",
7-
"com.unity.postprocessing": "2.2.2",
4+
"com.unity.ide.rider": "1.2.1",
5+
"com.unity.ide.visualstudio": "2.0.2",
6+
"com.unity.ide.vscode": "1.2.1",
7+
"com.unity.postprocessing": "2.3.0",
88
"com.unity.ugui": "1.0.0",
99
"com.unity.modules.ai": "1.0.0",
1010
"com.unity.modules.androidjni": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 320 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,320 @@
1+
{
2+
"dependencies": {
3+
"com.unity.2d.sprite": {
4+
"version": "1.0.0",
5+
"depth": 0,
6+
"source": "builtin",
7+
"dependencies": {}
8+
},
9+
"com.unity.ext.nunit": {
10+
"version": "1.0.0",
11+
"depth": 2,
12+
"source": "registry",
13+
"dependencies": {},
14+
"url": "https://packages.unity.com"
15+
},
16+
"com.unity.ide.rider": {
17+
"version": "1.2.1",
18+
"depth": 0,
19+
"source": "registry",
20+
"dependencies": {
21+
"com.unity.test-framework": "1.1.1"
22+
},
23+
"url": "https://packages.unity.com"
24+
},
25+
"com.unity.ide.visualstudio": {
26+
"version": "2.0.2",
27+
"depth": 0,
28+
"source": "registry",
29+
"dependencies": {},
30+
"url": "https://packages.unity.com"
31+
},
32+
"com.unity.ide.vscode": {
33+
"version": "1.2.1",
34+
"depth": 0,
35+
"source": "registry",
36+
"dependencies": {},
37+
"url": "https://packages.unity.com"
38+
},
39+
"com.unity.postprocessing": {
40+
"version": "2.3.0",
41+
"depth": 0,
42+
"source": "registry",
43+
"dependencies": {},
44+
"url": "https://packages.unity.com"
45+
},
46+
"com.unity.test-framework": {
47+
"version": "1.1.14",
48+
"depth": 1,
49+
"source": "registry",
50+
"dependencies": {
51+
"com.unity.ext.nunit": "1.0.0",
52+
"com.unity.modules.imgui": "1.0.0",
53+
"com.unity.modules.jsonserialize": "1.0.0"
54+
},
55+
"url": "https://packages.unity.com"
56+
},
57+
"com.unity.ugui": {
58+
"version": "1.0.0",
59+
"depth": 0,
60+
"source": "builtin",
61+
"dependencies": {
62+
"com.unity.modules.ui": "1.0.0"
63+
}
64+
},
65+
"com.unity.modules.ai": {
66+
"version": "1.0.0",
67+
"depth": 0,
68+
"source": "builtin",
69+
"dependencies": {}
70+
},
71+
"com.unity.modules.androidjni": {
72+
"version": "1.0.0",
73+
"depth": 0,
74+
"source": "builtin",
75+
"dependencies": {}
76+
},
77+
"com.unity.modules.animation": {
78+
"version": "1.0.0",
79+
"depth": 0,
80+
"source": "builtin",
81+
"dependencies": {}
82+
},
83+
"com.unity.modules.assetbundle": {
84+
"version": "1.0.0",
85+
"depth": 0,
86+
"source": "builtin",
87+
"dependencies": {}
88+
},
89+
"com.unity.modules.audio": {
90+
"version": "1.0.0",
91+
"depth": 0,
92+
"source": "builtin",
93+
"dependencies": {}
94+
},
95+
"com.unity.modules.cloth": {
96+
"version": "1.0.0",
97+
"depth": 0,
98+
"source": "builtin",
99+
"dependencies": {
100+
"com.unity.modules.physics": "1.0.0"
101+
}
102+
},
103+
"com.unity.modules.director": {
104+
"version": "1.0.0",
105+
"depth": 0,
106+
"source": "builtin",
107+
"dependencies": {
108+
"com.unity.modules.audio": "1.0.0",
109+
"com.unity.modules.animation": "1.0.0"
110+
}
111+
},
112+
"com.unity.modules.imageconversion": {
113+
"version": "1.0.0",
114+
"depth": 0,
115+
"source": "builtin",
116+
"dependencies": {}
117+
},
118+
"com.unity.modules.imgui": {
119+
"version": "1.0.0",
120+
"depth": 0,
121+
"source": "builtin",
122+
"dependencies": {}
123+
},
124+
"com.unity.modules.jsonserialize": {
125+
"version": "1.0.0",
126+
"depth": 0,
127+
"source": "builtin",
128+
"dependencies": {}
129+
},
130+
"com.unity.modules.particlesystem": {
131+
"version": "1.0.0",
132+
"depth": 0,
133+
"source": "builtin",
134+
"dependencies": {}
135+
},
136+
"com.unity.modules.physics": {
137+
"version": "1.0.0",
138+
"depth": 0,
139+
"source": "builtin",
140+
"dependencies": {}
141+
},
142+
"com.unity.modules.physics2d": {
143+
"version": "1.0.0",
144+
"depth": 0,
145+
"source": "builtin",
146+
"dependencies": {}
147+
},
148+
"com.unity.modules.screencapture": {
149+
"version": "1.0.0",
150+
"depth": 0,
151+
"source": "builtin",
152+
"dependencies": {
153+
"com.unity.modules.imageconversion": "1.0.0"
154+
}
155+
},
156+
"com.unity.modules.subsystems": {
157+
"version": "1.0.0",
158+
"depth": 1,
159+
"source": "builtin",
160+
"dependencies": {
161+
"com.unity.modules.jsonserialize": "1.0.0"
162+
}
163+
},
164+
"com.unity.modules.terrain": {
165+
"version": "1.0.0",
166+
"depth": 0,
167+
"source": "builtin",
168+
"dependencies": {}
169+
},
170+
"com.unity.modules.terrainphysics": {
171+
"version": "1.0.0",
172+
"depth": 0,
173+
"source": "builtin",
174+
"dependencies": {
175+
"com.unity.modules.physics": "1.0.0",
176+
"com.unity.modules.terrain": "1.0.0"
177+
}
178+
},
179+
"com.unity.modules.tilemap": {
180+
"version": "1.0.0",
181+
"depth": 0,
182+
"source": "builtin",
183+
"dependencies": {
184+
"com.unity.modules.physics2d": "1.0.0"
185+
}
186+
},
187+
"com.unity.modules.ui": {
188+
"version": "1.0.0",
189+
"depth": 0,
190+
"source": "builtin",
191+
"dependencies": {}
192+
},
193+
"com.unity.modules.uielements": {
194+
"version": "1.0.0",
195+
"depth": 0,
196+
"source": "builtin",
197+
"dependencies": {
198+
"com.unity.modules.ui": "1.0.0",
199+
"com.unity.modules.imgui": "1.0.0",
200+
"com.unity.modules.jsonserialize": "1.0.0",
201+
"com.unity.modules.uielementsnative": "1.0.0"
202+
}
203+
},
204+
"com.unity.modules.uielementsnative": {
205+
"version": "1.0.0",
206+
"depth": 1,
207+
"source": "builtin",
208+
"dependencies": {
209+
"com.unity.modules.ui": "1.0.0",
210+
"com.unity.modules.imgui": "1.0.0",
211+
"com.unity.modules.jsonserialize": "1.0.0"
212+
}
213+
},
214+
"com.unity.modules.umbra": {
215+
"version": "1.0.0",
216+
"depth": 0,
217+
"source": "builtin",
218+
"dependencies": {}
219+
},
220+
"com.unity.modules.unityanalytics": {
221+
"version": "1.0.0",
222+
"depth": 0,
223+
"source": "builtin",
224+
"dependencies": {
225+
"com.unity.modules.unitywebrequest": "1.0.0",
226+
"com.unity.modules.jsonserialize": "1.0.0"
227+
}
228+
},
229+
"com.unity.modules.unitywebrequest": {
230+
"version": "1.0.0",
231+
"depth": 0,
232+
"source": "builtin",
233+
"dependencies": {}
234+
},
235+
"com.unity.modules.unitywebrequestassetbundle": {
236+
"version": "1.0.0",
237+
"depth": 0,
238+
"source": "builtin",
239+
"dependencies": {
240+
"com.unity.modules.assetbundle": "1.0.0",
241+
"com.unity.modules.unitywebrequest": "1.0.0"
242+
}
243+
},
244+
"com.unity.modules.unitywebrequestaudio": {
245+
"version": "1.0.0",
246+
"depth": 0,
247+
"source": "builtin",
248+
"dependencies": {
249+
"com.unity.modules.unitywebrequest": "1.0.0",
250+
"com.unity.modules.audio": "1.0.0"
251+
}
252+
},
253+
"com.unity.modules.unitywebrequesttexture": {
254+
"version": "1.0.0",
255+
"depth": 0,
256+
"source": "builtin",
257+
"dependencies": {
258+
"com.unity.modules.unitywebrequest": "1.0.0",
259+
"com.unity.modules.imageconversion": "1.0.0"
260+
}
261+
},
262+
"com.unity.modules.unitywebrequestwww": {
263+
"version": "1.0.0",
264+
"depth": 0,
265+
"source": "builtin",
266+
"dependencies": {
267+
"com.unity.modules.unitywebrequest": "1.0.0",
268+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
269+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
270+
"com.unity.modules.audio": "1.0.0",
271+
"com.unity.modules.assetbundle": "1.0.0",
272+
"com.unity.modules.imageconversion": "1.0.0"
273+
}
274+
},
275+
"com.unity.modules.vehicles": {
276+
"version": "1.0.0",
277+
"depth": 0,
278+
"source": "builtin",
279+
"dependencies": {
280+
"com.unity.modules.physics": "1.0.0"
281+
}
282+
},
283+
"com.unity.modules.video": {
284+
"version": "1.0.0",
285+
"depth": 0,
286+
"source": "builtin",
287+
"dependencies": {
288+
"com.unity.modules.audio": "1.0.0",
289+
"com.unity.modules.ui": "1.0.0",
290+
"com.unity.modules.unitywebrequest": "1.0.0"
291+
}
292+
},
293+
"com.unity.modules.vr": {
294+
"version": "1.0.0",
295+
"depth": 0,
296+
"source": "builtin",
297+
"dependencies": {
298+
"com.unity.modules.jsonserialize": "1.0.0",
299+
"com.unity.modules.physics": "1.0.0",
300+
"com.unity.modules.xr": "1.0.0"
301+
}
302+
},
303+
"com.unity.modules.wind": {
304+
"version": "1.0.0",
305+
"depth": 0,
306+
"source": "builtin",
307+
"dependencies": {}
308+
},
309+
"com.unity.modules.xr": {
310+
"version": "1.0.0",
311+
"depth": 0,
312+
"source": "builtin",
313+
"dependencies": {
314+
"com.unity.modules.physics": "1.0.0",
315+
"com.unity.modules.jsonserialize": "1.0.0",
316+
"com.unity.modules.subsystems": "1.0.0"
317+
}
318+
}
319+
}
320+
}

‎ProjectSettings/DynamicsManager.asset‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,35 @@
33
--- !u!55 &1
44
PhysicsManager:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 3
6+
serializedVersion: 13
77
m_Gravity: {x: 0, y: -9.81, z: 0}
88
m_DefaultMaterial: {fileID: 0}
99
m_BounceThreshold: 2
10+
m_DefaultMaxDepenetrationVelocity: 10
1011
m_SleepThreshold: 0.005
1112
m_DefaultContactOffset: 0.01
1213
m_DefaultSolverIterations: 6
1314
m_DefaultSolverVelocityIterations: 1
1415
m_QueriesHitBackfaces: 0
1516
m_QueriesHitTriggers: 1
1617
m_EnableAdaptiveForce: 0
17-
m_EnablePCM: 1
18+
m_ClothInterCollisionDistance: 0.1
19+
m_ClothInterCollisionStiffness: 0.2
20+
m_ContactsGeneration: 1
1821
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
1922
m_AutoSimulation: 1
23+
m_AutoSyncTransforms: 1
24+
m_ReuseCollisionCallbacks: 0
25+
m_ClothInterCollisionSettingsToggle: 0
26+
m_ClothGravity: {x: 0, y: -9.81, z: 0}
27+
m_ContactPairsMode: 0
28+
m_BroadphaseType: 0
29+
m_WorldBounds:
30+
m_Center: {x: 0, y: 0, z: 0}
31+
m_Extent: {x: 250, y: 250, z: 250}
32+
m_WorldSubdivisions: 8
33+
m_FrictionType: 0
34+
m_EnableEnhancedDeterminism: 0
35+
m_EnableUnifiedHeightmaps: 1
36+
m_SolverType: 0
37+
m_DefaultMaxAngularSpeed: 7

0 commit comments

Comments
 (0)