Remy
|
2b1afa18
|
Add bake lighting test
|
7 年前 |
Julien Ignace
|
05efe29c
|
Updated Heightmap parametrization and converted all HDRP materials.
|
7 年前 |
sebastienlagarde
|
2fd0a788
|
HDRenderPipeline: Update all materials
|
7 年前 |
GitHub
|
fbce26f6
|
Merge pull request #770 from Unity-Technologies/update-all-materials
HDRenderPipeline: Update all materials
|
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 年前 |
GitHub
|
544aba56
|
Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization
Updated Heightmap parametrization and converted all HDRP materials.
|
7 年前 |
Thomas
|
4b33a1b6
|
Merge branch 'master' into lw-gc-optim
|
7 年前 |
Julien Ignace
|
6ba9292e
|
Revered matrerial update after heightmap parametrization change.
|
7 年前 |
Julien Ignace
|
cdd44d73
|
Re-updated materials with new heightmap parametrization
|
7 年前 |
sebastienlagarde
|
7f5f1c1a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
|
7 年前 |
GitHub
|
37a266ac
|
Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate
Branch fix height map update
|
7 年前 |
sebastienlagarde
|
01b7d081
|
HDRenderPipeline: Update all materils keyword in scene and project
|
7 年前 |
Raymond Graham
|
d1c64b56
|
Merge branch 'master' into gpuInstancingSupport
|
7 年前 |
Evgenii Golubev
|
77f9f167
|
Merge branch 'master'
|
7 年前 |
Arnaud Carre
|
4bef6509
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
Remy
|
3b815534
|
Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs
# Te...
|
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 年前 |
Frédéric Vauchelles
|
86df6636
|
Merge master
|
7 年前 |
Sebastien Lagarde
|
5f384459
|
HDRenderPipeline: Update all materials
|
7 年前 |
Remy
|
afb74a48
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
|
7 年前 |
Sebastien Lagarde
|
5705de92
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
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 年前 |
Felipe Lira
|
c51ce48c
|
Merged master
|
7 年前 |
John
|
dea94b9d
|
Merge branch 'master' into LW-ScreenSpaceShadows
|
7 年前 |
John
|
cf25c602
|
Merge master
|
7 年前 |
Peter Andreasen
|
8b8ef607
|
Merge remote-tracking branch 'origin/master' into sample_game
|
7 年前 |
sebastienlagarde
|
c3198024
|
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
|
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 年前 |
John Parsaie
|
8cc0d941
|
Merge SRP 2018.1
|
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 年前 |