Skip to content

Commit 5ee6e40

Browse files
sebastienlagarderemi-chapelainFrancescoC-unityeturquinJordanL8
authored
[10.x.x] Merge Hdrp/staging [Skip CI] (#1162)
* Modify scene for better stability (#1120) * Fix area light gizmo not updating engine side light v2 (#1156) * Update base light area size. * changelog * Better change. * revert whitespace * Make the change editor only. * Updated doc. (#1152) * Address decal layer documentation feedback (#1157) * Update Decal-Projector.md * update doc based on feedback * Hdrp/docs/upgrading to 2020.2 (#1170) * Update Upgrading-from-2020.1-to-2020.2.md * Update Upgrading-from-2020.1-to-2020.2.md * HDRP - Shutter speed can now be changed by dragging the mouse over the UI label (#1110) * Shutter speed can now change by dragging over the label * Changelog * Typo Co-authored-by: sebastienlagarde <[email protected]> * Fix API breaking change: Add Public quality to Raytracing volume effect - RR * ix API breaking change: Add Public quality to Raytracing volume effect - RR * Add 3 tests in HDRP_Test for 1709_DecalLayers for deferred, forward and forwardMSAA (#1138) * add 1709 test * More decal test * Update 1709_DecalLayer.unity * fix material * Update test * update test * Add 3 new test forward, forward MSAA and deferred * add the 3 test in build settings * Add reference screenshots for windows * update reference screenshots * disabe 1709 with rendergraph * Fixed creation of Decal Buffer (should not have been bindMS) * Fixed missing read causing copy depth pass to be pruned * Fixed clear color of decal prepass buffer * Re-enabled tests 1709 1710 and change order to workaround resolution issue when running tests with temporal. Co-authored-by: Julien Ignace <[email protected]> * Added what's new page and relevant images (#1154) * Added what's new page and relevant images * Update whats-new-10-0.md * Added decal layers and eye shader graph Co-authored-by: sebastienlagarde <[email protected]> * update what's new * Fix Material Creation RenderQueue setup + Fix AXF GUI (#1185) * Fix Material creation queue * Update SurfaceOptionUIBlock.cs * Refactor keyword system in ShaderGraph (#1181) * Refactor the keyword system in ShaderGraph * Move geometric AA to respective master node Co-authored-by: Sebastien Lagarde <[email protected]> Co-authored-by: remi-chapelain <[email protected]> Co-authored-by: FrancescoC-unity <[email protected]> Co-authored-by: Emmanuel Turquin <[email protected]> Co-authored-by: JordanL8 <[email protected]> Co-authored-by: Pavlos Mavridis <[email protected]> Co-authored-by: Julien Ignace <[email protected]> Co-authored-by: Antoine Lelievre <[email protected]>
1 parent 3283069 commit 5ee6e40

File tree

144 files changed

+19694
-482
lines changed

Some content is hidden

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

144 files changed

+19694
-482
lines changed
Lines changed: 2 additions & 2 deletions
Loading

TestProjects/HDRP_DXR_Tests/Assets/Scenes/709_CameraExtendedCulling.unity

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ GameObject:
129129
type: 3}
130130
m_PrefabInstance: {fileID: 1934281440}
131131
m_PrefabAsset: {fileID: 0}
132-
--- !u!114 &317366833
132+
--- !u!114 &317366834
133133
MonoBehaviour:
134134
m_ObjectHideFlags: 0
135135
m_CorrespondingSourceObject: {fileID: 0}
@@ -138,13 +138,11 @@ MonoBehaviour:
138138
m_GameObject: {fileID: 317366831}
139139
m_Enabled: 1
140140
m_EditorHideFlags: 0
141-
m_Script: {fileID: 11500000, guid: 14d7896b83927c247821fa13f452106f, type: 3}
141+
m_Script: {fileID: 11500000, guid: d29a2d820d8afeb4a88421fa92f66c71, type: 3}
142142
m_Name:
143143
m_EditorClassIdentifier:
144-
localSpace: 0
145-
angles: {x: -45, y: 0, z: 0}
146-
frequency: 1
147-
fps: 60
144+
anglesToAdd: {x: 45, y: 0, z: 0}
145+
waitFrames: 3
148146
--- !u!1001 &466758464
149147
PrefabInstance:
150148
m_ObjectHideFlags: 0
@@ -239,7 +237,7 @@ GameObject:
239237
type: 3}
240238
m_PrefabInstance: {fileID: 1934281440}
241239
m_PrefabAsset: {fileID: 0}
242-
--- !u!114 &596496634
240+
--- !u!114 &596496635
243241
MonoBehaviour:
244242
m_ObjectHideFlags: 0
245243
m_CorrespondingSourceObject: {fileID: 0}
@@ -248,13 +246,11 @@ MonoBehaviour:
248246
m_GameObject: {fileID: 596496632}
249247
m_Enabled: 1
250248
m_EditorHideFlags: 0
251-
m_Script: {fileID: 11500000, guid: 14d7896b83927c247821fa13f452106f, type: 3}
249+
m_Script: {fileID: 11500000, guid: d29a2d820d8afeb4a88421fa92f66c71, type: 3}
252250
m_Name:
253251
m_EditorClassIdentifier:
254-
localSpace: 0
255-
angles: {x: 0, y: 45, z: 20}
256-
frequency: 0.5
257-
fps: 60
252+
anglesToAdd: {x: 0, y: 45, z: 20}
253+
waitFrames: 3
258254
--- !u!1 &891046727
259255
GameObject:
260256
m_ObjectHideFlags: 0
@@ -567,7 +563,7 @@ GameObject:
567563
type: 3}
568564
m_PrefabInstance: {fileID: 1934281440}
569565
m_PrefabAsset: {fileID: 0}
570-
--- !u!114 &1888081535
566+
--- !u!114 &1888081536
571567
MonoBehaviour:
572568
m_ObjectHideFlags: 0
573569
m_CorrespondingSourceObject: {fileID: 0}
@@ -576,13 +572,11 @@ MonoBehaviour:
576572
m_GameObject: {fileID: 1888081533}
577573
m_Enabled: 1
578574
m_EditorHideFlags: 0
579-
m_Script: {fileID: 11500000, guid: 14d7896b83927c247821fa13f452106f, type: 3}
575+
m_Script: {fileID: 11500000, guid: d29a2d820d8afeb4a88421fa92f66c71, type: 3}
580576
m_Name:
581577
m_EditorClassIdentifier:
582-
localSpace: 0
583-
angles: {x: 45, y: 0, z: 0}
584-
frequency: 1
585-
fps: 60
578+
anglesToAdd: {x: 45, y: 0, z: 0}
579+
waitFrames: 3
586580
--- !u!1001 &1934281440
587581
PrefabInstance:
588582
m_ObjectHideFlags: 0

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1709_DecalLayer.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.

0 commit comments

Comments
 (0)