981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
7 年前
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
033abbd6
More fixes with latest master.
7 年前
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
dae258a5
Refactored SkyManager to be able to handle several sky rendering context at the same time (baking, visual and lighting override sky)
7 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
75d76261
Merge pull request #692 from Unity-Technologies/Branch_SkySettingsVolume
Refactor of sky and fog to use interpolation volumes.
7 年前
cfa07646
Merge branches 'master' and 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
78563feb
Merge branch 'master'
7 年前
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
978e07e4
Moved resolution of sky rendering into global light loop settings in the HDRP asset (from the individual sky settings).
7 年前
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
87c36d52
merged with master
7 年前
9a375ba7
Merge pull request #722 from Unity-Technologies/Branch_SkyLightingOverride
Added Lighting Override through layer specific interpolation volumes
7 年前
4673aa9b
List of available skies is now generated from reflection information.
7 年前
5426acfa
Merge pull request #727 from Unity-Technologies/Branch_SkyLightingOverride
List of available skies is now generated from reflection information.
7 年前
f6f454a7
Fix issue with tessellation and shadow
7 年前
1d141127
Merge pull request #729 from Unity-Technologies/Fix-issue-with-shadow-and-tessellation-
Fix issue with tessellation and shadow
7 年前
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
c86b3214
Merge branch 'master'
7 年前
a95ec526
- Changed the way baking sky works (because it was broken with interpolation volumes becoming assets). It's now a dedicated component instead of a flag in a SkySettings
- Updated all test scenes accordingly
- Specified the right RenderPipeline on all our test scenes cameras.
7 年前
af279262
Merge pull request #765 from Unity-Technologies/Branch_FixBakingSky
Fixed baking sky after last interpolation volume upgrade
7 年前
7e74580b
Merge branch 'master'
7 年前
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
3ba5f5fc
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
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 年前
3ccf74cc
merged from master
7 年前
a533af44
Implemented height fog for linear and exponential fog.
7 年前
67a7cae5
Merge pull request #821 from Unity-Technologies/Branch_HeightFog
Implemented height fog for linear and exponential fog.
7 年前
c51ce48c
Merged master
7 年前
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
cf25c602
Merge master
7 年前
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
c4e4129a
Moved Cascade and Contact shadows settings to the volume system.
6 年前
5cfdaac3
Reversed rotation of HDRI sky to match legacy and removed it from procedural because it does not make sense there.
6 年前
841f635b
Merge pull request #980 from Unity-Technologies/Branch_ShadowsInVolume
Moved Cascade and Contact shadows settings to the volume system.
6 年前
41657818
Merge pull request #981 from Unity-Technologies/Branch_FixSkyRotation
Reversed rotation of HDRI sky to match legacy and removed it from pro…
6 年前
0d688467
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
6 年前
e649b50f
Moved HDShadowSettings and ContactShadowsEditor to the right folders.
6 年前
5d627ccc
Merge pull request #996 from Unity-Technologies/Branch_MoveShadowEditor
Moved HDShadowSettings and ContactShadowsEditor to the right folders.
6 年前
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
6 年前
c0e3d9ab
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
0a2033df
Merge upstream/master
6 年前
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
6 年前
8cc0d941
Merge SRP 2018.1
6 年前
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
6 年前
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
6 年前
c810e7d7
Fix issue with shader resource of sky
- Move all Sky shader to RenderPipeline resources to avoid error when
creating template
- Fix naming inconsistency with sky: skyHDRI => hdriSky SkyProcedural =>
ProceduralSky
6 年前
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
6 年前
81d84be4
Fix issue with shader resource of sky
- Move all Sky shader to RenderPipeline resources to avoid error when
creating template
- Fix naming inconsistency with sky: skyHDRI => hdriSky SkyProcedural =>
ProceduralSky
6 年前
dc6ad122
Merge pull request #1035 from Unity-Technologies/Fix-Sky-shader-resources
Fix sky shader resources
6 年前
0fe793d7
Merge 2018.1
6 年前
c9aa61bd
First draft
6 年前
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
6 年前
720c8a19
Merge branch 'master'
6 年前
dd8b51a8
Merge branch 'master'
6 年前
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
6 年前
e788c519
Port global density volumes to the interpolation volume system
6 年前
3a0290a2
Merge pull request #1225 from EvgeniiG/master
Port global density volumes to the interpolation volume framework (+ misc improvements)
6 年前
8cf60948
Merge remote-tracking branch 'mainrepo/master' into stacklit
6 年前
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 年前
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 年前
0be42a4f
Use correct terminology: rename "asymmetry" -> "anisotropy"
According to d'Eon, asymmetric scattering occurs due to anisotropic phase functions in anisotropic participating media.
6 年前
533beaae
Merge branch 'master' into LWRP
6 年前
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
6 年前
c3aaee56
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
6 年前
05ee75ca
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
e0b3d217
Merge branch 'master' into stacklit
6 年前
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
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 年前
fafb59af
Run code formatter.
6 年前
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 年前
381d8858
Add "Global Light Probe Dimmer" and tooltips for volumetrics
6 年前
87e8a616
Merge pull request #1609 from EvgeniiG/volumetrics_probe_dimmer
Add "Global Light Probe Dimmer" and tooltips for volumetrics
6 年前
7934a87a
Merge branch 'master' into LightUnits
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
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 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
5b782e23
Added an explicit option in SkySettings (only supported for now in Procedural Sky) to enable or disable the rendering of the sun disk when baking light and reflection probes.
This allows us to fix some bugs and discrepancy with the current framework.
6 年前
c072c88e
fix wrong namespace editor classes
6 年前
6e6f073b
Cleaned up sky editor setup for common settings.
6 年前
4312d844
Merge pull request #1730 from Unity-Technologies/hdrp/fix-namespaces
Hdrp/fix namespaces
6 年前
07c127ac
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
b3ff809b
Merge branch 'master' into tests/hdrp/distortion
6 年前
7ba755b2
Add lux unit for HDRI sky
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
59dc978c
Merge pull request #1727 from Unity-Technologies/HDRP/fix-sun-baking
Fixed some issues with ambient probe baking and reflection probe capture
6 年前
0bf2f4dd
Merge pull request #1766 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
6b451d7a
Merge branch 'master' into LuxIntensityForHDRISky And moved HDRI multiplier to the editor
6 年前
5f7f16a2
Merge branch 'master' into tests/hdrp/distortion
6 年前
d33e5edc
Cleanup HDRI sky code
6 年前
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7b744594
Merge branch 'master' into xrsettings
6 年前
3c29756a
Added comments
6 年前
3abc702e
Changed HDRI lux step value
6 年前
0f1f60cb
Add Gradient Sky from Laurent
6 年前
8b3692f4
Merge pull request #1776 from Unity-Technologies/LuxIntensityForHDRISky
Lux intensity for hdri sky
6 年前
6a81a760
Merge pull request #1777 from Unity-Technologies/GradientSky
Gradient sky
6 年前
2ea1dd98
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/staging
6 年前
458155fb
HDRP: Update comment of integrate HDRI and clean a little code
6 年前
a15bafc8
Remove warning in gradient sky shader
6 年前
89fdc601
Merge HDRP/staging
6 年前
a9c23607
Merge branch 'HDRP/staging' into Improve-bakeDiffuseLighting-code
6 年前
10164527
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/clean-proxy-volume
6 年前
de2e6ea2
Merge pull request #1783 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
Peter Bay Bastian
Julien Ignace
Evgenii Golubev
Raymond Graham
Felipe Lira
GitHub
sebastienlagarde
Frédéric Vauchelles
Paul Melamed
Peter Andreasen
Robert Srinivasiah
Remy
Mike Wuetherick
lyndon homewood
Sebastien Lagarde
John
uygar
John Parsaie
Stephane Laroche
Yao Xiaoling
Tim Cooper
Matt Dean
Nerites
Aleksandr Kirillov
Remi Slysz
Antoine Lelievre