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 年前 |
Paul Demeulenaere
|
40290c81
|
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
|
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 年前 |
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 年前 |
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 年前 |
runes
|
3b9f1e7d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
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 年前 |
Mikko Strandborg
|
fa549add
|
Create branch for renderpass test scene
|
8 年前 |
uygar
|
c8a27740
|
Merge branch 'master' into shadows
|
8 年前 |
Felipe Lira
|
0905d0bc
|
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
|
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 年前 |
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
|
8 年前 |
vlad-andreev
|
3a5b105e
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
uygar
|
8db09493
|
Merge branch 'master' into shadows
|
8 年前 |
uygar
|
8844bd4a
|
Added missing .meta files.
|
8 年前 |
Filip Iliescu
|
6e428acc
|
Merge branch 'metal' into classicDeferredMobile
|
8 年前 |
Evgenii Golubev
|
f8d04c4e
|
Add missing .meta files
|
8 年前 |
GitHub
|
dcb8638a
|
Merge pull request #225 from EvgeniiG/master
Improve the SSS implementation (+ *.meta files)
|
8 年前 |
uygar
|
d82162c7
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
|
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 年前 |
GitHub
|
712ff1d3
|
Merge pull request #228 from Unity-Technologies/shadows
Update Shadows system
|
7 年前 |
Evgenii Golubev
|
0d763678
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
Filip Iliescu
|
3a226917
|
merged master
|
7 年前 |
Arnaud Carre
|
f27d26c4
|
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
|
7 年前 |
Mike Wuetherick
|
0d5b90fd
|
updated mats for 2018.1.0b6
|
7 年前 |
John
|
360fd4d8
|
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
|
7 年前 |