sebastienlagarde
613a80ee
HDRenderPipeline; Add Pom test level
8 年前
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 年前
sebastienlagarde
ddc209b1
HDRenderPipeline: Add two sided test scene + clean a bit test directory
8 年前
GitHub
f2eb9af9
Merge pull request #113 from Unity-Technologies/Add-two-sided-test-scene
HDRenderPipeline: Add two sided test scene + clean a bit test directory
8 年前
Tim Cooper
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
Tim Cooper
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
d947af3f
HDRenderPipeline: Add reflection probe test
8 年前
Paul Demeulenaere
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
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 年前
Paul Demeulenaere
795ccf44
- Move HDRenderLoop to HDRenderPipeline
- Work in progress : only fix compilation, code generation should be rework
8 年前
GitHub
1d3fd842
Merge pull request #116 from Unity-Technologies/Add-layered-displacement
HDRenderPipeline: Add Layered Displacement + fix issue with sky + some clean
8 年前
Evgenii Golubev
269e987f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Sebastien Lagarde
a5af41b2
HDRenderPipeline: Remove reflection probe to prevent NULL fail until fix.
8 年前
Tim Cooper
8ff712ff
Merge branch 'master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/ProceduralSkyRenderer.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Utilities.cs
8 年前
sebastienlagarde
fe297c77
HDRenderPipeline: Fix issue with wrong cluster compute shader use with update to HDPiepilneSetup
8 年前
Arnaud Carre
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
Arnaud Carre
bfff24ea
fix some scenes (too many point lights for 4096*4096 lightmap)
8 年前
Felipe Lira
be52007a
Merge branch 'master' into lowendmobile
8 年前
sebastienlagarde
8a6b2cf1
HDRenderPipeline: Update unlit shader
8 年前
GitHub
28357983
Merge pull request #126 from Unity-Technologies/Update-unlit-shader
HDRenderPipeline: Update unlit shader
8 年前
sebastienlagarde
ee5ea1fd
HDrenderPipeline: Unlit update - missing file
8 年前
Tim Cooper
a1e72bda
Merge remote-tracking branch 'origin/master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassResources.cs
8 年前
Evgenii Golubev
8be065be
Rename .meta files
8 年前
Evgenii Golubev
ac23a82e
Merge branch 'master' into SSSSS
8 年前
sebastienlagarde
9059555c
HDRenderPipeline: Add Dragon mesh for more complex test scene
8 年前
sebastienlagarde
72475618
HDRenderPipeline: Update material of the dragon.
8 年前
GitHub
d00136e3
Merge pull request #128 from EvgeniiG/master
Add the initial implementation of SSS
8 年前
Julien Ignace
df95d960
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
8 年前
sebastienlagarde
b2595e70
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
9cecdb2e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Evgenii Golubev
f43fbd7c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
b7ce99a8
HDRenderPipeline: Push draft not compling
8 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
GitHub
1b201c94
Merge pull request #136 from Unity-Technologies/Update-POM-+-Heightmap-behavior
Updating Layered shader
8 年前
Evgenii Golubev
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Chman
1d022582
Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp
8 年前
Arnaud Carré arnaud@unity3d.com
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
Arnaud Carre
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
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
a1e0f1e9
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline
- Rename all "loop" name to "pipeline" name for FPTL/Basic/HD
- Update all include in HDRenderPipeline to match C++ #include path that
is Asset/ScriptableRenderPipeline
Caution: This PR require the new C++ code
8 年前
GitHub
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
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 年前
Mikko Strandborg
fa549add
Create branch for renderpass test scene
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
runes
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
e13205b5
HDRenderPipeline: Change two sided options
Remove all variant of two sided, let double sided mirror for lit
material and double sisded for unlit
8 年前
GitHub
551cee1c
Merge pull request #155 from Unity-Technologies/Change-two-sided-option
HDRenderPipeline: Change two sided options
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 年前
Sebastien Lagarde
51b20e16
HDRenderPipeline: Fix issue with script updating all material + update test material
8 年前
Felipe Lira
38a9956f
Due to target hardware restrictions (ALU/bandwidth) LD won't support the same standard shader workflow. Instead a specular limited will be available.
8 年前
Sebastien Lagarde
37933307
HDRenderPipeline: Update scene test material
8 年前
GitHub
ba1e0e65
Merge pull request #158 from Unity-Technologies/Cleanup-of-inspectorUI-code
Cleanup and update of Lit and Unlit UI
8 年前
Evgenii Golubev
967eec25
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
1f2fa5a5
Manually upgrade materials
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 年前
Sebastien Lagarde
98a462de
HDRenderPipeline: Missing one file
8 年前
GitHub
2b3fa928
Merge pull request #168 from Unity-Technologies/Triplanar-POM
Fix planar/triplanar with normal map + POM Triplanar
8 年前
sebastienlagarde
c9e2247b
HDRenderPipeline: Update graphic test for Triplanar with LitMaterial
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
3cc7320b
Update heights of POM materials to match the tessellated versions
8 年前
Evgenii Golubev
9470df9a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
GitHub
b7cd7bb8
Merge pull request #170 from EvgeniiG/master
Fix depth offset for POM
8 年前
runes
84860a17
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carre
b38bced1
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
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 年前
GitHub
baac8e54
Merge pull request #189 from Unity-Technologies/lowendmobile
Lowendmobile
8 年前
Antti Tapaninen
0df1b41e
Merge branch 'master' into metal-ios
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
7 年前
vlad-andreev
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
uygar
8db09493
Merge branch 'master' into shadows
7 年前
uygar
8844bd4a
Added missing .meta files.
7 年前
Filip Iliescu
6e428acc
Merge branch 'metal' into classicDeferredMobile
7 年前
Evgenii Golubev
f8d04c4e
Add missing .meta files
7 年前
GitHub
dcb8638a
Merge pull request #225 from EvgeniiG/master
Improve the SSS implementation (+ *.meta files)
7 年前
uygar
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
7 年前
Sebastien Lagarde
47c4131d
HDRenderPipeline: Improve transmittance with wrap lighitng
7 年前
GitHub
c38cf214
Merge pull request #235 from Unity-Technologies/Improve-transmittance
Improve transmittance
7 年前
Julien Ignace
c31d6106
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.asset
7 年前
Arnaud Carre
833d6910
Merge remote-tracking branch 'refs/remotes/origin/master' into Branch_Batching2
7 年前
sebastienlagarde
4127e3ce
SRP: Move shader generator to SRP folder + add specularcolor test for hdrenderpipeline
7 年前
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 年前
Sebastien Lagarde
ad3ed427
HDRenderPipeline: Adding missing files / meta / directory
7 年前
Tim Cooper
582adf08
Merge remote-tracking branch 'origin/master' into test-framework
7 年前
sebastienlagarde
ef19678b
HDRenderPipeline: Submit missing meta and mat file.
7 年前
sebastienlagarde
0ded8f98
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/TestScenes/HDTest/GraphicTest/SSS/head.OBJ.meta
7 年前
GitHub
712ff1d3
Merge pull request #228 from Unity-Technologies/shadows
Update Shadows system
7 年前
Evgenii Golubev
273792fc
Update material IDs of the HD test scene
7 年前
Evgenii Golubev
0c574d10
Update material IDs of the HD test scene
7 年前
GitHub
89f5d5b8
Merge pull request #251 from EvgeniiG/material_id_update
Update the HD test scene
7 年前
GitHub
13ca3e1b
Merge pull request #252 from EvgeniiG/material_id_update
Update the HD test scene
7 年前
Evgenii Golubev
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
sebastienlagarde
46417646
HDRednerPipeline: Update transmission test + clean code
- Rename Thin Material in Thin objects
- Merge enable transmission and enable thin material in transmission
type
- re-add human head
- fix thin transmission test scene
7 年前
GitHub
c7298a02
Merge pull request #254 from Unity-Technologies/Ad-thin-material-flags
HDRenderPipeline: Add thin material option + Fix issue with transmission and shadow
7 年前
GitHub
fff7894f
Merge branch 'master' into submodule-fix
7 年前
Filip Iliescu
3a226917
merged master
7 年前
Arnaud Carre
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
7 年前
sebastienlagarde
e82137bb
HDRenderPipeline: Fix SSS test
7 年前
sebastienlagarde
30553d56
HDRenderPipeline: Add test scene
7 年前
GitHub
a1884724
Merge pull request #279 from Unity-Technologies/Object-space-normal-improvement
Object space normal improvement
7 年前
Evgenii Golubev
ad3d47b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
sebastienlagarde
88272cac
HDRednerPipeline Update texture compression on world space normal texture
7 年前
Evgenii Golubev
e7d27153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Filip Iliescu
dda281fd
Merge branch 'master' into classicDeferredMobile
7 年前
David Rogers
85744e59
Local merge
7 年前
David Rogers
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
7 年前
Sebastien Lagarde
d06af446
HDrenderPipeline: Update stencil bits
- Add stencil bit usage
- Move stencil bit to LightDefinition class
- Rename the enum with RegularLighting and SplitLighting
- Update SSS code to better stencil test practice
7 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
7 年前
GitHub
1b926dca
Merge pull request #286 from Unity-Technologies/Update-material-framework
Update material framework
7 年前
Julien Ignace
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Evgenii Golubev
d238793c
Add the old SSS model back
7 年前
GitHub
2e5e9470
Merge pull request #294 from EvgeniiG/upstream
Add the old SSS model back
7 年前
Sebastien Lagarde
0373fa24
HDRenderPipeline: Add reference mode for SSS
7 年前
Evgenii Golubev
e996e9cd
Update the SSS profile used for the head
7 年前
Evgenii Golubev
4b7caf6a
Merge branch 'upstream/Update-SSS' into upstream (without the reference mode)
7 年前
GitHub
17c2ab06
Merge pull request #297 from EvgeniiG/upstream
Merge branch 'upstream/Update-SSS' into upstream (without the reference mode)
7 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
7 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
7 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
7 年前
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 年前
Evgenii Golubev
f3d8504d
Add the SSS profiling scene
7 年前
GitHub
f92ef9c5
Merge pull request #342 from EvgeniiG/opt_sss
Port SSS to compute with an LDS texture cache
7 年前
Rune Stubbe
5f1e866a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Arnaud Carre
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
Filip Iliescu
28a25cc0
merged master
7 年前
sebastienlagarde
90dcb63d
HDRenderPipeline: Update test scene with clear coat test
7 年前
GitHub
e47845fe
Merge pull request #370 from Unity-Technologies/Add-clear-coat
Add clear coat support
7 年前
Evgenii Golubev
a449e3ad
Merge branch 'master' (area light clear coat code is disabled for now)
7 年前
Julien Ignace
39c4d3b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameLayeredShader
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
sebastienlagarde
48b499da
Update Scene Test after change of Anisotropy as MaterialId
7 年前
GitHub
557591f9
Merge pull request #403 from Unity-Technologies/Aniso-as-true-materialId
Aniso as true materialid - Update scene
7 年前
sebastienlagarde
b9c4f6ce
HDRenderPipeline: Update coat material in test scene not updated correctly with aniso change
7 年前
Peter Andreasen
69c448b2
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Felipe Lira
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
7 年前
Invertex
347e3a06
SSS: Added thickness map and adjusted settings for Perry head example
7 年前
GitHub
63209502
Merge pull request #419 from Invertex/2017.3-Invertex
SSS: Added thickness map and adjusted settings for Perry head example
7 年前
GitHub
a82f6ffc
Merge pull request #421 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
8a5090cc
Reassign the thickness map (outdated GUID)
7 年前
GitHub
3151b43b
Merge pull request #423 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Julien Ignace
825bfd84
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DepthPrepass
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
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 年前
sebastienlagarde
94877537
HDRenderPipeline: Update triplanar test
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 年前
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 年前
Evgenii Golubev
ce71162a
Update the HD test scene
7 年前
Evgenii Golubev
6610eebb
Precompute '_InvPrimScale' and '_InvTilingScale'
7 年前
Evgenii Golubev
9fe5367d
Support depth offset with the triplanar POM
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 年前
Frédéric Vauchelles
448737fc
Prototype for distorstion
7 年前
Frédéric Vauchelles
e2200ec7
(wip) distortion
7 年前
Frédéric Vauchelles
315455b3
(wip) distortion rejection with stencil buffer
7 年前
Frédéric Vauchelles
e533651d
Added a nullify option for distortion, based on stencil buffer usage
7 年前
Frédéric Vauchelles
88544dd5
Added distortion on ulit shader
7 年前
Frédéric Vauchelles
6a403ad7
Updated test shader for distortion
7 年前
Frédéric Vauchelles
acca5c71
Use a multiply blend mode instead of stencil to control distortion
7 年前
Frédéric Vauchelles
ba8dc625
(wip) Use depth to discard pixels in front of distortion object
7 年前
Frédéric Vauchelles
67e5ae1f
Updated test scene for distortion
7 年前
Frédéric Vauchelles
9b91c67c
Updated test scene for distortion
7 年前
Frédéric Vauchelles
5cf7b5ab
Added remapping for distortion blur
7 年前
Frédéric Vauchelles
5a06a16e
Update test scene
7 年前
Frédéric Vauchelles
c38d4aba
Use a distortion mask to discard pixels instead of depth
7 年前
Frédéric Vauchelles
00943f50
Updated test scene
7 年前
Frédéric Vauchelles
c84fe71e
Updated test scene
7 年前
Frédéric Vauchelles
600d1ebf
Updated test scene material
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
722dee63
(wip) Prepass for transparent
7 年前
Frédéric Vauchelles
b8ecf3ad
Updated keywords for pretransparent and transparent materials
7 年前
Frédéric Vauchelles
4ea18fae
Disable refraction for pre-transparents
7 年前
Frédéric Vauchelles
88f2193b
Added test for pretransparent distortion
7 年前
Frédéric Vauchelles
c755942b
Fixed Lit/Distortion debug
7 年前
Frédéric Vauchelles
051c4673
Added refraction mask
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 年前
Frédéric Vauchelles
f3809117
Added tests for specular blending
7 年前
GitHub
b4fcde57
Merge pull request #499 from Unity-Technologies/feature/transparentSpecularBlending
Feature/transparent specular blending
7 年前
Julien Ignace
ded2da7e
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForward.hlsl
7 年前
sebastienlagarde
60296408
HDRenderPipeline: Update all material Keywords
7 年前
Frédéric Vauchelles
1303cd7c
Keep only 2 refraction models: Plane and Sphere
7 年前
Evgenii Golubev
733171ce
Merge branch 'Unity-2017.3'
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
2f7a0934
Fixed distortion test scene
7 年前
GitHub
5aab5b90
Merge pull request #516 from Unity-Technologies/fix/distortionTestScene
Fixed distortion test scene
7 年前
Robert Srinivasiah
27b4f37f
WIP of RT prototype
Not done yet
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 年前
Frédéric Vauchelles
2a67426d
Updated refraction test scene and materials
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 年前
sebastienlagarde
4287ed02
HDRenderPipeline: Split Lit and LayeredLit data file in several part to make it more readable
7 年前
GitHub
3ed7e798
Merge pull request #526 from Unity-Technologies/Refactor-Lit-shader
HDRenderPipeline: Split Lit and LayeredLit data file in several part to make it more readable
7 年前
Remy
cffd854a
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
Frédéric Vauchelles
5d435f0e
Test scene for realtime cubemaps
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Sebastien Lagarde
3eb94be0
Update files to better match unity 2017.3
7 年前
GitHub
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
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 年前
sebastienlagarde
960faf23
HDRenderPipeline: Change distortion map to be 0..1 (to support LDR format)
7 年前
sebastienlagarde
2d587903
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
GitHub
64affbce
Merge pull request #559 from Unity-Technologies/Unity-2017.3
Unity 2017 3
7 年前
Evgenii Golubev
6e30e2d6
Merge branch 'Unity-2017.3'
7 年前
Salvador Jacobi
4bd00346
Merge branch 'master' into organize-menu-items
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Evgenii Golubev
b452c309
Merge branch 'Unity-2017.3'
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 年前
Sebastien Lagarde
c815cbdb
more update
7 年前
Julien Ignace
4941176b
Updated realtime cubemap test scene
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 年前
Julien Ignace
05d9c93b
Missing realtime cubemap scene files.
7 年前
Julien Ignace
1308feb1
Merge branch 'feature/realtimeCubemap' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
GitHub
b13cc702
Merge pull request #612 from Unity-Technologies/feature/realtimeCubemap
Feature/realtime cubemap
7 年前
Julien Ignace
1f62747c
- Renamed texture cache "update count" tout "slice entry hash"
- Updated real time cubemap scene baked data
7 年前
Remy
c22205d7
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Julien Ignace
40fdbce8
Updated realtime cubemap scene baked data.
7 年前
GitHub
1e9184b9
Merge pull request #621 from Unity-Technologies/feature/realtimeCubemap
Small fixes and cleaning
7 年前
Julien Ignace
92a18712
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameTilePass
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps/LightingData.asset
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps/ReflectionProbe-1.exr
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps/ReflectionProbe-2.exr
# ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
GitHub
d45213dd
Merge pull request #624 from Unity-Technologies/Branch_RenameTilePass
Renamed TilePass to LightLoop where relevant.
7 年前
Evgenii Golubev
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
6541de0b
Merge master
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
Paul Melamed
68425c93
Merge branch 'master' into prototype/decals
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Evgenii Golubev
81d62eb8
Merge branch '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
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 年前
Sebastien Lagarde
a8ab890d
Rename SubsurfaceScattering Settings/Editor to DiffusionProfile + various file renaming/moving
7 年前
GitHub
76304378
Merge pull request #758 from Unity-Technologies/Rename-Subsurface-Profile-=---Diffusion--profile
Update Subsurface profile
7 年前
Sebastien Lagarde
e059a00a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Frédéric Vauchelles
77da2d54
[PlanarReflection] Added test scene
7 年前
Julien Ignace
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
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 年前
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 年前
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 年前
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 年前
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 年前
Sebastien Lagarde
106566dc
Update the UI for iridescence
7 年前
Mike Wuetherick
0d5b90fd
updated mats for 2018.1.0b6
7 年前
John
360fd4d8
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
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 年前
GitHub
f618fcd9
Merge pull request #944 from Unity-Technologies/support-iridescence
Add support for Iridescence in Lit
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 年前
Sebastien Lagarde
3e8d0140
HDRenderPipeline: Update Material test scene
7 年前
Robert Srinivasiah
2d5b988d
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
sebastienlagarde
e347d974
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前