Julien Ignace
|
a58a777f
|
Added first version of vertex wind and a corresponding test scene.
|
8 年前 |
sebastienlagarde
|
314924b2
|
HDRenderPipeline: Fix issue with SSS + add test scene
|
7 年前 |
GitHub
|
5c930f40
|
Merge pull request #241 from Unity-Technologies/Fix-issue-with-SSS
HDRenderPipeline: Fix issue with SSS + add test scene
|
7 年前 |
Sebastien Lagarde
|
b27de01a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Tetrahedron-encoding-for-normal
|
7 年前 |
Sebastien Lagarde
|
58f36f39
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
|
7 年前 |
Evgenii Golubev
|
6c224d47
|
Merge branch 'master'
|
7 年前 |
Tim Cooper
|
582adf08
|
Merge remote-tracking branch 'origin/master' into test-framework
|
7 年前 |
Filip Iliescu
|
3a226917
|
merged master
|
7 年前 |
Arnaud Carre
|
f27d26c4
|
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
|
7 年前 |
Thomas
|
076b0d65
|
Cleaned up unused usings
|
7 年前 |
GitHub
|
89072748
|
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
|
7 年前 |
sebastienlagarde
|
71713559
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
|
7 年前 |
GitHub
|
f49bc2d1
|
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
Peter Andreasen
|
2ef7d649
|
merged with master
|
7 年前 |
Sebastien Lagarde
|
f62941c5
|
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
|
7 年前 |
Evgenii Golubev
|
8d403196
|
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
Evgenii Golubev
|
ea93b8f4
|
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
Felipe Lira
|
5f970d63
|
Merge branch 'Unity-2017.3' into LightweightPipeline
|
7 年前 |
Sebastien Lagarde
|
a4fddf9c
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
|
7 年前 |
Antti Tapaninen
|
84d9c9ea
|
fix texture/sampler naming scheme for WIND_SETTINGS_TexNoise/WIND_SETTINGS_TexGust, fixes pixelized trees issue with Fontainebleau on metal
|
6 年前 |
GitHub
|
e7d77484
|
Merge pull request #1211 from Unity-Technologies/Fix-Wind-Settings-sampler
fix texture/sampler naming scheme for WIND_SETTINGS_Tex*
|
6 年前 |
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...
|
6 年前 |
Frédéric Vauchelles
|
09596c67
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
|
6 年前 |
Stephane Laroche
|
61ee5830
|
Merge branch 'master' into stacklit
|
6 年前 |
Evgenii Golubev
|
9b95d6ea
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
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 年前 |