Frédéric Vauchelles
|
63675025
|
Moved Misc to common and utilities
|
7 年前 |
GitHub
|
b782fae4
|
Merge pull request #1142 from Unity-Technologies/feature/RefactorCoreRPFiles
Refactor CoreRP root files
|
7 年前 |
|
Frédéric Vauchelles
|
412bd010
|
Merge master
|
7 年前 |
Stephane Laroche
|
5ad6a9db
|
Merge branch 'master' into StackLitWork
|
7 年前 |
Evgenii Golubev
|
8d663ac4
|
Merge upstream/master
|
7 年前 |
Paul Melamed
|
5e4ad2d7
|
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
|
7 年前 |
Felipe Lira
|
65fc1c54
|
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
|
7 年前 |
|
Evgenii Golubev
|
999f9fa8
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
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...
|
7 年前 |
Tim Cooper
|
fafb59af
|
Run code formatter.
|
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 年前 |
Nerites
|
22989ca2
|
Refiled XRGraphicsConfig and protected editor-only sections to enable
building
|
7 年前 |
|
GitHub
|
e35bea1a
|
Merge pull request #1640 from Unity-Technologies/xrsettings
Split off editor-only code for XRGraphicsConfig to reenable builds
|
7 年前 |
|
Nerites
|
2ff04938
|
Hid viewportscale and renderscale in XR GUI section. Tied XR renderscale
to SRP renderscale and tied XR viewport scale to 1 pending viewport
scale fixes.
|
7 年前 |
|
GitHub
|
162e4cee
|
Merge pull request #1645 from Unity-Technologies/xrsettings
UI cleanup for XRGraphicsConfig renderScale/viewportScale
|
7 年前 |
|
Nerites
|
4ec63c6e
|
Added hookup for eyeTextureWidth and eyeTextureHeight
|
7 年前 |
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
7 年前 |
|
Nerites
|
b179c9ac
|
Added compatability ifdefs for XRGraphicsConfig, since it should be used
with postprocessing too
|
7 年前 |
|
Nerites
|
a1d90d2e
|
Added stereoRenderingPath to XRGraphicsConfig
|
7 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
7 年前 |
|
GitHub
|
7281fe31
|
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
|
7 年前 |
|
Stephane Laroche
|
73aab246
|
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
|
7 年前 |
|
Nerites
|
b787091f
|
Protected StereoRenderingPath with #if UNITY_EDITOR pending move of
StereoRenderPath
|
7 年前 |
|
GitHub
|
ae4294ea
|
Merge pull request #1731 from Unity-Technologies/xrsettings
Removed XRSettings usage from HDRP. Protected XR usage in XRGraphicsConfig with ifdefs.
|
6 年前 |
Sebastien Lagarde
|
72141169
|
Merge branch 'master' into lighting-arealigh-fixup
|
6 年前 |
|
Sebastien Lagarde
|
05036cac
|
Merge branch 'HDRP/staging' into HDLightExplorerExtension
|
6 年前 |
|
Frédéric Vauchelles
|
ce4065fd
|
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
|
6 年前 |
RSlysz
|
05f23629
|
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
|
6 年前 |
|
GitHub
|
01fdbb38
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
|
Paul Melamed
|
9dbd8998
|
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
|
6 年前 |
Yao Xiao Ling
|
cfd45cf1
|
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
|
6 年前 |
|
GitHub
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |
