Andre McGrail
|
0effa5f2
|
Removed substance dependancies from LW tests and also re-created affected template images
|
7 年前 |
sebastienlagarde
|
b9b30507
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
|
7 年前 |
Sebastien Lagarde
|
24ac5a9e
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
|
7 年前 |
GitHub
|
b83e5de0
|
Merge branch 'master' into feature/mip-debug
|
7 年前 |
Evgenii Golubev
|
c86b3214
|
Merge branch 'master'
|
7 年前 |
|
Evgenii Golubev
|
8a70dc3b
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
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 年前 |
Peter Andreasen
|
3ccf74cc
|
merged from master
|
7 年前 |
Felipe Lira
|
9526b0d2
|
Moved LWRP test folder
|
7 年前 |
|
GitHub
|
4e5fc617
|
Merge pull request #1394 from Unity-Technologies/lw/move-test-folder
Lw/move test folder
|
7 年前 |
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
|
7 年前 |
Tim Cooper
|
3dd99694
|
Fix lfs issue
|
7 年前 |
|
GitHub
|
16b41fe4
|
Merge pull request #1542 from Unity-Technologies/gfx-tests-postfx
Gfx tests postfx
|
7 年前 |
|
GitHub
|
25f5aa64
|
Merge branch 'master' into lw/lw-pipeline-asset-inspector
|
7 年前 |
Remy
|
409f30cb
|
Merge branch 'master' into HDRP-Tests
# Conflicts:
# .gitattributes
# com.unity.testframework.graphics/Runtime/GraphicsTestSettings.cs
|
7 年前 |
|
GitHub
|
d4992b3f
|
Merge branch 'master' into lw/camera-additional-data
|
7 年前 |
|
GitHub
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
7 年前 |
|
GitHub
|
bd393bda
|
Merge branch 'master' into switch-support
|
7 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
7 年前 |
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
|
7 年前 |
|
GitHub
|
0610a60c
|
Merge branch 'master' into sg/error-for-incompatible-pipeline
|
7 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
