Peter Bay Bastian
8e2b60cd
Move non-shipping pipelines to TestbedPipelines/
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 年前
Felipe Lira
62e3c403
Merged master.
7 年前
Peter Bay Bastian
9a0518a6
Add render pipeline switcher component to test scenes, such that the relevant render pipeline is selected when the scene is opened
7 年前
Felipe Lira
6d592a3d
Merge branch 'master' into LightweightPipeline
7 年前
Peter Bay Bastian
87db2a13
Fix shader include paths in OnTileDeferred shader
7 年前
Evgenii Golubev
4898d174
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into volumetrics
7 年前
Felipe Lira
a2c2ce7f
Merge branch 'master' into LightweightPipeline
7 年前
rthompson-unity
7e1b650c
Added async compute to fptl light list build. Removed shader that was not in use and causing compile errors on ps4
7 年前
rthompson-unity
9d156845
Further fptl tidy up
7 年前
GitHub
cf23ecf8
Merge pull request #390 from Unity-Technologies/fptl_async_compute
Added async compute to fptl light list build.
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
sebastienlagarde
b748a6bc
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Julien Ignace
af05920d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DeferredDirShadow
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/RenderPipelineResources.cs
7 年前
rthompson-unity
8ce77600
Removed all use of GPUFences if async compute is not in use. Fixed a missing command buffer release in PushGlobalParams
7 年前
GitHub
60b5ff01
Merge pull request #397 from Unity-Technologies/fptl-asyncfence-changes
Removed all use of GPUFences if async compute is not in use. Fixed a …
7 年前
Peter Andreasen
ece831c7
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
eb326aeb
Merge remote-tracking branch 'refs/remotes/origin/master' into new-light-editor
7 年前
Filip Iliescu
3f9c0792
fix regression in testbed ontile renderpipe introduced by shadow UI changes
7 年前
Peter Andreasen
69c448b2
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Felipe Lira
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
7 年前
Evgenii Golubev
57aa5358
Fix light culling while rendering reflection probes
'camera.worldToCameraMatrix' has a positive determinant (flip Y and Z) when rendering reflection probes, yet has a negative determinant (flip Z) in the case of the regular scene rendering.
7 年前
GitHub
0682a517
Merge pull request #405 from EvgeniiG/refl_probe_fix
Fix light culling while rendering reflection probes
7 年前
mmikk
bd6c2940
minor clean up
minor clean up
7 年前
Filip Iliescu
01af8d1b
minor cleanup and silence more strict warnings
7 年前
Peter Andreasen
c62bfeca
Merged with master
7 年前
Felipe Lira
68c6f48c
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Evgenii Golubev
24906cf6
Implement a small optimization of the texture cache
7 年前
Julien Ignace
61fc8ab8
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DepthPrepass
7 年前
sebastienlagarde
771c8d04
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
d5b454e5
Merge pull request #429 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Thomas
1763810c
Removed a few annoying warnings
7 年前
Thomas
9582c28d
Moved back GetRenderPipelineMaterialList to HDUtils as it's HDRP specific
7 年前
GitHub
720185a2
Merge pull request #451 from Unity-Technologies/refactor-episode-3
Refactoring: Episode 3 - The GC Apocalypse
7 年前
sebastienlagarde
0e87ca3f
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Distortion-cleanup-and-transparent-depth-pass
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 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
vlad-andreev
8f499afb
light/probe lists reference implementation
7 年前
vlad-andreev
738479fe
cleanup
7 年前
Thomas
3a53b044
MSVO integration
Don't forget to update the postfx submodule!
7 年前
GitHub
bd6266f8
Merge pull request #475 from Unity-Technologies/lightlists
light/probe lists reference implementation
7 年前
GitHub
2aaf18a7
Merge pull request #478 from Unity-Technologies/lightlists
Lightlists
7 年前
GitHub
377ca98b
Revert "light/probe lists reference implementation"
7 年前
GitHub
8efa8732
Revert "Lightlists"
7 年前
GitHub
be80c8a3
Merge pull request #477 from Unity-Technologies/revert-475-lightlists
Revert "light/probe lists reference implementation"
7 年前
GitHub
dec47209
Merge pull request #479 from Unity-Technologies/revert-478-lightlists
Revert "Lightlists"
7 年前
GitHub
aca7c5b3
Revert "Revert "light/probe lists reference implementation""
7 年前
GitHub
39471547
Merge pull request #480 from Unity-Technologies/revert-477-revert-475-lightlists
Revert "Revert "light/probe lists reference implementation""
7 年前
GitHub
9d30417f
Merge pull request #482 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Sebastien Lagarde
d36f89ad
add files
7 年前
GitHub
59c35fd3
Merge pull request #484 from Unity-Technologies/Recreate-light-list-PR
Recreate light list pr
7 年前
GitHub
32bdbbfa
Merge pull request #485 from Unity-Technologies/msvo
Added multi-scale volumetric obscurance support (from postfx v2)
7 年前
Felipe Lira
cdc50657
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Peter Andreasen
e2332032
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Sebastien Lagarde
9f87b816
Remove file path header from shader generator generated files as it depends on users folder and cause conflict
7 年前
Sebastien Lagarde
913bffab
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Change-SSS-profile-to-16
7 年前
Julien Ignace
1e8876bf
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForwardUnlit.hlsl
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 年前
Salvador Jacobi
9464aaa0
Organize menu items
7 年前
Salvador Jacobi
7e2993a1
Correct menu items that should be internal/not internal
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
GitHub
9a371093
Merge pull request #556 from salvadorj/organize-menu-items
Organize menu items
7 年前
Julien Ignace
f901ecbc
Realtime Reflection Probes WIP: Implemented Specific Reflection Probe cache and do the GGX convolution on GPU for every probes.
7 年前
Julien Ignace
1a5590ab
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# TestbedPipelines/OnTileDeferredPipeline/OnTileDeferredRenderPipeline.cs
7 年前
Julien Ignace
8b37cbb5
Reflection Probe Cache: Handled input of the wrong size/format with an additional conversion step.
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
0d71d873
Re-factor Shadow.hlsl in core such that the user of the library is including things instead. This is required for package usage, as Core package cannot depend on anything outside itself.
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 年前
GitHub
b13cc702
Merge pull request #612 from Unity-Technologies/feature/realtimeCubemap
Feature/realtime cubemap
7 年前
Remy
c22205d7
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Peter Andreasen
b6423cf9
merge
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 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Arnaud Carre
efa76805
added some required "using UnityEngine.Rendering" (now SRP API is not in Experimental namespace anymore)
7 年前
Arnaud Carre
881e0ad2
Refactor to match c++ engine for:
DrawRendererSettings -> DrawSettings
FilterRenderersSettings -> FilterSettings
DrawSortSettings -> SortSettings
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 年前
Sebastien Lagarde
88ce2f72
Misc minor fix (meta + missing CoreRP/ in include for onTile path)
7 年前
Julien Ignace
f6a78dc5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
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 年前
Evgenii Golubev
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
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 年前
sebastienlagarde
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
lyndon homewood
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 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Evgenii Golubev
a0441eb8
Upgrade FPTL for the new ShaderLibrary
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
sebastienlagarde
c20bc336
Remove LIGHTMAP_OFF, DIRLIGHTMAP_OFF and DYNAMICLIGHTMAP_OFF keyword
7 年前
GitHub
a7ace80f
Merge pull request #782 from Unity-Technologies/Remove-LIGHTMAP_OFF-keyword
Remove LIGHTMAP_OFF, DIRLIGHTMAP_OFF and DYNAMICLIGHTMAP_OFF keyword
7 年前
Remy
c09a6280
Create test assembly deffinition files, to avoid to have to "enable playmode test for all assemblies"
7 年前
GitHub
1588a9a8
Merge pull request #784 from Unity-Technologies/Test_Assemblies
Create test assembly deffinition files
7 年前
sebastienlagarde
8324b5e9
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-light-unity-support
7 年前
sebastienlagarde
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
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 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
sebastienlagarde
de305043
Add real support to ontile
7 年前
GitHub
98c2ae69
Merge pull request #805 from Unity-Technologies/Add-real-support-to-ontile
Add real support to ontile
7 年前
sebastienlagarde
b09620e7
Update shadow files
7 年前
GitHub
5c8eae15
Merge pull request #806 from Unity-Technologies/update-ontile-shadow
Update shadow files
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
sebastienlagarde
0a28696e
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Remy
3b93f076
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
Frédéric Vauchelles
86df6636
Merge master
7 年前
Julien Ignace
4172199d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta
7 年前
Arnaud Carre
074f76bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher
7 年前
uygar
c8556633
Changed shadow biasing. Biasing can now use normal and light vector information to avoid artifacts.
Added:
- normal+view biasing
- light view only biasing
- per sample biasing for wide PCF filters
- corner light leaking mitigation
- defines to control what type of biasing should be enabled
- a few new UI controls in the additionalshadowdata component
Removed previous biasing controls. They won't have any effect anymore.
7 年前
John
cf25c602
Merge master
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
Sebastien Lagarde
aadc4b09
Update menu item location and label
Based on discussion with Shawn MacClelland
7 年前
sebastienlagarde
950eb920
Update naming based on feedback
7 年前
Tim Cooper
8319254f
VR keywords are injected on build if the platform is needed. No need to add a multi-compile.
7 年前
GitHub
70db5d4a
Merge pull request #886 from Unity-Technologies/lw-vr-keywords
VR keywords are injected on build if the platform is needed. No need …
7 年前
sebastienlagarde
89cfaa68
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-encoding-1212to888
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 年前
Remy
3d76f69e
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
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 年前
Frédéric Vauchelles
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
sebastienlagarde
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
GitHub
22cb3935
Merge pull request #884 from Unity-Technologies/Update-Menu-location-and-label
Update menu item location and label
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
Remy
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Julien Ignace
85039c4d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Alex Lian
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
John
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
Mike Wuetherick
0d5b90fd
updated mats for 2018.1.0b6
7 年前
John
360fd4d8
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
7 年前
sebastienlagarde
4931ea6f
Fix warning of LW and OnTileRender OnValidate call
7 年前
GitHub
e999b356
Merge pull request #933 from Unity-Technologies/Fix-warning-LW
Fix warning of LW and OnTileRender OnValidate call
7 年前
sebastienlagarde
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
7 年前
Sebastien Lagarde
c84722a1
Rename /Graphics/ to /Rendering/ in menu
7 年前
GitHub
0ac5f863
Merge pull request #935 from Unity-Technologies/Rename-Graphics-to-Rendering-in-menu
Rename /Graphics/ to /Rendering/ in menu
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 年前
Tim Cooper
aeefe219
Merge branch 'master2' into LW-LightOptimizations
7 年前
Robert Srinivasiah
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
uygar
275279fa
Introduced new macros for flow control attributes.
7 年前
Sebastien Lagarde
57ca73ef
Update all generated files
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
GitHub
2376836c
Merge pull request #858 from Unity-Technologies/shadows-biasing
Shadows biasing
7 年前
sebastienlagarde
c5845945
Fix compil issue with Ontile and FPTL
7 年前
Robert Srinivasiah
6626255e
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Sebastien Lagarde
0c54bec9
Move resources outside of resource folder
- Move all shader/material in Resources folder to CoreResource folder
- Move DisplayShadowMap.Shader out of Resources folder
- Pass needed material to Core function through parameters
- Update reflection system to take RenderPipeline resource into account
7 年前
Sebastien Lagarde
4d0b3071
add shadow resource to renderpipeline resource
- Move shadow .shader and .compute from ShaderLibrary to Shadow folder
- Init material and compute throught SahdowAtlasInit
7 年前
GitHub
b878dd91
Merge pull request #967 from Unity-Technologies/improve-resources--management
Improve resources management
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前