sebastienlagarde
d7a39bc6
HDRenderPipeline: Add tessellation test
8 年前
sebastienlagarde
d3d2750f
HDRenderPipeline: Small fix that cause POM to be tiled
8 年前
GitHub
32b2a51e
Merge pull request #107 from Unity-Technologies/Add-POM-and-Tesselation-Test-Level
fix pom issue
8 年前
Evgenii Golubev
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
21be7561
Merge branch 'master' into SSSSS
8 年前
Evgenii Golubev
37c3566f
Update material files with the definition of '_StenclRef'
{ material.SetInt("_StencilRef", x); } relies on serialization. Therefore, if the property is not declared in the *.mat file, attempting to set this property in C# has no effect.
8 年前
Sebastien Lagarde
ab900a3a
HDRenderPipeline: Allow different keyword by layers
- Add keywork normal, specularocclusion, detailmap, mask to layered
shader
- Remove smoothness in alpha option
- Remove code related to detail heightmap
- Remove the restriction on GUI of layered lit layer 1, 2, 3 matching
layer 0
8 年前
GitHub
554a5c02
Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI
Layered lit clean and ui update
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
runes
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
GitHub
29e588a8
Merge pull request #156 from EvgeniiG/master
Implement painted-thickness-based transmittance for SSS
8 年前
Julien Ignace
7b4ab969
Merge branch 'master' into Branch_SceneSettings
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
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 年前
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 年前
sebastienlagarde
7ae52cc4
HDRednerPipeline: Update tessellation test
8 年前
runes
e8f45e5f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
764e5269
Merge branch 'master' into metal-ios
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 年前
Antti Tapaninen
0574ef6b
Merge branch 'master' into metal
8 年前
Arnaud Carre
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
8 年前
vlad-andreev
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
Evgenii Golubev
273792fc
Update material IDs of the HD test scene
8 年前
GitHub
13ca3e1b
Merge pull request #252 from EvgeniiG/material_id_update
Update the HD test scene
8 年前
Evgenii Golubev
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
3a226917
merged master
8 年前
Arnaud Carre
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
Sebastien Lagarde
1ed5cfbe
HDRenderPipeline: Update all material in test scene
8 年前
GitHub
2b47951c
Merge pull request #314 from Unity-Technologies/Move-matId-Specular-in-Standard
Update materialId management in Lit (Optimization + one slot saved)
8 年前
Evgenii Golubev
5570c647
Merge branch 'master'
8 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
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
8 年前
Evgenii Golubev
2a9aa847
Update the HD test scene to with a test for displacement mapping with depth offset
7 年前
GitHub
d5b454e5
Merge pull request #429 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
fc3f8e16
Further improve the "Displacement Mapping With Depth Offset" setup
7 年前
sebastienlagarde
54f30000
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-support-of-vertex-displacement
7 年前
GitHub
c540af87
Merge pull request #434 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
334ddc48
Fix POM with object scale
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Evgenii Golubev
84d9b5a3
Fix POM using the primitive size
7 年前
Evgenii Golubev
ce71162a
Update the HD test scene
7 年前
Evgenii Golubev
6610eebb
Precompute '_InvPrimScale' and '_InvTilingScale'
7 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
sebastienlagarde
5ee5c7a7
Update test scene with recent change
7 年前
sebastienlagarde
4c55d7e9
Merge pixel and vertex locak object scale, they are identical and the feature are mutually exclusive
7 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
GitHub
2002ee68
Merge pull request #466 from Unity-Technologies/Add-Per-Pixel-scale
Revamp of Parallax occlusoin mapping + depth offset
7 年前
Evgenii Golubev
86fe9ae4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
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
9c88dfd3
Updated keywords of materials
7 年前
Frédéric Vauchelles
0189956f
Updated material keywords
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 年前
Peter Andreasen
f052451a
merged from master
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 年前
sebastienlagarde
2b24ec8c
Update all material
7 年前
GitHub
7ab47949
Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data
Add versionning on additonal data
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Paul Melamed
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
Evgenii Golubev
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Robert Srinivasiah
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
Remy
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
Felipe Lira
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
Julien Ignace
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
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 年前
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 年前
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 年前
Julien Ignace
ffbd199e
- Fixed objects motion vectors (they were upside down)
- Fixed some warnings
7 年前
Julien Ignace
ed3443be
Revert "- Fixed objects motion vectors (they were upside down)"
This reverts commit c85edb82a9a539fba719f345433b9e2a11134046.
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 年前