Skip to content

Commit 5d31025

Browse files
authored
Merge pull request #236 from Unity-Technologies/develop
Release 1.8.0 [MTT-9227]
2 parents 0ec575c + 381783a commit 5d31025

File tree

443 files changed

+526682
-9709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+526682
-9709
lines changed

.yamato/project.metafile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ projects:
4747
- name: multiplayerusecases
4848
path: Basic/MultiplayerUseCases
4949
test_editors:
50-
- 2022.3
50+
- 6000.0.23
5151
run_editor_tests: !!bool true
5252
run_playmode_tests: !!bool false

Basic/MultiplayerUseCases/Assets/Common/Materials/CapsulePlayer.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ Material:
2020
m_CustomRenderQueue: 2000
2121
stringTagMap:
2222
RenderType: Opaque
23-
disabledShaderPasses: []
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
2425
m_LockedProperties:
2526
m_SavedProperties:
2627
serializedVersion: 3
@@ -115,6 +116,7 @@ Material:
115116
- _EmissionColor: {r: 0.06847818, g: 0.1559265, b: 0.2874409, a: 1}
116117
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
117118
m_BuildTextureStacks: []
119+
m_AllowLocking: 1
118120
--- !u!114 &3283647765994282847
119121
MonoBehaviour:
120122
m_ObjectHideFlags: 11
@@ -127,4 +129,4 @@ MonoBehaviour:
127129
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
128130
m_Name:
129131
m_EditorClassIdentifier:
130-
version: 7
132+
version: 9

Basic/MultiplayerUseCases/Assets/Common/Materials/ColoredCube.mat

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -35,7 +35,8 @@ Material:
3535
m_CustomRenderQueue: -1
3636
stringTagMap:
3737
RenderType: Opaque
38-
disabledShaderPasses: []
38+
disabledShaderPasses:
39+
- MOTIONVECTORS
3940
m_LockedProperties:
4041
m_SavedProperties:
4142
serializedVersion: 3
@@ -98,8 +99,11 @@ Material:
9899
m_Offset: {x: 0, y: 0}
99100
m_Ints: []
100101
m_Floats:
102+
- _AddPrecomputedVelocity: 0
101103
- _AlphaClip: 0
104+
- _AlphaToMask: 0
102105
- _Blend: 0
106+
- _BlendModePreserveSpecular: 1
103107
- _BumpScale: 1
104108
- _ClearCoatMask: 0
105109
- _ClearCoatSmoothness: 0
@@ -108,6 +112,7 @@ Material:
108112
- _DetailAlbedoMapScale: 1
109113
- _DetailNormalMapScale: 1
110114
- _DstBlend: 0
115+
- _DstBlendAlpha: 0
111116
- _EnvironmentReflections: 1
112117
- _GlossMapScale: 0
113118
- _Glossiness: 0
@@ -125,6 +130,7 @@ Material:
125130
- _SpecSource: 0
126131
- _SpecularHighlights: 0
127132
- _SrcBlend: 1
133+
- _SrcBlendAlpha: 1
128134
- _Surface: 0
129135
- _WorkflowMode: 1
130136
- _ZWrite: 1
@@ -134,3 +140,4 @@ Material:
134140
- _EmissionColor: {r: 0.0125, g: 0.025000006, b: 0.05, a: 1}
135141
- _SpecColor: {r: 0.19999892, g: 0.19999892, b: 0.19999892, a: 1}
136142
m_BuildTextureStacks: []
143+
m_AllowLocking: 1

Basic/MultiplayerUseCases/Assets/Common/Materials/Ground.mat

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -32,7 +32,8 @@ Material:
3232
m_CustomRenderQueue: -1
3333
stringTagMap:
3434
RenderType: Opaque
35-
disabledShaderPasses: []
35+
disabledShaderPasses:
36+
- MOTIONVECTORS
3637
m_LockedProperties:
3738
m_SavedProperties:
3839
serializedVersion: 3
@@ -95,8 +96,11 @@ Material:
9596
m_Offset: {x: 0, y: 0}
9697
m_Ints: []
9798
m_Floats:
99+
- _AddPrecomputedVelocity: 0
98100
- _AlphaClip: 0
101+
- _AlphaToMask: 0
99102
- _Blend: 0
103+
- _BlendModePreserveSpecular: 1
100104
- _BumpScale: 1
101105
- _ClearCoatMask: 0
102106
- _ClearCoatSmoothness: 0
@@ -105,6 +109,7 @@ Material:
105109
- _DetailAlbedoMapScale: 1
106110
- _DetailNormalMapScale: 1
107111
- _DstBlend: 0
112+
- _DstBlendAlpha: 0
108113
- _EnvironmentReflections: 1
109114
- _GlossMapScale: 1
110115
- _Glossiness: 0.5
@@ -119,6 +124,7 @@ Material:
119124
- _SmoothnessTextureChannel: 0
120125
- _SpecularHighlights: 1
121126
- _SrcBlend: 1
127+
- _SrcBlendAlpha: 1
122128
- _Surface: 0
123129
- _UVSec: 0
124130
- _WorkflowMode: 1
@@ -129,3 +135,4 @@ Material:
129135
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
130136
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
131137
m_BuildTextureStacks: []
138+
m_AllowLocking: 1

Basic/MultiplayerUseCases/Assets/Common/Materials/Radius.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -36,6 +36,7 @@ Material:
3636
disabledShaderPasses:
3737
- DepthOnly
3838
- SHADOWCASTER
39+
- MOTIONVECTORS
3940
m_LockedProperties:
4041
m_SavedProperties:
4142
serializedVersion: 3
@@ -135,3 +136,4 @@ Material:
135136
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
136137
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
137138
m_BuildTextureStacks: []
139+
m_AllowLocking: 1

Basic/MultiplayerUseCases/Assets/Common/Materials/Sphere.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -33,7 +33,8 @@ Material:
3333
m_CustomRenderQueue: -1
3434
stringTagMap:
3535
RenderType: Opaque
36-
disabledShaderPasses: []
36+
disabledShaderPasses:
37+
- MOTIONVECTORS
3738
m_LockedProperties:
3839
m_SavedProperties:
3940
serializedVersion: 3
@@ -130,3 +131,4 @@ Material:
130131
- _EmissionColor: {r: 0.011764706, g: 0.14901961, b: 0.0627451, a: 1}
131132
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
132133
m_BuildTextureStacks: []
134+
m_AllowLocking: 1

Basic/MultiplayerUseCases/Assets/Common/Materials/Wall.mat

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Material:
1919
m_CustomRenderQueue: -1
2020
stringTagMap:
2121
RenderType: Opaque
22-
disabledShaderPasses: []
22+
disabledShaderPasses:
23+
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
@@ -82,8 +83,11 @@ Material:
8283
m_Offset: {x: 0, y: 0}
8384
m_Ints: []
8485
m_Floats:
86+
- _AddPrecomputedVelocity: 0
8587
- _AlphaClip: 0
88+
- _AlphaToMask: 0
8689
- _Blend: 0
90+
- _BlendModePreserveSpecular: 1
8791
- _BumpScale: 1
8892
- _ClearCoatMask: 0
8993
- _ClearCoatSmoothness: 0
@@ -92,6 +96,7 @@ Material:
9296
- _DetailAlbedoMapScale: 1
9397
- _DetailNormalMapScale: 1
9498
- _DstBlend: 0
99+
- _DstBlendAlpha: 0
95100
- _EnvironmentReflections: 1
96101
- _GlossMapScale: 1
97102
- _Glossiness: 0.5
@@ -106,6 +111,7 @@ Material:
106111
- _SmoothnessTextureChannel: 0
107112
- _SpecularHighlights: 1
108113
- _SrcBlend: 1
114+
- _SrcBlendAlpha: 1
109115
- _Surface: 0
110116
- _UVSec: 0
111117
- _WorkflowMode: 1
@@ -116,6 +122,7 @@ Material:
116122
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
117123
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
118124
m_BuildTextureStacks: []
125+
m_AllowLocking: 1
119126
--- !u!114 &2846857423197095318
120127
MonoBehaviour:
121128
m_ObjectHideFlags: 11
@@ -128,4 +135,4 @@ MonoBehaviour:
128135
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
129136
m_Name:
130137
m_EditorClassIdentifier:
131-
version: 7
138+
version: 9

Basic/MultiplayerUseCases/Assets/Common/Rendering/Universal Render Pipeline Asset.asset

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
1313
m_Name: Universal Render Pipeline Asset
1414
m_EditorClassIdentifier:
15-
k_AssetVersion: 11
16-
k_AssetPreviousVersion: 11
15+
k_AssetVersion: 12
16+
k_AssetPreviousVersion: 12
1717
m_RendererType: 1
1818
m_RendererData: {fileID: 0}
1919
m_RendererDataList:
@@ -33,6 +33,14 @@ MonoBehaviour:
3333
m_EnableLODCrossFade: 1
3434
m_LODCrossFadeDitheringType: 1
3535
m_ShEvalMode: 0
36+
m_LightProbeSystem: 0
37+
m_ProbeVolumeMemoryBudget: 1024
38+
m_ProbeVolumeBlendingMemoryBudget: 256
39+
m_SupportProbeVolumeGPUStreaming: 0
40+
m_SupportProbeVolumeDiskStreaming: 0
41+
m_SupportProbeVolumeScenarios: 0
42+
m_SupportProbeVolumeScenarioBlending: 0
43+
m_ProbeVolumeSHBands: 1
3644
m_MainLightRenderingMode: 1
3745
m_MainLightShadowsSupported: 1
3846
m_MainLightShadowmapResolution: 2048
@@ -67,21 +75,30 @@ MonoBehaviour:
6775
m_SupportsLightLayers: 0
6876
m_DebugLevel: 0
6977
m_StoreActionsOptimization: 0
70-
m_EnableRenderGraph: 0
7178
m_UseAdaptivePerformance: 1
7279
m_ColorGradingMode: 0
7380
m_ColorGradingLutSize: 32
81+
m_AllowPostProcessAlphaOutput: 0
7482
m_UseFastSRGBLinearConversion: 0
7583
m_SupportDataDrivenLensFlare: 1
84+
m_SupportScreenSpaceLensFlare: 1
85+
m_GPUResidentDrawerMode: 0
86+
m_SmallMeshScreenPercentage: 0
87+
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
7688
m_ShadowType: 1
7789
m_LocalShadowsSupported: 0
7890
m_LocalShadowsAtlasResolution: 256
7991
m_MaxPixelLights: 0
8092
m_ShadowAtlasResolution: 256
8193
m_VolumeFrameworkUpdateMode: 0
82-
m_Textures:
83-
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
84-
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
94+
m_VolumeProfile: {fileID: 0}
95+
apvScenesData:
96+
obsoleteSceneBounds:
97+
m_Keys: []
98+
m_Values: []
99+
obsoleteHasProbeVolumes:
100+
m_Keys: []
101+
m_Values:
85102
m_PrefilteringModeMainLightShadows: 1
86103
m_PrefilteringModeAdditionalLight: 4
87104
m_PrefilteringModeAdditionalLightShadows: 1
@@ -92,6 +109,7 @@ MonoBehaviour:
92109
m_PrefilterDebugKeywords: 0
93110
m_PrefilterWriteRenderingLayers: 0
94111
m_PrefilterHDROutput: 0
112+
m_PrefilterAlphaOutput: 0
95113
m_PrefilterSSAODepthNormals: 0
96114
m_PrefilterSSAOSourceDepthLow: 0
97115
m_PrefilterSSAOSourceDepthMedium: 0
@@ -104,7 +122,15 @@ MonoBehaviour:
104122
m_PrefilterDBufferMRT1: 0
105123
m_PrefilterDBufferMRT2: 0
106124
m_PrefilterDBufferMRT3: 0
125+
m_PrefilterSoftShadowsQualityLow: 0
126+
m_PrefilterSoftShadowsQualityMedium: 0
127+
m_PrefilterSoftShadowsQualityHigh: 0
128+
m_PrefilterSoftShadows: 0
107129
m_PrefilterScreenCoord: 0
108130
m_PrefilterNativeRenderPass: 0
131+
m_PrefilterUseLegacyLightmaps: 0
109132
m_ShaderVariantLogLevel: 0
110133
m_ShadowCascades: 0
134+
m_Textures:
135+
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
136+
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}

0 commit comments

Comments
 (0)