Remy
|
f486e00a
|
Add SSS test scene
|
7 年前 |
Sebastien Lagarde
|
a28733e8
|
HDRenderPipeline: Update all materials
|
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-
|
7 年前 |
|
sebastienlagarde
|
046a77ef
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
7 年前 |
|
sebastienlagarde
|
5f14b489
|
Update all materials with Last PR
|
7 年前 |
GitHub
|
ce027b15
|
Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass
Update all material for PR 946
|
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 年前 |
|
sebastienlagarde
|
2c61701c
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
7 年前 |
Peter Andreasen
|
04b933d9
|
merged with master
|
7 年前 |
Paul Melamed
|
429be124
|
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
|
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 年前 |
|
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 年前 |
|
Remy
|
50737730
|
Converted all tga textures in graphic tests to png : saves a lot of disk space !
|
7 年前 |
|
GitHub
|
bf886cd0
|
Merge pull request #998 from Unity-Technologies/HDRP_GraphicTests
Update, Fixes, and less space used !
|
7 年前 |
|
Evgenii Golubev
|
504b9374
|
Merge remote-tracking branch 'upstream/HDRP_GraphicTests' into 2018.1
|
7 年前 |
|
Robert Srinivasiah
|
667518b2
|
Merge remote-tracking branch 'origin/master' into lwrp-xr-shader-fixes
|
7 年前 |
|
Evgenii Golubev
|
0a2033df
|
Merge upstream/master
|
7 年前 |
|
Paul Melamed
|
6f570901
|
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
7 年前 |
John Parsaie
|
8cc0d941
|
Merge SRP 2018.1
|
7 年前 |
|
GitHub
|
47d42b36
|
Merge pull request #1 from Unity-Technologies/master
Merge from main
|
7 年前 |
|
Frédéric Vauchelles
|
fd3d298d
|
Merge branch 'master' into feature/ReflectionProbeBaking
|
7 年前 |
|
Julien Ignace
|
88c2ad28
|
Pushed missing updated materials.
|
7 年前 |
|
GitHub
|
566e00cc
|
Merge pull request #1073 from Unity-Technologies/Branch_UpdateMaterials
Pushed missing updated materials.
|
7 年前 |
Felipe Lira
|
47a2960a
|
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
|
7 年前 |
|
sebastienlagarde
|
aa772a18
|
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
|
7 年前 |
|
Evgenii Golubev
|
720c8a19
|
Merge branch 'master'
|
7 年前 |
|
Evgenii Golubev
|
dd8b51a8
|
Merge branch 'master'
|
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 年前 |
|
Remy
|
da27105b
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
|
7 年前 |
