Frédéric Vauchelles
|
63675025
|
Moved Misc to common and utilities
|
6 年前 |
GitHub
|
b782fae4
|
Merge pull request #1142 from Unity-Technologies/feature/RefactorCoreRPFiles
Refactor CoreRP root files
|
6 年前 |
|
Frédéric Vauchelles
|
412bd010
|
Merge master
|
6 年前 |
Stephane Laroche
|
5ad6a9db
|
Merge branch 'master' into StackLitWork
|
6 年前 |
Evgenii Golubev
|
8d663ac4
|
Merge upstream/master
|
6 年前 |
Paul Melamed
|
5e4ad2d7
|
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
|
6 年前 |
sebastienlagarde
|
58445f5d
|
Move notification for API change to core
|
6 年前 |
|
GitHub
|
de0287be
|
Merge pull request #1181 from Unity-Technologies/Move-notification-for-API-change-to-core
Move notification for API change to core
|
6 年前 |
|
sebastienlagarde
|
c7c2adef
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-FullScreeMedia-path
|
6 年前 |
|
Evgenii Golubev
|
2bffbe72
|
Factor out CoreUtils.AreAnimatedMaterialsEnabled()
|
6 年前 |
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...
|
6 年前 |
|
GitHub
|
c7261dfc
|
Add a comment
|
6 年前 |
|
Evgenii Golubev
|
187b007e
|
Merge branch 'remove_unity_per_camera' of https://github.com/EvgeniiG/ScriptableRenderLoop into remove_unity_per_camera
|
6 年前 |
|
Evgenii Golubev
|
8ffeafaf
|
Fix material animation in reflection probes
|
6 年前 |
|
Evgenii Golubev
|
b4708ef6
|
Merge upstream/master
|
6 年前 |
|
Felipe Lira
|
c30fcd10
|
Added pipeline capabilities. Stripping shader meta pass and variants based on selected capabilities.
|
6 年前 |
|
Frédéric Vauchelles
|
4bd00e90
|
Merge master
|
6 年前 |
|
GitHub
|
858b64ad
|
Merge pull request #1197 from EvgeniiG/rename_unity_per_camera
Rename UnityPerCamera CBuffer variables (and set them from C#)
|
6 年前 |
|
Evgenii Golubev
|
999f9fa8
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
sebastienlagarde
|
f0d38603
|
Display warning message with VR when not supported in HD
|
6 年前 |
|
GitHub
|
b9541da7
|
Merge pull request #1210 from Unity-Technologies/Display-warning-message-with-VR
Display warning message with VR when not supported in HD
|
6 年前 |
|
Evgenii Golubev
|
e9f686c7
|
Merge branch 'volumes-improvements' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
GitHub
|
9aa25b18
|
Merge pull request #1243 from Unity-Technologies/lw/shader-keywords-stripping
Lw/shader keywords stripping
|
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 年前 |
|
sebastienlagarde
|
5f9a0791
|
Fix sky in preview and fog in sceneView
|
6 年前 |
|
GitHub
|
50c728b8
|
Merge pull request #1236 from Unity-Technologies/Fix-sky-in-preview-and-fog-in-sceneView
Fix sky in preview and fog in sceneView
|
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 年前 |
|
Evgenii Golubev
|
0dc801ac
|
Fix the issue with missing fog in the scene view
|
6 年前 |
|
Evgenii Golubev
|
00676317
|
Introduce the VolumetricLightingController component
|
6 年前 |
Raymond Graham
|
2e819225
|
Volumetric updates from Evgenii
|
6 年前 |
|
GitHub
|
49988c37
|
Merge pull request #1265 from EvgeniiG/master
Introduce the VolumetricLightingController component (+bugfixes)
|
6 年前 |
|
sebastienlagarde
|
b1e7249e
|
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 年前 |
|
GitHub
|
231beaa3
|
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
|
6 年前 |
|
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
6 年前 |
Aleksandr Kirillov
|
1f4e5415
|
Added explicit load and store actions to all SetRenderTarget commands.
|
6 年前 |
|
Aleksandr Kirillov
|
48b18113
|
Addressed code review feedback.
|
6 年前 |
|
Evgenii Golubev
|
f1877508
|
Update GetRenderTargetAutoName() to support volume textures
|
6 年前 |
|
GitHub
|
820a2353
|
Merge pull request #1289 from Unity-Technologies/lw/load_store_rt_optimization
Added explicit load and store actions to all SetRenderTarget commands.
|
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 年前 |
|
Felipe Lira
|
1e580cd4
|
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs
|
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 年前 |
|
Felipe Lira
|
f48ba219
|
Added null check on CreateEngineMaterial
|
6 年前 |
|
GitHub
|
19d1506c
|
Merge pull request #1337 from Unity-Technologies/lw/api-refactor-v1
Lw/api refactor v1
|
6 年前 |
|
GitHub
|
c27f37c6
|
Merge pull request #1378 from Unity-Technologies/LWRP
Lwrp
|
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 年前 |
Peter Bay Bastian
|
927000b8
|
Merge branch 'master' into sg/texture-types
|
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 年前 |
Tim Cooper
|
2c4a517b
|
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
|
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 年前 |
|
Remy
|
8c6fd7ef
|
Moved "SceneRenderPipeline.cs" out of editor folder, and added proper compilation condition to avoid errors.
The component can now be attached back to gameobjects
|
6 年前 |
|
GitHub
|
c64e11b4
|
Merge pull request #1426 from Unity-Technologies/corerp/scenerenderpipeline
Moved "SceneRenderPipeline.cs" out of editor folder
|
6 年前 |
|
GitHub
|
2274ce9d
|
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
|
6 年前 |
|
Remy
|
c582e4c5
|
Removed Editor only compilation condition that was not needed.
|
6 年前 |
|
GitHub
|
b4b3254a
|
Merge pull request #1436 from Unity-Technologies/corerp/scenerenderpipeline
Removed Editor only compilation condition that was not needed.
|
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 年前 |
|
Stephane Laroche
|
d85052d9
|
Merge branch 'master' into StackLit2
|
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 年前 |
|
sebastienlagarde
|
7f2358af
|
Move Checkout core function to CoreEditor + create file for shadowmapGUI + rename VSSEnabledto VCSEnabled
|
6 年前 |
|
GitHub
|
f3c9daff
|
Merge pull request #1477 from Unity-Technologies/Fix-issue-with-wrong-location-of-checkout
Move Checkout core function to CoreEditor + create file for shadowmapGUI
|
6 年前 |
|
GitHub
|
51a1873e
|
Merge branch 'master' into update-changelog
|
6 年前 |
|
Peter Bay Bastian
|
b4dd9062
|
Merge remote-tracking branch 'origin/master' into sg/facesign
|
6 年前 |
|
sebastienlagarde
|
4a622009
|
Merge branch 'master' into refactor-shader-variant-per-material
|
6 年前 |
Oliver Schnabel
|
3a15d806
|
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
|
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 年前 |
|
GitHub
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
6 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
Peter Bay Bastian
|
9c5843f7
|
Remove PostProcessing dependency from Core
|
6 年前 |
|
GitHub
|
981030f0
|
Merge pull request #1610 from Unity-Technologies/remove-core-postprocessing-dependency
Remove PostProcessing dependency from Core
|
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 年前 |
RSlysz
|
a7c6f9bf
|
Fix Awake issue
|
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 年前 |
|
Frédéric Vauchelles
|
11766c70
|
Added CoreRP Test project
Added CoreUnsafeUtils
fixed CoreUtils.QuickSort
|
6 年前 |
|
GitHub
|
236a0cd2
|
Merge pull request #1791 from Unity-Technologies/feature/CoreUnsafeUtils
Core test project and unsafe utilities
|
6 年前 |
|
sebastienlagarde
|
70377c07
|
Merge branch 'master' into HDRP/staging
|
6 年前 |
|
GitHub
|
6ec5b4df
|
Merge branch 'HDRP/staging' into IndirectLightingControlVolume
|
6 年前 |
|
Yao Xiaoling
|
a11976bf
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
|
6 年前 |
|
GitHub
|
b400b1c1
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
Frédéric Vauchelles
|
c2317504
|
Added support for oblique matrices in light loop culling
|
6 年前 |
|
GitHub
|
508e65a4
|
Merge pull request #1822 from Unity-Technologies/HDRP/fix/ObliqueLightLoop
Added support for oblique matrices in light loop culling
|
6 年前 |
|
GitHub
|
9a65725e
|
Merge pull request #1836 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
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 年前 |
Antoine Lelievre
|
91635f62
|
Fixed Unsupported API error message in the editor
|
6 年前 |
|
GitHub
|
eb16617a
|
Merge pull request #1844 from Unity-Technologies/FixUnsupportedAPIMessage
Fixed Unsupported API error message in the editor
|
6 年前 |
|
GitHub
|
5c6caff1
|
Merge pull request #1846 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
GitHub
|
01fdbb38
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
egomeh
|
507df163
|
Merge branch 'master' into lw/light-attenuation
|
6 年前 |
|
Remy
|
106a0d43
|
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
|
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 年前 |
|
GitHub
|
d2258e34
|
Merge pull request #1665 from Unity-Technologies/fix/coupling-hdlight-workflow
Fix/coupling Light-HDLight workflow waiting for a C++ PR #70472
|
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 年前 |
