sebastienlagarde
|
170e527c
|
HDRP: Add build processor to reject unsupported build
|
6 年前 |
GitHub
|
942ecce5
|
Merge pull request #1262 from Unity-Technologies/Build-processor
HDRP: Add build processor to reject unsupported build
|
6 年前 |
|
sebastienlagarde
|
227c3165
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
Frédéric Vauchelles
|
6a14305e
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
|
6 年前 |
|
sebastienlagarde
|
a47f097f
|
Add switch build player support
|
6 年前 |
|
GitHub
|
61db0440
|
Merge pull request #1286 from Unity-Technologies/Add-switch-build-player-support
Add switch build player support
|
6 年前 |
Stephane Laroche
|
ecc9d71b
|
Merge remote-tracking branch 'mainrepo/master' into stacklit
|
6 年前 |
|
sebastienlagarde
|
2c1c78cf
|
Merge branch 'master' into 2018.1-experimental
|
6 年前 |
|
sebastienlagarde
|
e4f497dc
|
Fix issue with preprocessor
|
6 年前 |
|
GitHub
|
08b41047
|
Merge pull request #1288 from Unity-Technologies/Fix-issue-with-preprocessor
Fix issue with preprocessor
|
6 年前 |
|
sebastienlagarde
|
c6867a4e
|
Merge branch 'master' into 2018.1-experimental
|
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 年前 |
sebastien lagarde
|
6a8cf791
|
HDRP: Remove warning C#
|
6 年前 |
|
Stephane Laroche
|
b3ee7f83
|
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 年前 |
|
Sebastien Lagarde
|
2ca0621d
|
Add scene selection pass to HDRP
For lit, lit tessellation, unlit, layeredLit, LayereLitTessellation
|
6 年前 |
|
Evgenii Golubev
|
1f059c6b
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
GitHub
|
dc326439
|
Merge pull request #1375 from Unity-Technologies/Add-scene-selection-pass-to-HDRP
Add scene selection pass to HDRP
|
6 年前 |
|
Sebastien Lagarde
|
265dfd2e
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
Alex Lian
|
0d975dea
|
Merge remote-tracking branch 'origin/master' into build/automation
|
6 年前 |
Matt Dean
|
36a0484f
|
Merge remote-tracking branch 'origin/master' into sg/texture-types
|
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 年前 |
|
sebastienlagarde
|
c0461407
|
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
|
6 年前 |
|
GitHub
|
7f5da648
|
Merge branch 'master' into sg/show-generated-code
|
6 年前 |
|
Frédéric Vauchelles
|
4a39c649
|
Fixed HDRP variant
|
6 年前 |
Tim Cooper
|
fafb59af
|
Run code formatter.
|
6 年前 |
|
Frédéric Vauchelles
|
4d7f78f1
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
|
6 年前 |
|
sebastienlagarde
|
67c1ca49
|
Remove UNITY_2018_2_OR_NEWER define (as we are on 2018.2)
|
6 年前 |
|
GitHub
|
7914a34a
|
Merge pull request #1407 from Unity-Technologies/remove-UNITY_2018_2_OR_NEWER
Remove UNITY_2018_2_OR_NEWER define (as we are on 2018.2)
|
6 年前 |
|
sebastienlagarde
|
bba0731d
|
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
|
6 年前 |
|
GitHub
|
012f4b1f
|
Merge pull request #1417 from Unity-Technologies/Change-name-of-supportOnlyForward
HDRP: Change settigs name from supportForwardOnly to supportOnlyForward
|
6 年前 |
|
Sebastien Lagarde
|
49897966
|
HDRP: Reorganize folder and files
|
6 年前 |
|
GitHub
|
aad9d81b
|
Merge pull request #1450 from Unity-Technologies/HDRP-Reorganize-folder-and-files
HDRP: Reorganize folder and files
|
6 年前 |
Paul Melamed
|
9f1637c0
|
Merge branch 'master' into decals/NoHDRP_exception
|
6 年前 |
|
Sebastien Lagarde
|
dcbff94f
|
refactor shader variant per material + Add variant stripper for stacklit and selection
|
6 年前 |
|
Stephane Laroche
|
d85052d9
|
Merge branch 'master' into StackLit2
|
6 年前 |
|
sebastienlagarde
|
23e50c80
|
Rename SahderPreprocessorMaterial to BaseShaderPreprocessor
|
6 年前 |
Chris Tchou
|
e8ce5056
|
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
|
6 年前 |
|
GitHub
|
51a1873e
|
Merge branch 'master' into update-changelog
|
6 年前 |
Peter Bay Bastian
|
b4dd9062
|
Merge remote-tracking branch 'origin/master' into sg/facesign
|
6 年前 |
|
GitHub
|
1ea2f496
|
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
|
6 年前 |
Remy
|
7bf53f3c
|
Merge branch 'master' into HDRP-Tests
|
6 年前 |
|
Stephane Laroche
|
7933fd8d
|
Merge branch 'master' into StackLit2
|
6 年前 |
|
Paul Melamed
|
797daf79
|
Merge branch 'master' into decals/ss3_channel_mask
|
6 年前 |
|
sebastienlagarde
|
6c870111
|
Merge branch 'master' into FalseColorMode
|
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
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
6 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
sebastienlagarde
|
be149b78
|
HDRP: Fix issue with forward and preprocessor + update changelog
|
6 年前 |
|
GitHub
|
36f5927e
|
Merge pull request #1613 from Unity-Technologies/fix-issue-with-preprocessor
HDRP: Fix issue with forward and preprocessor + update changelog
|
6 年前 |
|
sebastienlagarde
|
7934a87a
|
Merge branch 'master' into LightUnits
|
6 年前 |
|
Paul Melamed
|
141afc6f
|
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
|
6 年前 |
|
Remy
|
540d190a
|
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
|
6 年前 |
|
Matt Dean
|
1b3f1ca2
|
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
|
6 年前 |
|
Matt Dean
|
1c4c0d09
|
Merge branch 'master' into sg/fix-dielectric-specular-control
|
6 年前 |
|
Stephane Laroche
|
cbb9a885
|
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
|
6 年前 |
|
Tim Cooper
|
8406655d
|
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
|
6 年前 |
|
Nerites
|
9b69a952
|
Merge xrconfig branch into xrsettings
|
6 年前 |
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
Remi Slysz
|
c072c88e
|
fix wrong namespace editor classes
|
6 年前 |
|
Remi Slysz
|
389d3eb5
|
fix no namespace editor classe
|
6 年前 |
|
GitHub
|
4312d844
|
Merge pull request #1730 from Unity-Technologies/hdrp/fix-namespaces
Hdrp/fix namespaces
|
6 年前 |
|
GitHub
|
07c127ac
|
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
Remy
|
b3ff809b
|
Merge branch 'master' into tests/hdrp/distortion
|
6 年前 |
Julien Ignace
|
5bfcc8cd
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
|
6 年前 |
|
Yao Xiaoling
|
4d7a5d51
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
|
6 年前 |
|
Nerites
|
b088283d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
GitHub
|
7b744594
|
Merge branch 'master' into xrsettings
|
6 年前 |
|
GitHub
|
b400b1c1
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
Sebastien Lagarde
|
72141169
|
Merge branch 'master' into lighting-arealigh-fixup
|
6 年前 |
|
GitHub
|
01fdbb38
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
|
GitHub
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |
