Julien Ignace
58445897
Procedural sky now uses the Sky Framework (V1 functionality not tested)
8 年前
Tim Cooper
2b3f2f91
[refactor namespace]
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering.{LoopName}
8 年前
GitHub
4925d00e
Merge pull request #77 from Unity-Technologies/namespace-refactor
[refactor namespace]
8 年前
Evgenii Golubev
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
c5bf4cfb
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitSurfaceData.hlsl
8 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
Arnaud Carre
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
sebastienlagarde
7f832617
HDRenderPipeline: Update sky editor
7 年前
Evgenii Golubev
a449e3ad
Merge branch 'master' (area light clear coat code is disabled for now)
7 年前
Julien Ignace
39c4d3b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameLayeredShader
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
Sebastien Lagarde
1641bba9
HDRenderPipeline: Fix various warning in csharp and shader
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
Felipe Lira
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
7 年前
Thomas
076b0d65
Cleaned up unused usings
7 年前
GitHub
89072748
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
7 年前
sebastienlagarde
71713559
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
GitHub
f49bc2d1
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Sebastien Lagarde
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Evgenii Golubev
8d403196
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Evgenii Golubev
ea93b8f4
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Julien Ignace
6b9ad1a2
Ported Legacy Unity procedural sky to HDRP and renamed our ProceduralSky to BlacksmithSky (pending removal)
7 年前
Julien Ignace
4a214e97
- Fixed shader compilation errors on PS4
- Fixed auto-merge mistake
- Renamed blend mode to more artists friendly names and removed SoftAdd mode.
7 年前
GitHub
6ef6a1b3
Merge pull request #503 from Unity-Technologies/Branch_FogAndProceduralSky
Branch fog and procedural sky
7 年前
GitHub
2df3e46a
Merge branch 'Unity-2017.3' into feature/transparentSpecularBlending
7 年前
Evgenii Golubev
733171ce
Merge branch 'Unity-2017.3'
7 年前
GitHub
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Felipe Lira
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Julien Ignace
10007208
Porting sky/fog systems to Interpolation volumes.
7 年前
Julien Ignace
033abbd6
More fixes with latest master.
7 年前
GitHub
75d76261
Merge pull request #692 from Unity-Technologies/Branch_SkySettingsVolume
Refactor of sky and fog to use interpolation volumes.
7 年前
sebastienlagarde
cfa07646
Merge branches 'master' and 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Evgenii Golubev
78563feb
Merge branch 'master'
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Paul Melamed
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 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Robert Srinivasiah
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 年前
Remy
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 年前
Felipe Lira
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 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
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 年前
Julien Ignace
5cfdaac3
Reversed rotation of HDRI sky to match legacy and removed it from procedural because it does not make sense there.
7 年前
GitHub
41657818
Merge pull request #981 from Unity-Technologies/Branch_FixSkyRotation
Reversed rotation of HDRI sky to match legacy and removed it from pro…
7 年前
Sebastien Lagarde
0d688467
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Peter Bay Bastian
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
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 年前
Julien Ignace
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.
7 年前
Julien Ignace
6e6f073b
Cleaned up sky editor setup for common settings.
7 年前
Antoine Lelievre
7ba755b2
Add lux unit for HDRI sky
7 年前
GitHub
59dc978c
Merge pull request #1727 from Unity-Technologies/HDRP/fix-sun-baking
Fixed some issues with ambient probe baking and reflection probe capture
7 年前
GitHub
0bf2f4dd
Merge pull request #1766 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
7 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
7 年前
Antoine Lelievre
6b451d7a
Merge branch 'master' into LuxIntensityForHDRISky And moved HDRI multiplier to the editor
7 年前
Remy
5f7f16a2
Merge branch 'master' into tests/hdrp/distortion
7 年前
Nerites
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
GitHub
7b744594
Merge branch 'master' into xrsettings
7 年前
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 年前