Skip to content

Commit bd74d07

Browse files
committed
Updated to 2020.3.14f1
1 parent 3fa384c commit bd74d07

File tree

10 files changed

+258
-53
lines changed

10 files changed

+258
-53
lines changed

Assets/TextMesh Pro/Sprites/EmojiOne.json.meta

100755100644
Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/packages-lock.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"dependencies": {}
88
},
99
"com.unity.addressables": {
10-
"version": "1.17.15",
11-
"depth": 1,
10+
"version": "1.18.15",
11+
"depth": 0,
1212
"source": "registry",
1313
"dependencies": {
14-
"com.unity.scriptablebuildpipeline": "1.17.0",
14+
"com.unity.scriptablebuildpipeline": "1.19.1",
1515
"com.unity.modules.assetbundle": "1.0.0",
1616
"com.unity.modules.imageconversion": "1.0.0",
1717
"com.unity.modules.jsonserialize": "1.0.0",
@@ -28,7 +28,7 @@
2828
"url": "https://packages.unity.com"
2929
},
3030
"com.unity.burst": {
31-
"version": "1.4.8",
31+
"version": "1.4.11",
3232
"depth": 0,
3333
"source": "registry",
3434
"dependencies": {
@@ -37,7 +37,7 @@
3737
"url": "https://packages.unity.com"
3838
},
3939
"com.unity.cinemachine": {
40-
"version": "2.6.5",
40+
"version": "2.6.10",
4141
"depth": 0,
4242
"source": "registry",
4343
"dependencies": {},
@@ -76,10 +76,12 @@
7676
"url": "https://packages.unity.com"
7777
},
7878
"com.unity.inputsystem": {
79-
"version": "1.1.0-preview.3",
79+
"version": "1.1.1",
8080
"depth": 0,
8181
"source": "registry",
82-
"dependencies": {},
82+
"dependencies": {
83+
"com.unity.modules.uielements": "1.0.0"
84+
},
8385
"url": "https://packages.unity.com"
8486
},
8587
"com.unity.mathematics": {
@@ -90,7 +92,7 @@
9092
"url": "https://packages.unity.com"
9193
},
9294
"com.unity.memoryprofiler": {
93-
"version": "0.2.9-preview.3",
95+
"version": "0.4.1-preview.1",
9496
"depth": 0,
9597
"source": "registry",
9698
"dependencies": {
@@ -106,7 +108,7 @@
106108
"url": "https://packages.unity.com"
107109
},
108110
"com.unity.render-pipelines.core": {
109-
"version": "10.5.0",
111+
"version": "10.6.0",
110112
"depth": 1,
111113
"source": "registry",
112114
"dependencies": {
@@ -115,19 +117,19 @@
115117
"url": "https://packages.unity.com"
116118
},
117119
"com.unity.render-pipelines.universal": {
118-
"version": "10.5.0",
120+
"version": "10.6.0",
119121
"depth": 0,
120122
"source": "registry",
121123
"dependencies": {
122124
"com.unity.mathematics": "1.1.0",
123-
"com.unity.render-pipelines.core": "10.5.0",
124-
"com.unity.shadergraph": "10.5.0"
125+
"com.unity.render-pipelines.core": "10.6.0",
126+
"com.unity.shadergraph": "10.6.0"
125127
},
126128
"url": "https://packages.unity.com"
127129
},
128130
"com.unity.scriptablebuildpipeline": {
129-
"version": "1.17.0",
130-
"depth": 2,
131+
"version": "1.19.1",
132+
"depth": 1,
131133
"source": "registry",
132134
"dependencies": {},
133135
"url": "https://packages.unity.com"
@@ -140,11 +142,11 @@
140142
"url": "https://packages.unity.com"
141143
},
142144
"com.unity.shadergraph": {
143-
"version": "10.5.0",
145+
"version": "10.6.0",
144146
"depth": 1,
145147
"source": "registry",
146148
"dependencies": {
147-
"com.unity.render-pipelines.core": "10.5.0",
149+
"com.unity.render-pipelines.core": "10.6.0",
148150
"com.unity.searcher": "4.3.2"
149151
},
150152
"url": "https://packages.unity.com"
@@ -157,7 +159,7 @@
157159
"url": "https://packages.unity.com"
158160
},
159161
"com.unity.test-framework": {
160-
"version": "1.1.24",
162+
"version": "1.1.27",
161163
"depth": 1,
162164
"source": "registry",
163165
"dependencies": {
@@ -168,7 +170,7 @@
168170
"url": "https://packages.unity.com"
169171
},
170172
"com.unity.testframework.graphics": {
171-
"version": "7.8.12-preview",
173+
"version": "7.8.16-preview",
172174
"depth": 0,
173175
"source": "registry",
174176
"dependencies": {
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

ProjectSettings/PackageManagerSettings.asset

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ MonoBehaviour:
2323
m_Url: https://packages.unity.com
2424
m_Scopes: []
2525
m_IsDefault: 1
26+
m_Capabilities: 0
2627
m_UserSelectedRegistryName:
2728
m_UserAddingNewScopedRegistry: 0
2829
m_RegistryInfoDraft:
@@ -33,6 +34,7 @@ MonoBehaviour:
3334
m_Url:
3435
m_Scopes: []
3536
m_IsDefault: 0
37+
m_Capabilities: 0
3638
m_Modified: 0
3739
m_Name:
3840
m_Url:

ProjectSettings/ProjectSettings.asset

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ PlayerSettings:
5151
m_StereoRenderingPath: 1
5252
m_ActiveColorSpace: 1
5353
m_MTRendering: 1
54+
mipStripping: 0
55+
numberOfMipsStripped: 0
5456
m_StackTraceTypes: 020000000100000001000000010000000100000001000000
5557
iosShowActivityIndicatorOnLoading: -1
5658
androidShowActivityIndicatorOnLoading: -1
@@ -113,10 +115,14 @@ PlayerSettings:
113115
switchNVNShaderPoolsGranularity: 33554432
114116
switchNVNDefaultPoolsGranularity: 16777216
115117
switchNVNOtherPoolsGranularity: 16777216
118+
switchNVNMaxPublicTextureIDCount: 0
119+
switchNVNMaxPublicSamplerIDCount: 0
116120
stadiaPresentMode: 0
117121
stadiaTargetFramerate: 0
118122
vulkanNumSwapchainBuffers: 3
119123
vulkanEnableSetSRGBWrite: 0
124+
vulkanEnablePreTransform: 0
125+
vulkanEnableLateAcquireNextImage: 0
120126
m_SupportedAspectRatios:
121127
4:3: 1
122128
5:4: 1
@@ -135,31 +141,6 @@ PlayerSettings:
135141
xboxOneDisableKinectGpuReservation: 0
136142
xboxOneEnable7thCore: 0
137143
vrSettings:
138-
cardboard:
139-
depthFormat: 0
140-
enableTransitionView: 0
141-
daydream:
142-
depthFormat: 0
143-
useSustainedPerformanceMode: 0
144-
enableVideoLayer: 0
145-
useProtectedVideoMemory: 0
146-
minimumSupportedHeadTracking: 0
147-
maximumSupportedHeadTracking: 1
148-
hololens:
149-
depthFormat: 1
150-
depthBufferSharingEnabled: 0
151-
lumin:
152-
depthFormat: 0
153-
frameTiming: 2
154-
enableGLCache: 0
155-
glCacheMaxBlobSize: 524288
156-
glCacheMaxFileSize: 8388608
157-
oculus:
158-
sharedDepthBuffer: 0
159-
dashSupport: 0
160-
lowOverheadMode: 0
161-
protectedContext: 0
162-
v2Signing: 1
163144
enable360StereoCapture: 0
164145
isWsaHolographicRemotingEnabled: 0
165146
enableFrameTimingStats: 1
@@ -175,7 +156,11 @@ PlayerSettings:
175156
Lumin: com.DefaultCompany.BoatAttack
176157
Standalone: com.UnityTechnologies.BoatAttack
177158
iPhone: com.Unity3D.BoatAttack
178-
buildNumber: {}
159+
buildNumber:
160+
Standalone: 0
161+
iPhone: 0
162+
tvOS: 0
163+
overrideDefaultApplicationIdentifier: 0
179164
AndroidBundleVersionCode: 1
180165
AndroidMinSdkVersion: 21
181166
AndroidTargetSdkVersion: 0
@@ -560,7 +545,7 @@ PlayerSettings:
560545
m_BuildTargetGraphicsAPIs:
561546
- m_BuildTarget: iOSSupport
562547
m_APIs: 10000000
563-
m_Automatic: 0
548+
m_Automatic: 1
564549
- m_BuildTarget: WindowsStandaloneSupport
565550
m_APIs: 02000000
566551
m_Automatic: 0
@@ -822,6 +807,7 @@ PlayerSettings:
822807
ps4videoRecordingFeaturesUsed: 0
823808
ps4contentSearchFeaturesUsed: 0
824809
ps4CompatibilityPS5: 0
810+
ps4AllowPS5Detection: 0
825811
ps4GPU800MHz: 1
826812
ps4attribEyeToEyeDistanceSettingVR: 0
827813
ps4IncludedModules:
@@ -859,7 +845,7 @@ PlayerSettings:
859845
webGLThreadsSupport: 0
860846
webGLDecompressionFallback: 0
861847
scriptingDefineSymbols:
862-
1: URP;USE_CUSTOM_METADATA
848+
1:
863849
4: URP;USE_CUSTOM_METADATA
864850
7: URP;USE_CUSTOM_METADATA
865851
13: URP;USE_CUSTOM_METADATA

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.9f1
2-
m_EditorVersionWithRevision: 2020.3.9f1 (108be757e447)
1+
m_EditorVersion: 2020.3.14f1
2+
m_EditorVersionWithRevision: 2020.3.14f1 (d0d1bb862f9d)

0 commit comments

Comments
 (0)