sebastienlagarde
|
a7a14891
|
Factor PreIntegratedFGD
|
6 年前 |
GitHub
|
517c5afd
|
Merge pull request #1220 from Unity-Technologies/Factor-PreIntegratedFGD
Factor PreIntegratedFGD
|
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 年前 |
|
sebastienlagarde
|
4a94d626
|
Share GetPreIntegratedFGD
|
6 年前 |
|
GitHub
|
4a8c5ab6
|
Merge pull request #1222 from Unity-Technologies/Share-GetPreIntegratedFGD-function
Share GetPreIntegratedFGD
|
6 年前 |
Stephane Laroche
|
61ee5830
|
Merge branch 'master' into stacklit
|
6 年前 |
Remy
|
9c81e0d8
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
|
6 年前 |
|
Frédéric Vauchelles
|
d9f5b4f5
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Textures/RTHandleSystem.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
|
6 年前 |
Evgenii Golubev
|
9b95d6ea
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
sebastienlagarde
|
5e7735c5
|
HDRP: PreIntegratedFDG material as resource
|
6 年前 |
|
sebastienlagarde
|
f797131f
|
Add preIntegratedFGD to asset resources
|
6 年前 |
|
GitHub
|
2dabed04
|
Merge pull request #1260 from Unity-Technologies/PreIntegratedFDG-material-as-resource
Preintegratedfdg material as resource
|
6 年前 |
|
sebastienlagarde
|
0b448138
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
|
Frédéric Vauchelles
|
8676f2e5
|
Merge master
|
6 年前 |
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
6 年前 |
|
Evgenii Golubev
|
f1877508
|
Update GetRenderTargetAutoName() to support volume textures
|
6 年前 |
|
sebastienlagarde
|
f5c6eec7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
|
6 年前 |
|
GitHub
|
f8e74a10
|
Merge pull request #1277 from Unity-Technologies/switch_support
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 年前 |
|
Stephane Laroche
|
ecc9d71b
|
Merge remote-tracking branch 'mainrepo/master' into stacklit
|
6 年前 |
|
sebastienlagarde
|
2c1c78cf
|
Merge branch 'master' into 2018.1-experimental
|
6 年前 |
Yao Xiaoling
|
cb671fbb
|
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
|
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 年前 |
|
GitHub
|
c3aaee56
|
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
|
6 年前 |
|
sebastienlagarde
|
05ee75ca
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
|
Stephane Laroche
|
e0b3d217
|
Merge branch 'master' into stacklit
|
6 年前 |
|
Felipe Lira
|
25e45b36
|
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
6 年前 |
|
Felipe Lira
|
63a6fe03
|
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
6 年前 |
|
Frédéric Vauchelles
|
3932faa4
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
|
6 年前 |
Sebastien Lagarde
|
d69fdafe
|
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug number
|
6 年前 |
|
GitHub
|
5a626b21
|
Merge pull request #1533 from Unity-Technologies/Add-support-for-multiple-PreIntegratedFGD
HDRP: Add support for multiple PreIntegratedFGD + updte hlsl debug nu…
|
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 年前 |
|
Stephane Laroche
|
f46075fb
|
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
|
6 年前 |
|
GitHub
|
0610a60c
|
Merge branch 'master' into sg/error-for-incompatible-pipeline
|
6 年前 |
Julien Ignace
|
f339f7c5
|
Fixed PreIntegratedFGD texture being destroyed in some cases and not re-rendered correctly (also removed some redundant tests in Lit.cs and StackLit.cs)
|
6 年前 |
|
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
|
GitHub
|
a94b9fdf
|
Merge pull request #1677 from Unity-Technologies/Branch_FixPreIntegratedFGD
Fixed PreIntegratedFGD texture being destroyed in some cases and not …
|
6 年前 |
|
Julien Ignace
|
176e4109
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPPCopy
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
|
6 年前 |
|
GitHub
|
7c6394fe
|
Merge pull request #1702 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
Remy
|
1bce3600
|
Merge branch 'master' into tests/hdrp/distortion
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
GitHub
|
7281fe31
|
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
|
6 年前 |
|
Stephane Laroche
|
73aab246
|
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
|
6 年前 |
|
Nerites
|
4c6e512a
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
Nerites
|
7a18f28e
|
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
|
6 年前 |
|
Nerites
|
5182ab18
|
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
|
6 年前 |
|
Yao Xiaoling
|
4d7a5d51
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
|
6 年前 |
|
GitHub
|
01fdbb38
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
Anis Benyoub
|
cd8cac28
|
Rename cloth to Fabric
|
6 年前 |
|
GitHub
|
0f00f09d
|
Merge pull request #1847 from Unity-Technologies/Add-cloth-material-anis
Finishing a first version of the implementation of the Fabric Shader
|
6 年前 |
|
Sebastien Lagarde
|
82c30969
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
|
GitHub
|
f25dd24a
|
Merge branch 'master' into HDRP/staging
|
6 年前 |
|
GitHub
|
2befab52
|
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
|
6 年前 |
|
Julien Ignace
|
ab8c4439
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
|
6 年前 |
Yao Xiao Ling
|
cfd45cf1
|
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
|
6 年前 |
egomeh
|
e7c59a70
|
Resolve merge conflicts
|
6 年前 |
|
GitHub
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |
