Julien Ignace
58445897
Procedural sky now uses the Sky Framework (V1 functionality not tested)
8 年前
Julien Ignace
2ec18892
Merge branch 'master' into SkyFramework
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs
8 年前
GitHub
7fa32b4e
Merge pull request #47 from Unity-Technologies/SkyFramework
Skyframework
8 年前
Evgenii Golubev
8bbe4289
Merge remote-tracking branch 'upstream/master'
8 年前
Evgenii Golubev
9ae68594
Clean up and refactor the procedural sky
8 年前
Evgenii Golubev
4534d45f
Make sure the sky pass does not modify the alpha channel
8 年前
Evgenii Golubev
2f7b3af3
Update the sky code using the Adam demo source
8 年前
Evgenii Golubev
34315214
Set values of legacy built-in uniforms
8 年前
Evgenii Golubev
3f3f4548
Make sure the sky fully overwrites unoccluded parts of the frame
8 年前
Evgenii Golubev
59ed1885
Make small improvements to the procedural sky shader
8 年前
Evgenii Golubev
498f14dc
Remove a TODO
8 年前
Evgenii Golubev
bd1e1e95
Merge branch 'ProceduralSky'
8 年前
GitHub
980ae986
Merge pull request #62 from EvgeniiG/master
Update the implementation of the procedural sky model
8 年前
Julien Ignace
af076815
Merge branch 'master' into LayeredLit
8 年前
Tim Cooper
1ddcb9ee
Merge remote-tracking branch 'origin/master' into refactorentrypoint
8 年前
Evgenii Golubev
e195a008
Remove semicolons after macro definitions
8 年前
GitHub
f3e5d8cd
Merge pull request #70 from EvgeniiG/master
Improve the quality of EnvMap filtering
8 年前
sebastienlagarde
b890244e
HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline
8 年前
GitHub
23f2ee44
Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop
Renaming hdrenderloop to hd renderPipeline
8 年前
Felipe Lira
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
Julien Ignace
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
Arnaud Carre
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
Evgenii Golubev
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
b60bd965
HDRenderPipeline: Fix various issue with tesselatoin + depth offset
8 年前
GitHub
789af10a
Merge pull request #89 from Unity-Technologies/Add-tesselation
Add tesselation
8 年前
Julien Ignace
47800dae
Fixed a number of issues on PS4
- Some shaders not compiled for PS4
- Shaders testing depth when no depth buffer were bound (which works fine on DX11)
8 年前
Evgenii Golubev
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
886b32ec
HDRenderPipeline: update unlit shader
8 年前
GitHub
7f00e9f5
Merge pull request #96 from Unity-Technologies/Changed-transparent-opaque-Unlit-pass
Update unlit shader
8 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
Evgenii Golubev
6da9eb72
Implement a workaround for the case when disabling a keyword has no effect
I am referring to PERFORM_SKY_OCCLUSION_TEST.
8 年前
GitHub
f1780b9b
Merge pull request #97 from EvgeniiG/master
Implement a hotfix for the sky
8 年前
sebastienlagarde
90f00c89
Merge remote-tracking branch 'refs/remotes/origin/master' into Vertex-interpolator-and-tesselation-improvement
8 年前
Julien Ignace
c83f3d4a
Merge branch 'master' into Branch_fix-ps4-hdrenderloop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Unlit/Unlit.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/HDRISky/Resources/SkyHDRI.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/Resources/SkyProcedural.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/Resources/GGXConvolve.shader
8 年前
GitHub
d23fdad9
Merge pull request #102 from Unity-Technologies/Branch_fix-ps4-hdrenderloop
Branch fix ps4 hdrenderloop
8 年前
sebastienlagarde
b59196ee
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-ParallaxOcclusionMapping
8 年前
Evgenii Golubev
ddd20ccc
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
ddbfc573
Fix sky rendering bugs
8 年前
GitHub
fe3b2295
Merge pull request #103 from EvgeniiG/master
Fix sky rendering bugs
8 年前
sebastienlagarde
5a9cce71
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-ParallaxOcclusionMapping
8 年前
Evgenii Golubev
8b521e10
Merge branch 'master' into SSSSS
8 年前
Juho Oravainen
4320bff0
Initial metal support kickoff. Tweaked shader pragma targets from 5.0 to 4.5. Added metal to only_renderers lists. Added initial platform header API/Metal.hlsl. Couple of include paths changed to absolute until a bugfix lands on Unity side.
8 年前
GitHub
2ba6f819
Merge pull request #108 from Unity-Technologies/metal
Initial macOS Metal support for HDRenderPipeline + some iOS fixes in FTPL
8 年前
Evgenii Golubev
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
21be7561
Merge branch 'master' into SSSSS
8 年前
Tim Cooper
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
Tim Cooper
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Paul Demeulenaere
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
Evgenii Golubev
b1a7cdc0
Fix the flipped Y axis (due to a D3D convention) for the procedural sky
8 年前
GitHub
85cd5542
Merge pull request #117 from EvgeniiG/master
Fix the flipped Y axis (due to a D3D convention) for the procedural sky
8 年前
Evgenii Golubev
399b7f4d
Prevent the rotation of the sun with the sky
8 年前
Evgenii Golubev
fa646a10
Separate "scatter push" for Rayleigh and Mie
8 年前
GitHub
906bb804
Merge pull request #119 from EvgeniiG/master
Tweak the behavior of the procedural sky
8 年前
Tim Cooper
8ff712ff
Merge branch 'master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/ProceduralSkyRenderer.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Utilities.cs
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 年前
Felipe Lira
be52007a
Merge branch 'master' into lowendmobile
8 年前
Evgenii Golubev
ac23a82e
Merge branch 'master' into SSSSS
8 年前
Evgenii Golubev
9fc5bc97
Fix typos
8 年前
Evgenii Golubev
0ca79425
Merge branch 'SSSSS'
8 年前
GitHub
d00136e3
Merge pull request #128 from EvgeniiG/master
Add the initial implementation of SSS
8 年前
Julien Ignace
df95d960
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
8 年前
sebastienlagarde
b2595e70
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
9cecdb2e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Antti Tapaninen
8c1ebfeb
explicitly set _CameraDepthTexture precision
8 年前
GitHub
e2f52112
Merge pull request #132 from Unity-Technologies/metal
Metal
8 年前
sebastienlagarde
f3984098
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Julien Ignace
506c1212
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
8 年前
Julien Ignace
0da32ed1
Merge branch 'master' into Branch_DebugLighting
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
538bf3b2
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carré arnaud@unity3d.com
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
Arnaud Carre
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
Sebastien Lagarde
a1e0f1e9
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline
- Rename all "loop" name to "pipeline" name for FPTL/Basic/HD
- Update all include in HDRenderPipeline to match C++ #include path that
is Asset/ScriptableRenderPipeline
Caution: This PR require the new C++ code
8 年前
GitHub
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
runes
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
sebastienlagarde
dede83da
HDRednerPipeline: Fix issue with sky + do HDR capture of reflection probe
- sky is now cull correctly
8 年前
GitHub
41110934
Merge pull request #165 from Unity-Technologies/HDR-capture-for-reflection-probe
Hdr capture for reflection probe
8 年前
Evgenii Golubev
a5c5f339
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carre
3c290788
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
8 年前
runes
cb7bce50
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
2b3c73fa
Changed the way we handle reading into the bound depth buffer.
- Now Depth buffer is not copied anymore on PS4
- On other platform, depth buffer is used only once and the copy is used as a texture in all shader that need it. Depth Buffer Render Target is no longer changed.
8 年前
GitHub
5cb0e855
Merge pull request #173 from Unity-Technologies/Branch_CopyDepthTexture
Branch copydepthtexture
8 年前
runes
84860a17
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carre
b38bced1
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
8 年前
runes
c445e599
Explicit tile coordinates in GetPositionInput.
~10% faster tile deferred light evaluation in compute
8 年前
Antti Tapaninen
bfd69072
Merge branch 'master' into metal-ios
8 年前
Antti Tapaninen
2cce2981
Merge branch 'master' into metal
8 年前
sebastienlagarde
ddd7d5d5
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
GitHub
86dbe5d8
Merge pull request #192 from Unity-Technologies/Update-To-relative-path
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
Rune Stubbe
e210fc3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
764e5269
Merge branch 'master' into metal-ios
8 年前
uygar
cefe8b15
Merge branch 'master' into shadows
8 年前
Felipe Lira
557acdfd
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
8 年前
Antti Tapaninen
0574ef6b
Merge branch 'master' into metal
8 年前
Arnaud Carre
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
8 年前
runes
918c1797
Feature flags now also include material/gbuffer flags.
8 年前
Evgenii Golubev
ed990060
Merge from upstream
8 年前
Antti Tapaninen
101239a7
Merge branch 'master' into metal-ios
8 年前
Julien Ignace
954a22ef
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ExportSky
8 年前
Antti Tapaninen
c46cb0b5
Merge branch 'master' into metal
8 年前
vlad-andreev
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
uygar
8db09493
Merge branch 'master' into shadows
8 年前
Filip Iliescu
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
Evgenii Golubev
7758c3b3
Add a "Max Sky Distance" parameter to the procedural sky
8 年前
GitHub
6c4b8ea7
Merge pull request #248 from EvgeniiG/small_sky_improvements
Add a "Max Sky Distance" parameter to the procedural sky
8 年前
sebastienlagarde
0ded8f98
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/TestScenes/HDTest/GraphicTest/SSS/head.OBJ.meta
8 年前
Evgenii Golubev
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
3a226917
merged master
8 年前
Arnaud Carre
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
Evgenii Golubev
70499455
Switch to HDCamera matrices (WIP, shadows have not yet been fixed)
8 年前
Evgenii Golubev
d8386bd4
Address the PR feedback
8 年前
GitHub
1fb45557
Merge pull request #318 from EvgeniiG/hdrp_matrix
Set HDRP matrices from scripts (except shadows)
8 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
Arnaud Carre
b7e36e2f
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl.meta
# Assets/TestScenes/HDTest/HDRenderLoopTest.meta
# Assets/TestScenes/HDTest/NewBatcherTest/skin.meta
7 年前
Evgenii Golubev
69b2a277
Implement computation of the view vector from the screen space coordinate
7 年前
runes
dd5838bd
sample game delta:
-FPS Mode (Render mesh with custom FOV)
-only PCF shadows with game specific limits
-Atmosphere y-offset property
7 年前
GitHub
0547ff04
Merge pull request #378 from EvgeniiG/master
Remove the sky mesh which caused a memory leak
7 年前
Peter Bay Bastian
a1133cd9
Update #includes of ShaderLibrary to new path
7 年前
Peter Bay Bastian
f8b46ea3
Merge remote-tracking branch 'origin/master' into restructuring
7 年前
GitHub
05ffcc95
Merge pull request #379 from Unity-Technologies/restructuring
Restructuring
7 年前
Felipe Lira
024a70fc
Merged master.
7 年前
Tim Cooper
e0e3492b
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Peter Bay Bastian
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
runes
6a0e0e87
fixed compilation error in SkyProcedural.shader
7 年前
Evgenii Golubev
bb1bc475
Fix camera-relative rendering of the procedural sky
7 年前
Sebastien Lagarde
f8e4f5df
Merge remote-tracking branch 'refs/remotes/origin/master' into bent-normal-and-specular-occlusion
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
sebastienlagarde
93ab200c
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-multibounce-approximation-on-AO-
7 年前
Evgenii Golubev
1bfec348
Add ShaderVariables.hlsl to the procedural sky shader
7 年前
sebastienlagarde
bf01ba3b
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-multibounce-approximation-on-AO-
7 年前
sebastienlagarde
1ec4ca3b
Merge remote-tracking branch 'refs/remotes/origin/master' into specular-occlusion
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/CommonLighting.hlsl
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
Felipe Lira
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
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 年前
Mikko Strandborg
a2a3c47b
Add vulkan to the list of only_renderers in all the shaders
7 年前
GitHub
18d42f5f
Merge pull request #524 from Unity-Technologies/vulkan
Vulkan support for scriptable renderpipe.
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Evgenii Golubev
d1c74bcb
Merge branch 'master'
7 年前
Peter Bay Bastian
9dd5e5c5
Change shader include paths to take advantage of Core being an include path now
7 年前
Peter Bay Bastian
b7db3ef9
Merge branch 'shader-include-paths-2'
7 年前
Frédéric Vauchelles
fe773302
Merge master
7 年前
Remy
39c80121
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Julien Ignace
1308feb1
Merge branch 'feature/realtimeCubemap' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Sebastien Lagarde
d6a7fcd6
HDRenderPipeline; Clean include of Color.hlsl
7 年前
Sebastien Lagarde
e5ebb9cb
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.cs
7 年前
Evgenii Golubev
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Remy
5b6ad5e8
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Frédéric Vauchelles
6541de0b
Merge master
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
Paul Melamed
68425c93
Merge branch 'master' into prototype/decals
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
sebastienlagarde
0feb39a6
HDRenderPipeline: Add xboxone support
7 年前
GitHub
4b15e9fc
Merge pull request #651 from Unity-Technologies/add-xbone-one-support
Add xbone one support
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
sebastienlagarde
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
Julien Ignace
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
sebastienlagarde
4b26e012
Move all core file to subfolder CoreRP + update shader include path to CoreRP/ShaderLibrary
7 年前
GitHub
3be07b99
Merge pull request #710 from Unity-Technologies/Move-Core-to-CoreRP
Move all core file to subfolder CoreRP + update shader include path t…
7 年前
Julien Ignace
713d15c0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
sebastienlagarde
15efd9d7
Merge branch 'master' into Convert-shaderLibrary-to-half-float-support
7 年前
Frédéric Vauchelles
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
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 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
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
c86b3214
Merge branch 'master'
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 年前
Kay Chang
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Sebastien Lagarde
e319fe72
minor comment correction
7 年前
Sebastien Lagarde
90e761b6
HDRenderPipeline: Fix misc compiler warning
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 年前
sebastienlagarde
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
John
cf25c602
Merge master
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 年前
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 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
Sebastien Lagarde
60bcac15
Fix several shader and C# warning
7 年前
Sebastien Lagarde
edfea7bc
Fix several shader and C# warning
7 年前
GitHub
a29f9db9
Merge pull request #1010 from Unity-Technologies/fix-shader-warning
Fix several shader and C# warning
7 年前
Joel de Vahl
56f21e1e
Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades
7 年前
Remy
50623c84
Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader
7 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
7 年前
Robert Srinivasiah
7733d48a
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前