Andre McGrail
|
35e631d7
|
Cherry pick from 'lw/terrain-shader-fixes' for 2018.1 PR
|
6 年前 |
GitHub
|
023df4a2
|
Merge pull request #1187 from Unity-Technologies/lw/terrain-shader-fixes-pr
Terrain Shader fixes
|
6 年前 |
Felipe Lira
|
9fe30bee
|
Tweaked default shader values to be mid grey
|
6 年前 |
|
Felipe Lira
|
29a4687f
|
@Verasl
Cherry pick from 'lw/terrain-shader-fixes' for 2018.1 PR
|
6 年前 |
|
GitHub
|
968bc78a
|
Merge pull request #1208 from Unity-Technologies/lw/18.1-forwardport
Lw/18.1 forwardport
|
6 年前 |
|
GitHub
|
68c7f1f5
|
Merge pull request #1189 from Unity-Technologies/backport/terrain-shader-fixes
Backport/terrain shader fixes
|
6 年前 |
|
Andre McGrail
|
3304f9f5
|
Tweaked default shader values to be mid grey
|
6 年前 |
|
Felipe Lira
|
cdd9a0d1
|
Added _LOCAL_SHADOWS_ENABLED keyword
|
6 年前 |
|
Felipe Lira
|
4fec8c89
|
Added shader pass names so we can strip passes by pass name.
|
6 年前 |
|
Felipe Lira
|
ba310f35
|
Added support to local soft shadows. Added rule to strip soft shadows keyword.
|
6 年前 |
|
Felipe Lira
|
cee6f8f7
|
Used autoformat tool on all changed files.
|
6 年前 |
|
GitHub
|
9aa25b18
|
Merge pull request #1243 from Unity-Technologies/lw/shader-keywords-stripping
Lw/shader keywords stripping
|
6 年前 |
|
GitHub
|
ab445387
|
Merge pull request #1209 from Unity-Technologies/LWRP
LWRP
|
6 年前 |
|
GitHub
|
362e32d7
|
Merge branch 'master' into expose-numlights-per-cluster
|
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 年前 |
|
GitHub
|
231beaa3
|
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
|
6 年前 |
sebastienlagarde
|
0ddaf44e
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
|
sebastienlagarde
|
f5c6eec7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
|
6 年前 |
|
Stephane Laroche
|
10f8090a
|
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
|
6 年前 |
Yao Xiaoling
|
cb671fbb
|
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
|
6 年前 |
|
Yao Xiaoling
|
afba3908
|
Fix LWRP terrain instancing.
|
6 年前 |
Raymond Graham
|
4e9dca70
|
Merge branch 'master' into volumetric-lighting-updates
|
6 年前 |
|
Evgenii Golubev
|
91dc696c
|
Merge upstream/master
|
6 年前 |
|
Frédéric Vauchelles
|
4bfaa623
|
merge master
|
6 年前 |
|
Andre McGrail
|
2add303c
|
Small terrain shader fixes
-Added projector back in so brush previews are visible
-Fixed the meta pass
-Added pass names to the terrain base shader
|
6 年前 |
|
GitHub
|
c42a1a4a
|
Merge pull request #1499 from Unity-Technologies/lw/terrain-shader-fixes
Small terrain shader fixes
|
6 年前 |
Sebastien Lagarde
|
c95b7c47
|
Merge branch 'master' into normal-buffer-support
|
6 年前 |
Paul Melamed
|
29ce571e
|
Merge branch 'master' into decals/ss3_channel_mask
|
6 年前 |
|
GitHub
|
f82aef0c
|
Merge branch 'master' into VisualizeShadowMasks
|
6 年前 |
|
Felipe Lira
|
312a5259
|
Screenspace shadow resolve is only done in case of cascade shadows.
|
6 年前 |
|
Stephane Laroche
|
7842bbf8
|
Merge remote-tracking branch 'mainrepo/master' into StackLit2
|
6 年前 |
Oliver Schnabel
|
ecdbdcab
|
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
|
6 年前 |
|
Remy
|
98989fb6
|
Merge branch 'master' into HDRP-Tests
|
6 年前 |
|
Felipe Lira
|
7193e88e
|
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
|
6 年前 |
Thomas
|
01ee049b
|
Merge branch 'master' into gfx-tests-postfx
|
6 年前 |
Chris Tchou
|
6408007a
|
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
|
6 年前 |
|
GitHub
|
93c87374
|
Merge pull request #1516 from Unity-Technologies/lw/shadow-optimization
Lw/shadow optimization
|
6 年前 |
|
Stephane Laroche
|
a49a696e
|
Merge branch 'master' into StackLit2
|
6 年前 |
|
Remy
|
9db2a137
|
Merge branch 'master' into HDRP-Tests
|
6 年前 |
|
GitHub
|
25f5aa64
|
Merge branch 'master' into lw/lw-pipeline-asset-inspector
|
6 年前 |
|
GitHub
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
6 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
|
Yao Xiaoling
|
38856112
|
Fix merge.
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
Yao Xiaoling
|
0e0c5530
|
Update terrain utility passes names. Outlining doesn't work. Will fix later.
|
6 年前 |
Yao Xiao Ling
|
f70f3a76
|
Add instanced per pixel normal for lw terrain shader.
|
6 年前 |
|
GitHub
|
a6854ec4
|
Merge pull request #1875 from Unity-Technologies/gpu-terrain
GPU Terrain (2018.3) port to HDRP and LWRP
|
6 年前 |
egomeh
|
93afc87c
|
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
|
6 年前 |
|
Thomas
|
468989ad
|
Merge branch 'master' into pyramid-rework
|
6 年前 |
|
GitHub
|
237718e2
|
Merge pull request #1901 from Unity-Technologies/gpu-terrain
Enabled per-pixel terrain normal on LW terrain shader.
|
6 年前 |
|
GitHub
|
aae1a458
|
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
|
6 年前 |
