sebastienlagarde
|
8a6b2cf1
|
HDRenderPipeline: Update unlit shader
|
8 年前 |
sebastienlagarde
|
ee5ea1fd
|
HDrenderPipeline: Unlit update - missing file
|
8 年前 |
Evgenii Golubev
|
d42f0b22
|
Upgrade all materials in the HD test scene
|
8 年前 |
GitHub
|
24918600
|
Merge pull request #162 from EvgeniiG/master
Improve the SSS profile UI
|
8 年前 |
uygar
|
77102a68
|
Merge branch 'master' into shadows
|
8 年前 |
Arnaud Carre
|
3c290788
|
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
|
8 年前 |
runes
|
cb7bce50
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
Felipe Lira
|
557acdfd
|
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
|
8 年前 |
vlad-andreev
|
3a5b105e
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
Sebastien Lagarde
|
1ed5cfbe
|
HDRenderPipeline: Update all material in test scene
|
7 年前 |
GitHub
|
2b47951c
|
Merge pull request #314 from Unity-Technologies/Move-matId-Specular-in-Standard
Update materialId management in Lit (Optimization + one slot saved)
|
7 年前 |
Evgenii Golubev
|
5570c647
|
Merge branch 'master'
|
7 年前 |
Filip Iliescu
|
cd024be6
|
Merge branch 'master' into OnTileDeferred
|
7 年前 |
Arnaud Carre
|
b7e36e2f
|
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl.meta
# Assets/TestScenes/HDTest/HDRenderLoopTest.meta
# Assets/TestScenes/HDTest/NewBatcherTest/skin.meta
|
7 年前 |
Frédéric Vauchelles
|
9c88dfd3
|
Updated keywords of materials
|
7 年前 |
GitHub
|
4d41fcaa
|
Merge pull request #496 from Unity-Technologies/feature/transparentPrepass
Feature/transparent prepass
|
7 年前 |
sebastienlagarde
|
522098e8
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
|
7 年前 |
Julien Ignace
|
1e8876bf
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForwardUnlit.hlsl
|
7 年前 |
sebastienlagarde
|
60296408
|
HDRenderPipeline: Update all material Keywords
|
7 年前 |
Evgenii Golubev
|
733171ce
|
Merge branch 'Unity-2017.3'
|
7 年前 |
GitHub
|
bd071d2c
|
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
Robert Srinivasiah
|
7998bfa7
|
Merge remote-tracking branch 'origin/master' into xr-hdrp
|
7 年前 |
Felipe Lira
|
6ddf3f73
|
Merge branch 'Unity-2017.3' into LightweightPipeline
|
7 年前 |
Sebastien Lagarde
|
a4fddf9c
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
|
7 年前 |
Sebastien Lagarde
|
69c9baac
|
HDRenderPipeline: Fix test scene
|
7 年前 |
GitHub
|
ae2a6ad0
|
Merge pull request #551 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
sebastienlagarde
|
a1929730
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Character.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/Textures.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/0xxx.meta
|
7 年前 |
Julien Ignace
|
11c1d9a8
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
|
7 年前 |
Julien Ignace
|
220e0aff
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
|
7 年前 |
Peter Andreasen
|
f052451a
|
merged from master
|
7 年前 |
Felipe Lira
|
e4ffdd2d
|
Merge branch 'Unity-2017.3' into LightweightPipeline
|
7 年前 |
Paul Melamed
|
d31d3ab4
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
|
7 年前 |
sebastienlagarde
|
2c9bfb4e
|
HDRenderPipeline: fix all material in current project
|
7 年前 |
GitHub
|
fc5778fa
|
Merge pull request #655 from Unity-Technologies/Fix-all-material-in-project
HDRenderPipeline: fix all material in current project
|
7 年前 |
sebastienlagarde
|
04b2dec6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
|
7 年前 |
Julien Ignace
|
1ce75e59
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
|
7 年前 |
Evgenii Golubev
|
7106bb0a
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
|
7 年前 |
Raymond Graham
|
1118c956
|
Merge branch 'master' into motionVectorSupport
|
7 年前 |
Felipe Lira
|
ddeb54b6
|
Merge branch 'master' into LightweightPipeline
|
7 年前 |
Peter Andreasen
|
87c36d52
|
merged with master
|
7 年前 |
sebastienlagarde
|
01b7d081
|
HDRenderPipeline: Update all materils keyword in scene and project
|
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 年前 |
Evgenii Golubev
|
77f9f167
|
Merge branch 'master'
|
7 年前 |
Peter Andreasen
|
3ccf74cc
|
merged from 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 年前 |
John
|
cf25c602
|
Merge master
|
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 年前 |