Frédéric Vauchelles
|
6bdf3918
|
[HDCameraEditor] (wip)
|
7 年前 |
Frédéric Vauchelles
|
6776e8eb
|
[HDCameraEditor] Added additional fields
|
7 年前 |
Frédéric Vauchelles
|
459facc7
|
[HDCameraEditor] Added handles for camera editor
|
7 年前 |
Frédéric Vauchelles
|
b9c816c4
|
[HDCameraEditor] Synchronize PostProcessLayer and HDAdditionalCameraData for preview camera
|
7 年前 |
Frédéric Vauchelles
|
e2ea3e8a
|
[HDCameraEditor] Refactored fields and removed unused ones
|
7 年前 |
Frédéric Vauchelles
|
33ee8d29
|
[HDCameraEditor] Update UI
|
7 年前 |
Frédéric Vauchelles
|
7f9cfba3
|
[HDCameraEditor] Properly instantiate ColorTarget for preview camera
|
7 年前 |
Frédéric Vauchelles
|
a9063dca
|
[HDCameraEditor] refactored Inspector fields
|
7 年前 |
Frédéric Vauchelles
|
43c18028
|
[HDCameraEditor] Refactored drawers for frame settings
|
7 年前 |
Frédéric Vauchelles
|
ccc9a3ac
|
[HDCameraEditor] Refactoring of FrameSettings UI
|
7 年前 |
Frédéric Vauchelles
|
d1775233
|
[HDCameraEditor] fixde fade group issue
|
7 年前 |
Frédéric Vauchelles
|
3a51c9b2
|
[HDCameraEditor] Refactored UI Framework
|
7 年前 |
Frédéric Vauchelles
|
3a8bf9f8
|
[HDCameraEditor] Moved Camera utilities to Core
|
7 年前 |
Frédéric Vauchelles
|
29bbf288
|
Fixed invalid namespace
|
7 年前 |
sebastienlagarde
|
29acffeb
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
Evgenii Golubev
|
b8684ef4
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
|
7 年前 |
Frédéric Vauchelles
|
a481f7fa
|
[HDRenderPipelineEditor] Updated HDRenderPIpelineInspector
|
7 年前 |
GitHub
|
df79ad0d
|
Merge pull request #760 from Unity-Technologies/feature/HDRenderPipelineEditor
HDRenderPipelineInspector
|
7 年前 |
sebastienlagarde
|
45993046
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
|
7 年前 |
Evgenii Golubev
|
7e74580b
|
Merge branch 'master'
|
7 年前 |
Frédéric Vauchelles
|
790cee43
|
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
|
7 年前 |
Frédéric Vauchelles
|
3f5a5830
|
[PlanarReflection] (wip) added capture camera gizmos
|
7 年前 |
Julien Ignace
|
03e54099
|
(WIP) Changed all HDRP RenderTextures to RTHandles
|
7 年前 |
Sebastien Lagarde
|
0e6b2e32
|
more improvement on framesettings and asset
- Suppres support async compute
- Add dirty state to asset render pipeline for frame settings
|
7 年前 |
GitHub
|
376bd45a
|
Merge pull request #839 from Unity-Technologies/Fix-issue-with-camera-frame-settings
Fix issue with camera frame settings
|
7 年前 |
Sebastien Lagarde
|
c032196d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
Sebastien Lagarde
|
b32a2d17
|
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
|
7 年前 |
Evgenii Golubev
|
75799cbf
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
|
7 年前 |
Remy
|
c3c7eec1
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
|
7 年前 |
Sebastien Lagarde
|
a5003db5
|
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
|
7 年前 |
Frédéric Vauchelles
|
749e692a
|
[HDCameraEditor] Fixed frame settings debug for camera preview
|
7 年前 |
GitHub
|
5b4c84ab
|
Merge pull request #844 from Unity-Technologies/fix/PreviewDebugFrameSettings
[HDCameraEditor] Fixed frame settings debug for camera preview
|
7 年前 |
sebastienlagarde
|
1d94ca60
|
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
|
7 年前 |
sebastienlagarde
|
174630e7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
uygar
|
81cb95dc
|
Merge branch 'master' into shadows-biasing
|
7 年前 |
John
|
ba0245c3
|
Merge branch 'master' into LW-ScreenSpaceShadows
|
7 年前 |
Frédéric Vauchelles
|
d6743fba
|
Merge branch 'master' into feature/PlanarReflection
|
7 年前 |
Peter Andreasen
|
8b8ef607
|
Merge remote-tracking branch 'origin/master' into sample_game
|
7 年前 |
Julien Ignace
|
19029ddd
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
|
7 年前 |
GitHub
|
84e022c3
|
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
|
7 年前 |
sebastienlagarde
|
2bae089c
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
|
7 年前 |
Evgenii Golubev
|
7e4a3052
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
GitHub
|
fe0284c8
|
Merge branch 'master' into HDRP_GraphicTests
|
7 年前 |
sebastienlagarde
|
6feb2d00
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
|
7 年前 |
Paul Melamed
|
19876ed2
|
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
7 年前 |
sebastienlagarde
|
c3198024
|
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
|
7 年前 |
Tim Cooper
|
803d7f40
|
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
|
7 年前 |
John
|
89a55fab
|
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
|
7 年前 |
John
|
0bfdddfc
|
Merge Screen Shadows
|
7 年前 |
Julien Ignace
|
950b560d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
|
7 年前 |
sebastienlagarde
|
83b753ad
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
Sebastien Lagarde
|
eca15a2d
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
|
7 年前 |
GitHub
|
a6688080
|
Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring
Refactoring of HDRP render texture usage using RTHandles
|
7 年前 |
Frédéric Vauchelles
|
78ba9e5b
|
Merge master
|
7 年前 |
sebastienlagarde
|
b1b2e631
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
7 年前 |
Frédéric Vauchelles
|
0aed191f
|
[UI] Removed animation on foldouts
|
7 年前 |
GitHub
|
249256e5
|
Merge pull request #923 from Unity-Technologies/fix/RemoveAnimationFoldouts
[UI] Removed animation on foldouts
|
7 年前 |
Remy
|
5197454b
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity
|
7 年前 |
Robert Srinivasiah
|
44fabb65
|
Merge branch 'master' into hdrp-xr-initial
|
7 年前 |
John
|
3174776d
|
Merge branch 'master' into LW-ScreenSpaceShadows
|
7 年前 |
John
|
0a72692b
|
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
|
7 年前 |
sebastienlagarde
|
301dbf72
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
|
7 年前 |
sebastienlagarde
|
5e5e46c8
|
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
|
7 年前 |
Remy
|
619cd52e
|
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
|
7 年前 |
sebastienlagarde
|
35560656
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
7 年前 |
Paul Melamed
|
75b17fab
|
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/Decal.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/DecalUtilities.hlsl
|
7 年前 |
Evgenii Golubev
|
070349c8
|
Merge branch 'master'
|
7 年前 |
sebastienlagarde
|
a450e83a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
Frédéric Vauchelles
|
3367a6e0
|
Removed animated fade groups
|
7 年前 |
GitHub
|
f31e3dc9
|
Merge pull request #945 from Unity-Technologies/fix/RemoveAnimatedFadeGroups
Removed animated fade groups
|
7 年前 |
sebastienlagarde
|
44c4a197
|
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
|
7 年前 |
Evgenii Golubev
|
e768893e
|
Merge branch 'master'
|
7 年前 |
Remy
|
d56ea57d
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
|
7 年前 |
Robert Srinivasiah
|
a3ddcd05
|
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
|
7 年前 |
sebastienlagarde
|
2c61701c
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
7 年前 |
Sebastien Lagarde
|
32b1fe35
|
HDRenderPipeline: Add support for camera features flags
|
7 年前 |
GitHub
|
584f2e00
|
Update HDCameraUI.cs
|
7 年前 |
GitHub
|
e9c5ba18
|
Merge pull request #959 from Unity-Technologies/Add-support-of-Camera-Clear-Flags
HDRenderPipeline: Add support for camera features flags
|
7 年前 |
Robert Srinivasiah
|
736da156
|
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
|
7 年前 |
Peter Andreasen
|
04b933d9
|
merged with master
|
7 年前 |
sebastienlagarde
|
e347d974
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
7 年前 |
Paul Melamed
|
429be124
|
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
|
7 年前 |
Thomas
|
44dd9f42
|
Merge branch 'master' into debug-menu-refactor
|
7 年前 |
Evgenii Golubev
|
2d48e00b
|
Merge branch 'master'
|
7 年前 |
Evgenii Golubev
|
3ad3c7d7
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
Julien Ignace
|
4b17c74c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
|
7 年前 |
Remy
|
2001df3c
|
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
|
7 年前 |
sebastienlagarde
|
8d0fc95d
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
Thomas
|
8b30d5b8
|
Added a first set of physical settings to HDCamera
Needed for physical light units
|
7 年前 |
GitHub
|
6602ff66
|
Merge pull request #977 from Unity-Technologies/physcam-settings
Added a first set of physical settings to HDCamera
|
7 年前 |
sebastienlagarde
|
baa79a02
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
Evgenii Golubev
|
0a2033df
|
Merge upstream/master
|
7 年前 |
John Parsaie
|
8cc0d941
|
Merge SRP 2018.1
|
7 年前 |
Frédéric Vauchelles
|
fd3d298d
|
Merge branch 'master' into feature/ReflectionProbeBaking
|
7 年前 |
Remy
|
8bbade68
|
Add "Remove HD *" context menu items for light / reflection probe / camera
|
7 年前 |
GitHub
|
9acee18f
|
Merge pull request #1031 from Unity-Technologies/Remove_HD_Components_ContextMenu
Add "Remove HD *" context menu items for light / reflection probe / camera
|
7 年前 |
Paul Melamed
|
07ab7b09
|
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
7 年前 |
sebastienlagarde
|
02280c4b
|
Fix shader warning, shadow warning and hide physical camera parameter
|
7 年前 |
Aleksandr Kirillov
|
34c25f1b
|
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
|
7 年前 |
Remy
|
cc4d54eb
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
|
7 年前 |
sebastienlagarde
|
dc7c8312
|
Fix shader warning, shadow warning and hide physical camera parameter
|
7 年前 |
GitHub
|
f2d0e0d2
|
Merge pull request #1048 from Unity-Technologies/More-warning-fix
Fix shader warning, shadow warning and hide physical camera parameter
|
7 年前 |
John Parsaie
|
40539650
|
Merge branch '2018.1' into projects/TheLastStand
|
7 年前 |
sebastienlagarde
|
aa772a18
|
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
|
7 年前 |
Evgenii Golubev
|
720c8a19
|
Merge branch 'master'
|
7 年前 |
Evgenii Golubev
|
dd8b51a8
|
Merge branch 'master'
|
7 年前 |
Frédéric Vauchelles
|
d1dfdb4e
|
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
|
7 年前 |
sebastienlagarde
|
173086c6
|
Enable Additional component in UI
|
7 年前 |
Remy
|
5033b09a
|
Add init function for HD Camera data. When the additional camera data is created on a camera it now correclty grabs the clear flags.
|
7 年前 |
GitHub
|
44b0c2bc
|
Merge pull request #1172 from Unity-Technologies/HDCameraDataInit
Add init function for HD Camera data. …
|
7 年前 |
GitHub
|
add8fa72
|
Merge pull request #1173 from Unity-Technologies/Enable-Additional-component-in-UI
Enable Additional component in UI
|
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 年前 |
Frédéric Vauchelles
|
4bd00e90
|
Merge master
|
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 年前 |
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
7 年前 |
Evgenii Golubev
|
e7f0a6d1
|
Fix issues with light leaking in volumetric lighting
(due to sub-allocation (resource aliasing) of the RTHandle system)
|
7 年前 |
GitHub
|
c3aaee56
|
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
|
7 年前 |
sebastienlagarde
|
05ee75ca
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
7 年前 |
sebastienlagarde
|
9ab1b257
|
more fix on hdCamera and frameSettings
|
7 年前 |
GitHub
|
17d5bb27
|
Merge pull request #1327 from Unity-Technologies/Add-FrameSettings-to-hdCamera
Add framesettings to hdcamera
|
7 年前 |
Stephane Laroche
|
e0b3d217
|
Merge branch 'master' into stacklit
|
7 年前 |
sebastienlagarde
|
71170c2a
|
Fix camera preview - Remove obsolete code
|
7 年前 |
sebastienlagarde
|
fa4df596
|
Fix camera editor preview
|
7 年前 |
GitHub
|
522f0a34
|
Merge pull request #1333 from Unity-Technologies/Fix-camera-preview
Misc fix on camera preview and regular preview with planar reflection
|
7 年前 |
Jean-François F Fortin
|
a2ee3145
|
Merge branch 'master' into stacklit
|
7 年前 |
sebastienlagarde
|
64f35bd6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
|
7 年前 |
Felipe Lira
|
25e45b36
|
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
7 年前 |
Felipe Lira
|
63a6fe03
|
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
7 年前 |
Evgenii Golubev
|
1f059c6b
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
7 年前 |
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
|
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 年前 |
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
7 年前 |
sebastienlagarde
|
b6c5c9e7
|
Coupling HDCamera and HDAdditionalCameraData for reset/remove
|
6 年前 |
sebastienlagarde
|
eebff28e
|
Update ResetLight name to ResetCamera
|
6 年前 |
Julien Ignace
|
a66ac281
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPreIntegratedFGD
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
|
6 年前 |
sebastienlagarde
|
9e61669d
|
Fix/coupling hdcamera workflow
|
6 年前 |
GitHub
|
355693fa
|
Merge pull request #1697 from Unity-Technologies/fix-coupling-of-camera-workflow
Fix/coupling hdcamera workflow
|
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 年前 |
Remi Slysz
|
c072c88e
|
fix wrong namespace editor classes
|
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 年前 |
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
|
057e32db
|
Added the possibility to setup an override transform for volume interpolation.
|
6 年前 |
GitHub
|
1eda00e6
|
Merge pull request #1762 from Unity-Technologies/HDRP/volume-anchor-override
Hdrp/volume anchor override
|
6 年前 |
Julien Ignace
|
5bfcc8cd
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
|
6 年前 |
GitHub
|
0bf2f4dd
|
Merge pull request #1766 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
Yao Xiaoling
|
4d7a5d51
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
|
6 年前 |
Antoine Lelievre
|
6b451d7a
|
Merge branch 'master' into LuxIntensityForHDRISky And moved HDRI multiplier to the editor
|
6 年前 |
Remy
|
5f7f16a2
|
Merge branch 'master' into tests/hdrp/distortion
|
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 年前 |