sebastienlagarde
|
66834685
|
HDRenderPipeline: Add Layered Displacement + fix issue with sky + some clean
- HDRI reflection is flipped, but HDRI and procedural sky are flipped
each other. For now fix the HDRI sky and we will fix procedural sky
after
|
8 年前 |
Sebastien Lagarde
|
3f8a200e
|
HDRenderPipeline: Fix planar and triplanar + triplanar POM
|
8 年前 |
GitHub
|
2b3fa928
|
Merge pull request #168 from Unity-Technologies/Triplanar-POM
Fix planar/triplanar with normal map + POM Triplanar
|
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 年前 |
Evgenii Golubev
|
9470df9a
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
uygar
|
cefe8b15
|
Merge branch 'master' into shadows
|
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 年前 |
Frédéric Vauchelles
|
90b2eb1e
|
Added refraction, roughness refraction and transparency absorption
|
7 年前 |
|
GitHub
|
58da4099
|
Merge pull request #442 from Unity-Technologies/feature/transparency
Feature/transparency
|
7 年前 |
Thomas
|
ed806be2
|
Merge branch 'Unity-2017.3' into refactor-episode-2
|
7 年前 |
|
GitHub
|
ae958d8a
|
Merge pull request #445 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
|
sebastienlagarde
|
5e3b6e01
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
|
7 年前 |
|
Evgenii Golubev
|
e86a361e
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
|
7 年前 |
Peter Andreasen
|
2ef7d649
|
merged with master
|
7 年前 |
|
Felipe Lira
|
5f970d63
|
Merge branch 'Unity-2017.3' into LightweightPipeline
|
7 年前 |
|
Frédéric Vauchelles
|
acca5c71
|
Use a multiply blend mode instead of stencil to control distortion
|
7 年前 |
|
GitHub
|
95f1f3a0
|
Merge pull request #474 from Unity-Technologies/feature/distortion
Feature/distortion
|
7 年前 |
|
GitHub
|
17bdc932
|
Merge pull request #476 from Unity-Technologies/Unity-2017.3
Merge 2017.3
|
7 年前 |
|
Thomas
|
83fb54f8
|
Merge branch 'Unity-2017.3' into msvo
|
7 年前 |
|
Felipe Lira
|
cdc50657
|
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
|
7 年前 |
|
Peter Andreasen
|
e2332032
|
Merge remote-tracking branch 'origin/master' into sample_game
|
7 年前 |
|
Frédéric Vauchelles
|
051c4673
|
Added refraction mask
|
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 年前 |
|
Frédéric Vauchelles
|
1303cd7c
|
Keep only 2 refraction models: Plane and Sphere
|
7 年前 |
|
GitHub
|
7b132868
|
Merge pull request #511 from Unity-Technologies/feature/refractionthickness
Feature/refractionthickness
|
7 年前 |
|
Julien Ignace
|
36a22fff
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FixDebugWindow
|
7 年前 |
Remy
|
988d63bc
|
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
|
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 年前 |
|
Frédéric Vauchelles
|
977bf6d0
|
Refactored refraction mask as opacity mask
|
7 年前 |
|
Frédéric Vauchelles
|
394392cf
|
Revert "Refactored refraction mask as opacity mask"
This reverts commit 78deaec5a6fd2db8b2467afc80ca9b65a48093e2.
|
7 年前 |
|
Frédéric Vauchelles
|
30bcae4e
|
Refactored refraction mask as opacity mask
|
7 年前 |
|
GitHub
|
1d75f4f8
|
Merge pull request #518 from Unity-Technologies/feature/refractionMask
Refactored refraction mask as opacity mask
|
7 年前 |
|
Remy
|
972c7922
|
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
|
7 年前 |
|
Sebastien Lagarde
|
a4fddf9c
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
|
7 年前 |
|
GitHub
|
06f28ec2
|
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
|
Peter Andreasen
|
f052451a
|
merged from master
|
7 年前 |
|
Felipe Lira
|
e4ffdd2d
|
Merge branch 'Unity-2017.3' into LightweightPipeline
|
7 年前 |
|
Julien Ignace
|
78d80237
|
Fixed HDLoop test scene "Four Shapes" heightmap (was sRGB and wrong format)
|
7 年前 |
|
Sebastien Lagarde
|
cd92c7dc
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
|
7 年前 |
|
GitHub
|
b83e5de0
|
Merge branch 'master' into feature/mip-debug
|
7 年前 |
lyndon homewood
|
064d57c1
|
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
|
7 年前 |
|
Evgenii Golubev
|
c86b3214
|
Merge branch 'master'
|
7 年前 |
|
Frédéric Vauchelles
|
77da2d54
|
[PlanarReflection] Added test scene
|
7 年前 |
|
Evgenii Golubev
|
8a70dc3b
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
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 年前 |
|
Peter Andreasen
|
3ccf74cc
|
merged from master
|
7 年前 |
John
|
cf25c602
|
Merge master
|
7 年前 |
|
GitHub
|
84e022c3
|
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
|
7 年前 |
|
sebastienlagarde
|
2bae089c
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
|
7 年前 |
|
Evgenii Golubev
|
7e4a3052
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
|
GitHub
|
fe0284c8
|
Merge branch 'master' into HDRP_GraphicTests
|
7 年前 |
|
sebastienlagarde
|
6feb2d00
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
|
7 年前 |
Paul Melamed
|
19876ed2
|
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
7 年前 |
|
sebastienlagarde
|
c3198024
|
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
|
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 年前 |
|
Sebastien Lagarde
|
eca15a2d
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
|
7 年前 |
|
Peter Andreasen
|
04b933d9
|
merged with master
|
7 年前 |
