Sebastien Lagarde
|
a8ab890d
|
Rename SubsurfaceScattering Settings/Editor to DiffusionProfile + various file renaming/moving
|
7 年前 |
|
Sebastien Lagarde
|
926a5691
|
Update UI for diffusion profile + convert fresnel0 to IOR in UI
|
7 年前 |
GitHub
|
76304378
|
Merge pull request #758 from Unity-Technologies/Rename-Subsurface-Profile-=---Diffusion--profile
Update Subsurface profile
|
7 年前 |
|
Sebastien Lagarde
|
e059a00a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
|
7 年前 |
sebastienlagarde
|
fa1e2b55
|
Various renaming
|
7 年前 |
Evgenii Golubev
|
7e74580b
|
Merge branch 'master'
|
7 年前 |
|
Evgenii Golubev
|
8a70dc3b
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
|
GitHub
|
19ff5eb4
|
Merge pull request #764 from Unity-Technologies/Refactor-GBuffer-with-material-feature
Rearrange GBuffer and material classification to switch to material features
|
7 年前 |
Frédéric Vauchelles
|
790cee43
|
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
|
7 年前 |
|
Sebastien Lagarde
|
f97342c5
|
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
|
7 年前 |
lyndon homewood
|
ef4b0aa9
|
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
|
7 年前 |
Julien Ignace
|
43f6d6eb
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
|
7 年前 |
Raymond Graham
|
d1c64b56
|
Merge branch 'master' into gpuInstancingSupport
|
7 年前 |
|
Julien Ignace
|
4919b7ad
|
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
|
7 年前 |
Kay Chang
|
42c358c5
|
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
|
6 年前 |
Peter Andreasen
|
3ccf74cc
|
merged from master
|
7 年前 |
|
Evgenii Golubev
|
7d2031ec
|
Merge branch 'master'
|
7 年前 |
Paul Melamed
|
6deb71dc
|
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
|
7 年前 |
|
Sebastien Lagarde
|
541ff0be
|
Split transmission and SSS
- Move IOR field to both transmission and specular
- Split transmission and SSS
- Still need to add the UI in the Lit/layeredLit interface
|
7 年前 |
|
GitHub
|
a0390c6e
|
Merge pull request #840 from Unity-Technologies/Update-SSS-and-transmission
Update sss and transmission
|
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 年前 |
John
|
cf25c602
|
Merge master
|
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 年前 |
|
sebastienlagarde
|
c3198024
|
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
|
7 年前 |
|
sebastienlagarde
|
a762caad
|
Remove transmission mode, now there is only two (and no none mode)
|
7 年前 |
|
sebastienlagarde
|
98adeabc
|
Fix UI
|
7 年前 |
|
GitHub
|
c0bd137f
|
Merge pull request #882 from Unity-Technologies/Updating-UI-for-material-feature-ID
Updating UI for clear coat and transmission
|
7 年前 |
|
Paul Melamed
|
3441b497
|
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
|
7 年前 |
|
Remy
|
2136ed15
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
|
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 年前 |
|
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 年前 |
|
sebastienlagarde
|
83b753ad
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
|
Frédéric Vauchelles
|
672c909b
|
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
|
7 年前 |
|
Sebastien Lagarde
|
eca15a2d
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
|
6 年前 |
|
sebastienlagarde
|
046a77ef
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
6 年前 |
|
Peter Andreasen
|
04b933d9
|
merged with master
|
6 年前 |
|
sebastienlagarde
|
003ed8ce
|
Add pipeline subshader tags for HD
|
6 年前 |
|
sebastienlagarde
|
9630d754
|
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
|
6 年前 |
Matt Dean
|
938ae294
|
Add pipeline subshader tags for HD
|
6 年前 |
|
sebastienlagarde
|
2e64322b
|
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
|
6 年前 |
|
GitHub
|
41034aa7
|
Merge pull request #1016 from Unity-Technologies/pr/1014
Pr 1014
|
6 年前 |
Robert Srinivasiah
|
7733d48a
|
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
|
6 年前 |
|
Frédéric Vauchelles
|
fd3d298d
|
Merge branch 'master' into feature/ReflectionProbeBaking
|
6 年前 |
|
Paul Melamed
|
07ab7b09
|
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
6 年前 |
John Parsaie
|
0fe793d7
|
Merge 2018.1
|
6 年前 |
|
Evgenii Golubev
|
720c8a19
|
Merge branch 'master'
|
6 年前 |
|
Evgenii Golubev
|
dd8b51a8
|
Merge branch 'master'
|
6 年前 |
|
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
|
6 年前 |
|
Kay Chang
|
53b01e3a
|
WIP adding Switch support.
|
6 年前 |
|
Kay Chang
|
f5303717
|
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
|
6 年前 |
|
Kay Chang
|
c279dc9c
|
Re-added modified files for Switch without BOM.
|
6 年前 |
|
GitHub
|
f8e74a10
|
Merge pull request #1277 from Unity-Technologies/switch_support
Switch support
|
6 年前 |
Stephane Laroche
|
ecc9d71b
|
Merge remote-tracking branch 'mainrepo/master' into stacklit
|
6 年前 |
|
sebastienlagarde
|
2c1c78cf
|
Merge branch 'master' into 2018.1-experimental
|
6 年前 |
Yao Xiaoling
|
cb671fbb
|
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
|
6 年前 |
|
Raymond Graham
|
4e9dca70
|
Merge branch 'master' into volumetric-lighting-updates
|
6 年前 |
|
Evgenii Golubev
|
91dc696c
|
Merge upstream/master
|
6 年前 |
|
Frédéric Vauchelles
|
4bfaa623
|
merge master
|
6 年前 |
Felipe Lira
|
25e45b36
|
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
6 年前 |
|
Felipe Lira
|
63a6fe03
|
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
6 年前 |
|
Tim Cooper
|
fafb59af
|
Run code formatter.
|
6 年前 |
|
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
|
6 年前 |
|
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
