Frédéric Vauchelles
3a51c9b2
[HDCameraEditor] Refactored UI Framework
7 年前
Frédéric Vauchelles
6c10f301
[HDRenderPipelineEditor] Fixed light loop settings
7 年前
GitHub
9a3378ab
Merge pull request #754 from Unity-Technologies/feature/HDRenderPipelineEditor
HDRenderPipelineEditor
7 年前
Evgenii Golubev
b8684ef4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Sebastien Lagarde
814bb007
Decouple SSS and Transmission option
Rename EnableSSSAndTransmission as EnableSubsurfaceScattering and
EnableTransmission
Note: Disabling Transmission doesn't save the ALU if it is enabled in
the profile
+ Add supportSubsurfaceScattering in UI
+ Small cosmetic rearrangement at the beginning of lit.hlsl
7 年前
Sebastien Lagarde
eb916f23
More draft
7 年前
GitHub
afc49b99
Merge pull request #759 from Unity-Technologies/Decouple-SSS-and-transmission-option
Decouple SSS and Transmission option
7 年前
Sebastien Lagarde
f2d69eb4
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/FrameSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedFrameSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScattering.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/FrameSettings.cs
7 年前
Frédéric Vauchelles
a481f7fa
[HDRenderPipelineEditor] Updated HDRenderPIpelineInspector
7 年前
Frédéric Vauchelles
1456d06a
[HDRenderPipelineEditor] Added missing field and field renaming
7 年前
GitHub
df79ad0d
Merge pull request #760 from Unity-Technologies/feature/HDRenderPipelineEditor
HDRenderPipelineInspector
7 年前
sebastienlagarde
45993046
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Frédéric Vauchelles
1d4bba47
[PlanarReflection]Update UI
7 年前
Frédéric Vauchelles
bc32f1eb
[PlanarReflection] Added planar reflection cache (wip)
7 年前
Frédéric Vauchelles
6611be52
[PlanarReflection] Update planar sampling
7 年前
Julien Ignace
93c49e08
- Switched sample count to a uniform to be changed by users
- Cleaned UI
- Added a variation to disable contact shadows
7 年前
GitHub
5c7e1fd0
Merge pull request #809 from Unity-Technologies/Branch_ScreenSpaceShadows
Contact Shadows
7 年前
Sebastien Lagarde
128f5158
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
Julien Ignace
03e54099
(WIP) Changed all HDRP RenderTextures to RTHandles
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
Frédéric Vauchelles
9a41a6d7
[PlanarReflections] Small fixes
7 年前
Sebastien Lagarde
0e6b2e32
more improvement on framesettings and asset
- Suppres support async compute
- Add dirty state to asset render pipeline for frame settings
7 年前
GitHub
376bd45a
Merge pull request #839 from Unity-Technologies/Fix-issue-with-camera-frame-settings
Fix issue with camera frame settings
7 年前
Sebastien Lagarde
c032196d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Sebastien Lagarde
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
7 年前
Evgenii Golubev
75799cbf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
Remy
c3c7eec1
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
7 年前
Sebastien Lagarde
a5003db5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
7 年前
sebastienlagarde
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
Frédéric Vauchelles
d6ce9c49
[PlanarReflection] Several fixes
7 年前
GitHub
84e022c3
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
7 年前
sebastienlagarde
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
7 年前
sebastienlagarde
6feb2d00
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
Paul Melamed
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
Tim Cooper
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
John
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
Paul Melamed
afca789b
intermediate commit, decal global properties and draw/fade distance
7 年前
Julien Ignace
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
Julien Ignace
bac44977
Post merge fixes
7 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
GitHub
6157d668
Merge pull request #896 from Unity-Technologies/decals/distance_culling
Decals/distance culling
7 年前
sebastienlagarde
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
Remy
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Julien Ignace
85039c4d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Robert Srinivasiah
11c6aed3
Add MSAA sample count support thru RenderPipelineSettings
RenderPipelineSettings owns the global MSAA sample count level. Each camera can control whether MSAA is supported or not, and if the camera's FrameSettings enable MSAA, then it will use the RenderPipelineSettings value for MSAA sample count.
7 年前
GitHub
401bf040
Merge pull request #900 from Unity-Technologies/hdrp-msaa-ui
Add MSAA sample count support thru RenderPipelineSettings
7 年前
sebastienlagarde
f8cb8a66
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Remy
44eb9802
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Alex Lian
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Julien Ignace
2c282969
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/FrameSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
sebastienlagarde
a640342d
Remove 's' in SupportsXXX
7 年前
sebastienlagarde
0bbd55c7
Don't display EnableFPTL in UI
7 年前
Sebastien Lagarde
71d0fd3a
Rename MSAAAntiAliasing to MSAA as AA is for antialiasing already
7 年前
Julien Ignace
edd34849
Merge branch 'Branch_RTRefactoring' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
7 年前
GitHub
a6688080
Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring
Refactoring of HDRP render texture usage using RTHandles
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
sebastienlagarde
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Frédéric Vauchelles
0aed191f
[UI] Removed animation on foldouts
7 年前
GitHub
249256e5
Merge pull request #923 from Unity-Technologies/fix/RemoveAnimationFoldouts
[UI] Removed animation on foldouts
7 年前
Remy
5197454b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity
7 年前
Robert Srinivasiah
44fabb65
Merge branch 'master' into hdrp-xr-initial
7 年前
John
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
sebastienlagarde
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
7 年前
sebastienlagarde
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Remy
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
75b17fab
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/Decal.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/DecalUtilities.hlsl
7 年前
Evgenii Golubev
070349c8
Merge branch 'master'
7 年前
sebastienlagarde
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
daae5ce2
(wip) Reflection system for reflection probes
7 年前
Frédéric Vauchelles
3367a6e0
Removed animated fade groups
7 年前
GitHub
f31e3dc9
Merge pull request #945 from Unity-Technologies/fix/RemoveAnimatedFadeGroups
Removed animated fade groups
7 年前
sebastienlagarde
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Remy
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Robert Srinivasiah
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Evgenii Golubev
518ddfa0
Add an option to oversample SSS in the settings
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Sebastien Lagarde
e5ba3df3
RenameSpotCookieSize to CookieSize
7 年前
GitHub
d71819ce
Merge pull request #960 from Unity-Technologies/Rename-SpotCookieSize-to-CookieSize
Rename SpotCookieSize to CookieSize
7 年前
Sebastien Lagarde
a48dc895
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-support-of-Camera-Clear-Flags
7 年前
Robert Srinivasiah
2d5b988d
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
sebastienlagarde
e347d974
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
Evgenii Golubev
2d48e00b
Merge branch 'master'
7 年前
GitHub
e315e2a7
Merge pull request #972 from EvgeniiG/improve_sss
Improve the quality of Disney SSS
7 年前
Evgenii Golubev
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Julien Ignace
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
7 年前
Robert Srinivasiah
6f2b52f2
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
Manual fixup of some LightLoop stuff (stereo + decals living together in light cull data)
7 年前
Remy
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
GitHub
ceaafcae
Rename the "Enable Ultra Quality SSS" option
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
sebastienlagarde
bcc645de
Fixed various issues with debug window
- Fixed Shadow Atlas index.
- Fixed DebugManager.instance.displayRuntimeUI breaking after domain reload
- Removed wrong "Last" entries in material debug.
- Fixed Frame Settings debug not being removed correctly on camera disable.
- Frame Settings debug layout is now the same as the regular UI.
7 年前
Aleksandr Kirillov
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
7 年前
Julien Ignace
5007f081
Fixed various issues with debug window
- Fixed Shadow Atlas index.
- Fixed DebugManager.instance.displayRuntimeUI breaking after domain reload
- Removed wrong "Last" entries in material debug.
- Fixed Frame Settings debug not being removed correctly on camera disable.
- Frame Settings debug layout is now the same as the regular UI.
7 年前
GitHub
b0109a5e
Merge pull request #1044 from Unity-Technologies/Branch_DebugWindowFixes
Various Debug Window fixes
7 年前
sebastienlagarde
35d83109
Commented out Single pass lighting to decrease shader compilation time.
7 年前
Felipe Lira
e630eecd
Merge branch 'master' into LW-Bugfix
7 年前
sebastienlagarde
0d28adac
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
7 年前
John Parsaie
40539650
Merge branch '2018.1' into projects/TheLastStand
7 年前
Julien Ignace
4c9ec94f
Commented out Single pass lighting to decrease shader compilation time.
7 年前
Felipe Lira
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
7 年前
GitHub
dce1ca66
Merge pull request #1064 from Unity-Technologies/Branch_RemoveSinglePassLighting
Commented out Single pass lighting to decrease shader compilation time.
7 年前
Julien Ignace
f00d20a6
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
GitHub
bd98e302
Merge pull request #1067 from Unity-Technologies/Branch_RemoveGBufferWithPrepass
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materi…
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
John Parsaie
73467192
Merge branch '2018.1' into projects/TheLastStand
7 年前
Frédéric Vauchelles
d1dfdb4e
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Frédéric Vauchelles
c2126e91
Added bruteforce screen space tracing
7 年前
Frédéric Vauchelles
5ab7101f
Moved algorithm selection to shader variant
7 年前
Julien Ignace
59d93b72
Fixed an issue where putting Sky Lighting Override mask to "Everything" would cause the scene view background not to be cleared anymore
- Now clearing background only test the validity of the "Visual Sky" (instead of testing also the "Lighting Sky")
- Added a warning if "Everything" is set as a Sky Lighting Override Mask
- Changed the behavior of SceneView wrt to Volume layer mask. Now it uses the mask of the "main camera" if it exists, otherwise we use Everything minus Lighting Override Mask
7 年前
GitHub
f25323ae
Merge pull request #1133 from Unity-Technologies/Branch_FixSkyOverrideIssue
Fixed an issue where putting Sky Lighting Override mask to "Everythin…
7 年前
Paul Melamed
76eb75c7
Merge branch 'master' into decals/texture_atlas
7 年前
Remy
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Raymond Graham
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
Julien Ignace
c135df26
Added first version of shader variant stripper for Lit* shaders in HDRP.
7 年前
GitHub
f52544f9
Allow edition of HDRP asset without a HDRP set in the graphic settings.
7 年前
GitHub
7f1e837b
Merge pull request #1148 from Unity-Technologies/RemyUnity-patch-1
Allow edition of HDRP asset without a HDRP set in the graphic settings.
7 年前
Stephane Laroche
5ad6a9db
Merge branch 'master' into StackLitWork
7 年前
Paul Melamed
16665d1f
Use HDRenderPipelineAsset for decal atlas dimensions, print an error when decal atlas allocation fails.
7 年前
Frédéric Vauchelles
a39254c9
Merge branch 'master' into feature/RefractionModes
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Paul Melamed
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
7 年前
Felipe Lira
65fc1c54
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
7 年前
GitHub
bc2cc021
Merge pull request #1178 from Unity-Technologies/decals/texture_atlas
Decals/texture atlas
7 年前
sebastienlagarde
2e40eff7
Merge remote-tracking branch 'refs/remotes/origin/master' into stacklit
7 年前
Evgenii Golubev
b4708ef6
Merge upstream/master
7 年前
Frédéric Vauchelles
4bd00e90
Merge master
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Raymond Graham
31f3f3cb
Expose the number of light indices per clustered tile in the HDRenderpipelineAsset. This will allow for project specific changes.
7 年前
GitHub
52d2cf4e
Merge pull request #1212 from Unity-Technologies/expose-numlights-per-cluster
Expose the number of light indices per clustered tile
7 年前
Raymond Graham
e53b33fe
Revert "Expose the number of light indices per clustered tile in the HDRenderpipelineAsset. This will allow for project specific changes."
This reverts commit 37c9fd844ae2cb461cb693ffc37dddcb71b2be3c.
7 年前
sebastienlagarde
dc498b1e
Merge remote-tracking branch 'refs/remotes/origin/master' into Sharing-envlight-code
7 年前
GitHub
7804b03a
Revert "Expose the number of light indices per clustered tile"
7 年前
GitHub
7a36e4e2
Merge pull request #1215 from Unity-Technologies/revert-1212-expose-numlights-per-cluster
Revert "Expose the number of light indices per clustered tile"
7 年前
Remy
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
7 年前
GitHub
d7990f7a
Merge pull request #1179 from Unity-Technologies/Branch_HDRPVariantStripping
Added first version of shader variant stripper for Lit* shaders in HDRP.
7 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
e03580d8
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Frédéric Vauchelles
8676f2e5
Merge master
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
Frédéric Vauchelles
68db6753
Removed GlobalLightLoopSettings.maxPlanarReflectionProbe property
7 年前
GitHub
f1636a3c
Merge pull request #1273 from Unity-Technologies/feature/MaxProbeLimit
Removed GlobalLightLoopSettings.maxPlanarReflectionProbe property
7 年前
sebastienlagarde
0ddaf44e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
7 年前
Stephane Laroche
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
Frédéric Vauchelles
4bfaa623
merge master
7 年前
sebastienlagarde
f9636448
Add volumetric bool
7 年前
GitHub
17d5bb27
Merge pull request #1327 from Unity-Technologies/Add-FrameSettings-to-hdCamera
Add framesettings to hdcamera
7 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
7 年前
Sebastien Lagarde
f4660e9b
Add framesettings support to volumetric
7 年前
sebastienlagarde
87b6bc50
Move atmospheric scattering field above volumetric
7 年前
GitHub
1d661e75
Merge pull request #1334 from Unity-Technologies/Add-framesettings-support
Add enableVolumetric in the FrameSettings
7 年前
Jean-François F Fortin
a2ee3145
Merge branch 'master' into stacklit
7 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
sebastienlagarde
bba0731d
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
7 年前
GitHub
012f4b1f
Merge pull request #1417 from Unity-Technologies/Change-name-of-supportOnlyForward
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
7 年前
Sebastien Lagarde
49897966
HDRP: Reorganize folder and files
7 年前
GitHub
aad9d81b
Merge pull request #1450 from Unity-Technologies/HDRP-Reorganize-folder-and-files
HDRP: Reorganize folder and files
7 年前
Paul Melamed
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
7 年前
Stephane Laroche
d85052d9
Merge branch 'master' into StackLit2
7 年前
sebastienlagarde
d7ff7340
Add debug display runtime shader variant stripping
7 年前
sebastienlagarde
23e50c80
Rename SahderPreprocessorMaterial to BaseShaderPreprocessor
7 年前
Chris Tchou
e8ce5056
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
7 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
GitHub
1ea2f496
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
7 年前
Remy
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
Stephane Laroche
7933fd8d
Merge branch 'master' into StackLit2
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
sebastienlagarde
6c870111
Merge branch 'master' into FalseColorMode
7 年前
Julien Ignace
0098fb38
Updated changelog + missing file
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
GitHub
cec37252
Merge pull request #1513 from Unity-Technologies/Branch_FixReflectionVolumeUpdate
Fix for Light Loop UI and Volume interpolation for reflection
7 年前
Chris Tchou
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
Stephane Laroche
a49a696e
Merge branch 'master' into StackLit2
7 年前
Remy
9db2a137
Merge branch 'master' into HDRP-Tests
7 年前
sebastienlagarde
ec4f2ed5
Add option to remove shader variant + update changelog to correct format
Add option to remove shader variant of LOD Cross fade (allow faster build)
Fix priority of Render Pipeline Debug Windows (Ux Team) Request
Update format of the Changelog
7 年前
GitHub
159ea553
Merge pull request #1540 from Unity-Technologies/Add-option-to-remove-shader-variant-update-changelog-to-correct-format
Add option to remove shader variant + update changelog to correct format
7 年前
Remy
57fedd6c
Merge branch 'master' into HDRP-Tests
7 年前
GitHub
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
7 年前
GitHub
d4992b3f
Merge branch 'master' into lw/camera-additional-data
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Paul Melamed
c6fc1808
Added per channel blend selection mode for decals to render pipe asset
7 年前
Stephane Laroche
f46075fb
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
Antoine Lelievre
c08c9929
Expose shadow budget parameter in HDRP asset
7 年前
GitHub
dc7e7036
Merge pull request #1586 from Unity-Technologies/ExposeShadowBudgetParameters
Expose shadow budget parameters
7 年前
sebastienlagarde
fa92c52f
Merge branch 'master' into Improve-camera-relative-rendering
7 年前
Stephane Laroche
a5e0fbca
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
GitHub
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
7 年前
Sebastien Lagarde
f5bd48cb
HDRP: Hide MSAA settings on HDRP Asset as it is not implemented
7 年前
Sebastien Lagarde
34ae5a69
Merge branch 'master' into ios-texture-format
7 年前
Sebastien Lagarde
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
7 年前
Antoine Lelievre
a452a9db
Merge branch 'master' into LightUnits
7 年前
Evgenii Golubev
6c2d5efb
Rename SSS quality levels
7 年前
Evgenii Golubev
f7ce098c
Add an option to the HDRP asset to increase the resolution of volumetric lighting
7 年前
GitHub
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
7 年前
Evgenii Golubev
51f228b4
Add an attribute to not break serizliation
7 年前
GitHub
8dddca48
Merge pull request #1606 from EvgeniiG/kernel_quality_levels
Add an option to the HDRP asset to increase the resolution of volumetric lighting
7 年前
sebastienlagarde
7934a87a
Merge branch 'master' into LightUnits
7 年前
Paul Melamed
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
7 年前
Remy
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
7 年前
Paul Melamed
40459f78
Change mask map channel selection to use check boxes
6 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
7 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
7 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
7 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
7 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
GitHub
b4a3f127
Merge pull request #1674 from Unity-Technologies/decals/v2/per_channel_mask_new_ui
Decals/v2/per channel mask new ui
6 年前
sebastienlagarde
49764db8
Update UI for decal material based on artists feedback + add upgrader script
6 年前
GitHub
13ae3ef8
Merge pull request #1712 from Unity-Technologies/Update-DecalUI
Update UI for decal material based on artists feedback + add upgrader
6 年前
GitHub
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Nerites
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Remi Slysz
c072c88e
fix wrong namespace editor classes
6 年前
Nerites
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
Julien Ignace
13c603cb
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Nerites
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
GitHub
4312d844
Merge pull request #1730 from Unity-Technologies/hdrp/fix-namespaces
Hdrp/fix namespaces
6 年前
GitHub
07c127ac
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
b3ff809b
Merge branch 'master' into tests/hdrp/distortion
6 年前
sebastienlagarde
f222f97c
Rename DBuffer -> Decals + Add decal multicompile option
- Rename DBuffer -> Decals
- Add multicompile for no decals at all (for support decals)
- TODO: Shader stripping
6 年前
GitHub
b57e1824
Merge pull request #1747 from Unity-Technologies/Decal-compilation
Decal shader stripping and upgrade script + fix
6 年前
GitHub
449e311f
Merge pull request #1749 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
GitHub
80d748f5
Add light linking support ( #1758 )
* HDRP: Add support of light layering for forward (first draft)
TODO:
- Test instancing
- Check perf
- add an option to disable light layer support + in frameSettings
- add deferred rendering support (mean add an optional extra GBuffer)
* Add LightLinking support (version 1 - compile)
This PR add support of LightLayers feature.
To use it, setup mask renderingLayers on renderers and LightLayers on a lights. If a logical and of both give a non 0 value, the light is apply, otherwise it isn't.
This mean that by default LightLayers is 1 and RenderingLayers is 1. Then user can say LightLayers is only 2 and it will only affect renderingLayers with 2 or 3 mask value.
LightLayers require an extra GBuffer in deferred, mean it have extra bandwidth and memory cost.
LightLayers once enabled in HDRPAsset with SupportLightLayers can be control by FrameSettings. Mean a camera can enable extra RT only for an in game cinematic.
This PR refactor...
6 年前
Remy
b425d23e
Merge branch 'master' into tests/hdrp/distortion
6 年前
GitHub
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
GitHub
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
6 年前
Julien Ignace
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Nerites
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
GitHub
7b744594
Merge branch 'master' into xrsettings
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
Sebastien Lagarde
4dd21879
Hide MSAA framesettings
6 年前
GitHub
eb899d7b
Merge pull request #1840 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
sebastienlagarde
b953de4f
Merge branch 'master' into volume-texture-tool
6 年前
sebastienlagarde
b5fa681b
Merge branch 'master' into HDLightExplorerExtension
6 年前
Frédéric Vauchelles
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
RSlysz
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
sebastienlagarde
01ba67bc
Add shadowMap16Bit support
6 年前
GitHub
5c6caff1
Merge pull request #1846 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
egomeh
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
Remy
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前