Skip to content

Commit 075d33f

Browse files
andrew-hirata-playeverywareandrew-hirata-playeveryware
committed
Merge branch 'release-2.2.1' into stable
2 parents aff9050 + c819179 commit 075d33f

File tree

189 files changed

+20946
-2193
lines changed

Some content is hidden

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

189 files changed

+20946
-2193
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ If applicable, add screenshots to help explain your problem.
2525

2626
**Desktop (please complete the following information):**
2727
- OS: [e.g. Windows x86, Windows x64, macOS Intel, macOS ARM]
28+
- Editor, or standalone build
2829
- Unity Version
2930
- Plugin Version
3031

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
# Visual Studio cache directory
3030
.vs/
3131

32+
# Visual Studio Code cache directory
33+
.vscode/
34+
3235
#Rider cache directory
3336
.idea/
3437

@@ -145,3 +148,4 @@ test-results/
145148
*IL2CPPCache/*
146149
*IL2CPPStats/*
147150
EOSPluginEditorConfiguration/
151+
[Aa]ssets/TextMesh*Pro/

‎Assets/Materials/BaseObject.mat‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-6046970740179633861
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 0
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: BaseObject
24+
m_Shader: {fileID: -6465566751694194690, guid: 5cb306dad1168d348818eb5d01e4f94a,
25+
type: 3}
26+
m_ValidKeywords: []
27+
m_InvalidKeywords: []
28+
m_LightmapFlags: 4
29+
m_EnableInstancingVariants: 0
30+
m_DoubleSidedGI: 0
31+
m_CustomRenderQueue: -1
32+
stringTagMap: {}
33+
disabledShaderPasses: []
34+
m_SavedProperties:
35+
serializedVersion: 3
36+
m_TexEnvs:
37+
- _BumpMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailAlbedoMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailMask:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _DetailNormalMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _EmissionMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MainTex:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _MetallicGlossMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _OcclusionMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _ParallaxMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
m_Ints: []
74+
m_Floats:
75+
- _BUILTIN_QueueControl: 0
76+
- _BUILTIN_QueueOffset: 0
77+
- _BumpScale: 1
78+
- _Cutoff: 0.5
79+
- _DetailNormalMapScale: 1
80+
- _DstBlend: 0
81+
- _GlossMapScale: 1
82+
- _Glossiness: 0.5
83+
- _GlossyReflections: 1
84+
- _Metallic: 0
85+
- _Mode: 0
86+
- _OcclusionStrength: 1
87+
- _Parallax: 0.02
88+
- _SmoothnessTextureChannel: 0
89+
- _SpecularHighlights: 1
90+
- _SrcBlend: 1
91+
- _UVSec: 0
92+
- _ZWrite: 1
93+
m_Colors:
94+
- _Color: {r: 1, g: 0.039215688, b: 0.45882356, a: 1}
95+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
96+
m_BuildTextureStacks: []

‎Assets/Materials/BaseObject.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/GraphicsTestSphereMat.mat‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: GraphicsTestSphereMat
11+
m_Shader: {fileID: -6465566751694194690, guid: 5cb306dad1168d348818eb5d01e4f94a,
12+
type: 3}
13+
m_ValidKeywords: []
14+
m_InvalidKeywords:
15+
- _DETAIL_MULX2
16+
- _NORMALMAP
17+
m_LightmapFlags: 4
18+
m_EnableInstancingVariants: 0
19+
m_DoubleSidedGI: 0
20+
m_CustomRenderQueue: -1
21+
stringTagMap: {}
22+
disabledShaderPasses: []
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs:
26+
- _BumpMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailAlbedoMap:
31+
m_Texture: {fileID: 2800000, guid: 5c6f26400cfc55c49bc6177063379693, type: 3}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailMask:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _DetailNormalMap:
39+
m_Texture: {fileID: 2800000, guid: bb303f7d37b6b454f92e695c5336e511, type: 3}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _EmissionMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MainTex:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _MetallicGlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _OcclusionMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _ParallaxMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
m_Ints: []
63+
m_Floats:
64+
- _BUILTIN_QueueControl: 0
65+
- _BUILTIN_QueueOffset: 0
66+
- _BumpScale: 1
67+
- _Cutoff: 0.5
68+
- _DetailNormalMapScale: 1
69+
- _DstBlend: 0
70+
- _GlossMapScale: 1
71+
- _Glossiness: 0.399
72+
- _GlossyReflections: 1
73+
- _Metallic: 0.554
74+
- _Mode: 0
75+
- _OcclusionStrength: 1
76+
- _Parallax: 0.02
77+
- _SmoothnessTextureChannel: 0
78+
- _SpecularHighlights: 1
79+
- _SrcBlend: 1
80+
- _UVSec: 0
81+
- _ZWrite: 1
82+
m_Colors:
83+
- _Color: {r: 1, g: 1, b: 1, a: 1}
84+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
85+
m_BuildTextureStacks: []
86+
--- !u!114 &5865323441971905698
87+
MonoBehaviour:
88+
m_ObjectHideFlags: 11
89+
m_CorrespondingSourceObject: {fileID: 0}
90+
m_PrefabInstance: {fileID: 0}
91+
m_PrefabAsset: {fileID: 0}
92+
m_GameObject: {fileID: 0}
93+
m_Enabled: 1
94+
m_EditorHideFlags: 0
95+
m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
96+
m_Name:
97+
m_EditorClassIdentifier:
98+
version: 0

‎Assets/Materials/GraphicsTestSphereMat.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/NetcodePlayField.mat‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: NetcodePlayField
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ValidKeywords: []
13+
m_InvalidKeywords: []
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: -1
18+
stringTagMap: {}
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- _BumpMap:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _DetailAlbedoMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _DetailMask:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailNormalMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _EmissionMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _MainTex:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MetallicGlossMap:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _OcclusionMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _ParallaxMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
m_Ints: []
60+
m_Floats:
61+
- _BumpScale: 1
62+
- _Cutoff: 0.5
63+
- _DetailNormalMapScale: 1
64+
- _DstBlend: 0
65+
- _GlossMapScale: 1
66+
- _Glossiness: 0.5
67+
- _GlossyReflections: 1
68+
- _Metallic: 0
69+
- _Mode: 0
70+
- _OcclusionStrength: 1
71+
- _Parallax: 0.02
72+
- _SmoothnessTextureChannel: 0
73+
- _SpecularHighlights: 1
74+
- _SrcBlend: 1
75+
- _UVSec: 0
76+
- _ZWrite: 1
77+
m_Colors:
78+
- _Color: {r: 0.0054255314, g: 0.13751091, b: 0.17, a: 1}
79+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
80+
m_BuildTextureStacks: []

‎Assets/Materials/NetcodePlayField.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Materials/PerformanceLightingSettings.lighting‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!850595691 &4890085278179872738
4+
LightingSettings:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: PerformanceLightingSettings
10+
serializedVersion: 4
11+
m_GIWorkflowMode: 0
12+
m_EnableBakedLightmaps: 1
13+
m_EnableRealtimeLightmaps: 0
14+
m_RealtimeEnvironmentLighting: 1
15+
m_BounceScale: 1
16+
m_AlbedoBoost: 1
17+
m_IndirectOutputScale: 1
18+
m_UsingShadowmask: 1
19+
m_BakeBackend: 2
20+
m_LightmapMaxSize: 1024
21+
m_BakeResolution: 40
22+
m_Padding: 2
23+
m_LightmapCompression: 3
24+
m_AO: 0
25+
m_AOMaxDistance: 1
26+
m_CompAOExponent: 1
27+
m_CompAOExponentDirect: 0
28+
m_ExtractAO: 0
29+
m_MixedBakeMode: 2
30+
m_LightmapsBakeMode: 1
31+
m_FilterMode: 1
32+
m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0}
33+
m_ExportTrainingData: 0
34+
m_TrainingDataDestination: TrainingData
35+
m_RealtimeResolution: 2
36+
m_ForceWhiteAlbedo: 0
37+
m_ForceUpdates: 0
38+
m_FinalGather: 0
39+
m_FinalGatherRayCount: 256
40+
m_FinalGatherFiltering: 1
41+
m_PVRCulling: 1
42+
m_PVRSampling: 1
43+
m_PVRDirectSampleCount: 32
44+
m_PVRSampleCount: 512
45+
m_PVREnvironmentSampleCount: 256
46+
m_PVREnvironmentReferencePointCount: 2048
47+
m_LightProbeSampleCountMultiplier: 4
48+
m_PVRBounces: 10
49+
m_PVRMinBounces: 1
50+
m_PVREnvironmentMIS: 1
51+
m_PVRFilteringMode: 1
52+
m_PVRDenoiserTypeDirect: 1
53+
m_PVRDenoiserTypeIndirect: 1
54+
m_PVRDenoiserTypeAO: 1
55+
m_PVRFilterTypeDirect: 0
56+
m_PVRFilterTypeIndirect: 0
57+
m_PVRFilterTypeAO: 0
58+
m_PVRFilteringGaussRadiusDirect: 1
59+
m_PVRFilteringGaussRadiusIndirect: 5
60+
m_PVRFilteringGaussRadiusAO: 2
61+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
62+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
63+
m_PVRFilteringAtrousPositionSigmaAO: 1
64+
m_PVRTiledBaking: 0

0 commit comments

Comments
 (0)