Skip to content

Commit f36bf49

Browse files
chris-massiechris-massie
committed
Merge branch 'develop' into bugfix/XR-10725-initial-focus-desync
2 parents ea8728c + 0e1a715 commit f36bf49

350 files changed

Lines changed: 9408 additions & 6481 deletions

File tree

Some content is hidden

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

‎.yamato/wrench/pvp-exemptions.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@
127127
},
128128
"PVP-92-3": {
129129
"errors": [
130-
"Documentation~/Gamepad.md: .Switch.",
130+
"Documentation~/gamepads-s.md: .Switch.",
131+
"Documentation~/gamepads-s.md: .Switch.\n",
131132
"InputSystem/Runtime/Plugins/iOS/IOSGameController.cs: .Switch;",
132133
"InputSystem/Runtime/Plugins/Switch/SwitchProController.cs: .Switch\n",
133134
"InputSystem/Runtime/Plugins/Switch/SwitchProControllerHID.cs: .Switch.",

‎Assets/DefaultVolumeProfile.asset‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
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: d7fd9488000d3734a9e00ee676215985, type: 3}
13+
m_Name: DefaultVolumeProfile
14+
m_EditorClassIdentifier:
15+
components: []

‎Assets/DefaultVolumeProfile.asset.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/Samples/InGameHints/InGameHintsActions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.19.1
4+
// version 1.20.0
55
// from Assets/Samples/InGameHints/InGameHintsActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Samples/SimpleDemo/SimpleControls.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.19.1
4+
// version 1.20.0
55
// from Assets/Samples/SimpleDemo/SimpleControls.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Settings/URP-PipelineAsset.asset‎

Lines changed: 30 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: URP-PipelineAsset
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: 0
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: 1
7178
m_UseAdaptivePerformance: 0
7279
m_ColorGradingMode: 0
7380
m_ColorGradingLutSize: 32
81+
m_AllowPostProcessAlphaOutput: 0
7482
m_UseFastSRGBLinearConversion: 0
7583
m_SupportDataDrivenLensFlare: 0
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: 1
93110
m_PrefilterWriteRenderingLayers: 1
94111
m_PrefilterHDROutput: 1
112+
m_PrefilterAlphaOutput: 0
95113
m_PrefilterSSAODepthNormals: 1
96114
m_PrefilterSSAOSourceDepthLow: 1
97115
m_PrefilterSSAOSourceDepthMedium: 1
@@ -110,5 +128,11 @@ MonoBehaviour:
110128
m_PrefilterSoftShadows: 1
111129
m_PrefilterScreenCoord: 1
112130
m_PrefilterNativeRenderPass: 1
131+
m_PrefilterUseLegacyLightmaps: 0
132+
m_PrefilterReflectionProbeBlending: 0
133+
m_PrefilterReflectionProbeBoxProjection: 0
113134
m_ShaderVariantLogLevel: 0
114135
m_ShadowCascades: 0
136+
m_Textures:
137+
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
138+
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}

‎Assets/Settings/URP-Renderer.asset‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,21 @@ MonoBehaviour:
1616
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
1717
type: 3}
1818
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
19+
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
20+
type: 3}
21+
probeVolumeResources:
22+
probeVolumeDebugShader: {fileID: 0}
23+
probeVolumeFragmentationDebugShader: {fileID: 0}
24+
probeVolumeOffsetDebugShader: {fileID: 0}
25+
probeVolumeSamplingDebugShader: {fileID: 0}
26+
probeSamplingDebugMesh: {fileID: 0}
27+
probeSamplingDebugTexture: {fileID: 0}
28+
probeVolumeBlendStatesCS: {fileID: 0}
1929
m_RendererFeatures: []
2030
m_RendererFeatureMap:
2131
m_UseNativeRenderPass: 0
22-
postProcessData: {fileID: 0}
2332
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
24-
shaders:
25-
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
26-
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
27-
screenSpaceShadowPS: {fileID: 0}
28-
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
29-
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
30-
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
31-
fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
32-
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
33-
coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
34-
coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
35-
type: 3}
36-
blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
37-
cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
38-
type: 3}
39-
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
40-
type: 3}
41-
dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
42-
type: 3}
43-
terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144,
44-
type: 3}
45-
terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1,
46-
type: 3}
47-
terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90,
48-
type: 3}
33+
postProcessData: {fileID: 0}
4934
m_AssetVersion: 2
5035
m_OpaqueLayerMask:
5136
serializedVersion: 2
@@ -64,5 +49,7 @@ MonoBehaviour:
6449
m_RenderingMode: 0
6550
m_DepthPrimingMode: 0
6651
m_CopyDepthMode: 1
52+
m_DepthAttachmentFormat: 0
53+
m_DepthTextureFormat: 0
6754
m_AccurateGbufferNormals: 0
6855
m_IntermediateTextureMode: 1

‎Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.19.1
4+
// version 1.20.0
55
// from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Tests/InputSystem/Unity.InputSystem.Tests.asmdef‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
"expression": "6000.3.0a6",
7373
"define": "UNITY_INPUT_SYSTEM_PLATFORM_POLLING_FREQUENCY"
7474
},
75+
{
76+
"name": "Unity",
77+
"expression": "6000.4.0a4",
78+
"define": "UNITY_INPUTSYSTEM_SUPPORTS_MOUSE_SCRIPT_EVENTS"
79+
},
7580
{
7681
"name": "Unity",
7782
"expression": "6000.5.0a8",

0 commit comments

Comments
 (0)