Remy
d8c63295
Add First Light test scene
7 年前
Remy
9f5b1938
Add dynamic light graphic test scenes.
7 年前
Remy
64ca9729
Add text to Dynamic light test scene.
7 年前
Remy
2b555142
Add light parameters test scene.
7 年前
GitHub
19b91d50
Merge pull request #665 from Unity-Technologies/HDRP-GraphicTests
Hdrp graphic tests
7 年前
Remy
0c748094
Tweaks to the light parameters scene
7 年前
Julien Ignace
7faea4fc
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# PostProcessing
7 年前
Remy
84a9ac3d
Add shadow emmiting transparent objects, and objects to cast shadows on opaque/transparent.
7 年前
Evgenii Golubev
c16681df
Merge branch 'master'
7 年前
Evgenii Golubev
a2e010cc
Fix failing test
7 年前
Remy
5cb1a76e
Add missing meta file.
Fix scenes material in Lit_Transparent scene.
7 年前
GitHub
d2a4e002
Merge pull request #681 from Unity-Technologies/HDRP-GraphicTests
Hdrp graphic tests Update
7 年前
Remy
9e6f7ca3
Add GI Tests
7 年前
Remy
4bf16c1f
Add Reflection probe priority test
7 年前
Evgenii Golubev
effdbb9c
Merge branch 'master'
7 年前
Julien Ignace
71f453af
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/RuntimeFilterIBL.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
GitHub
ab1a6cff
Merge pull request #685 from EvgeniiG/master
Store light.range in lightData.size.x for box lights
7 年前
Sebastien Lagarde
657828b3
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-frameSettings
7 年前
Evgenii Golubev
7779e807
Merge branch 'master'
7 年前
Julien Ignace
ab2b8608
Updated all HDRP test scenes with new sky volumes (until they work in prefabs and we can share them... in 2018.2 hopefully)
7 年前
Andre McGrail
0effa5f2
Removed substance dependancies from LW tests and also re-created affected template images
7 年前
Frédéric Vauchelles
50a43207
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Sebastien Lagarde
9fe83875
Update various meta that seems to not be uptodate
7 年前
Sebastien Lagarde
5f2183f6
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/ReflectionProbeEditor
7 年前
Julien Ignace
c02d593d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/AtmosphericScattering/AtmosphericScattering.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
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 年前
sebastienlagarde
2b24ec8c
Update all material
7 年前
GitHub
7ab47949
Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data
Add versionning on additonal data
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 年前
Evgenii Golubev
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
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 年前
Remy
e11e76e1
Fix missing keywords/passes in GI tests materials.
Add a "Fail" stamp to be pasted in test templates that are rendering wrong (will force a failed test).
Add Reflection Probes priority template image (fail).
7 年前
Remy
122d739f
Remove unecessary meta file.
7 年前
GitHub
4bb6b202
Merge pull request #733 from Unity-Technologies/HDRP-GraphicTests
Add GI and ReflectionProbe tests
7 年前
Remy
066dd593
Add Reflection Probe volume test
7 年前
Remy
61981dde
Add missing face blend to reflection probe volume test
7 年前
Remy
2b1afa18
Add bake lighting test
7 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
GitHub
f9cb71ff
Merge pull request #737 from Unity-Technologies/HDRP-GraphicTests
More light tests
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 年前
Remy
1d9471e6
Add Shadow Mask test scene. Always return false because of script error for the moment.
7 年前
GitHub
bd3a6508
Merge pull request #746 from Unity-Technologies/HDRP-GraphicTests
Add shadow masks test, and correct the unlit test scene.
7 年前
sebastienlagarde
5ca40e6e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Sebastien Lagarde
cd92c7dc
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Frédéric Vauchelles
ad68db51
Merge branch 'master' into feature/HDCameraEditor
7 年前
Thomas
f101d51c
Updated gfx tests
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 年前
GitHub
77906a48
Merge pull request #752 from Unity-Technologies/volume-asset-switch
Changed the volume framework to use disk-based assets
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Sebastien Lagarde
61c2e24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Julien Ignace
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
2fd0a788
HDRenderPipeline: Update all materials
7 年前
GitHub
fbce26f6
Merge pull request #770 from Unity-Technologies/update-all-materials
HDRenderPipeline: Update all materials
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 年前
Remy
468b92e2
Move back play mode testrunner script out of Editor Folder, and add compilation directives to avoir build failures.
Fix script GUID in LT and HD test scenes.
7 年前
GitHub
544aba56
Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
GitHub
b8348971
Merge pull request #781 from Unity-Technologies/PlayMode_Tests_and_Build_Fix
Fix Fix for playmode tests (no more build failure)
7 年前
Julien Ignace
65d498de
Fixed test scene 2103 baking sky.
7 年前
Thomas
4b33a1b6
Merge branch 'master' into lw-gc-optim
7 年前
Julien Ignace
6ba9292e
Revered matrerial update after heightmap parametrization change.
7 年前
Julien Ignace
cdd44d73
Re-updated materials with new heightmap parametrization
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 年前
GitHub
37a266ac
Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate
Branch fix height map update
7 年前
sebastienlagarde
01b7d081
HDRenderPipeline: Update all materils keyword in scene and project
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Arnaud Carre
4bef6509
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Remy
3b815534
Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs
# Te...
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
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 年前
Sebastien Lagarde
5f384459
HDRenderPipeline: Update all materials
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Remy
bb848eef
Add range attenuation toggle test in light parameters
Disable distord texture mips as workaround for thig bug : https://fogbugz.unity3d.com/f/cases/988983/
7 年前
GitHub
72c1efa3
Merge pull request #818 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
sebastienlagarde
26147e28
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
sebastienlagarde
38bb305b
HDRenderPipeline: fix issue in a graphic test about metapass
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
Frédéric Vauchelles
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
John
cf25c602
Merge master
7 年前
Remy
d7fec4b5
Correct sky settigns in ShadowMask scene to have the shadow mask more obvious
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
GitHub
c26fa8d3
Merge pull request #857 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
sebastienlagarde
c43a2771
Merge remote-tracking branch 'refs/remotes/origin/master' into Fix-flip-issue
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Frédéric Vauchelles
d6743fba
Merge branch 'master' into feature/PlanarReflection
7 年前
John
3023e8c8
Merge Screen Space Shadows
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 年前
Remy
a936aacd
Add light on tesselation test.
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
ff7b81d9
Merge pull request #873 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
sebastienlagarde
e16cb2e3
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-UV0-UV3-on-lit-for-base
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 年前
Frédéric Vauchelles
9db916f8
Merge branch 'master' into feature/PlanarReflection2
7 年前
Remy
eafa077e
Fix cornel box materials
7 年前
Frédéric Vauchelles
ed247f18
[PlanarReflection] Added probe tests
7 年前
GitHub
60d0a1a7
Merge pull request #877 from Unity-Technologies/HDRP_GraphicTests
Fix cornel box materials
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
GitHub
68eebf2f
Merge pull request #879 from Unity-Technologies/feature/PlanarReflection2
Planar Reflection
7 年前
sebastienlagarde
a2c27894
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
sebastienlagarde
48efe04c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
3441b497
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
Sebastien Lagarde
a28733e8
HDRenderPipeline: Update all materials
7 年前
Remy
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
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 年前
Remy
7cebde26
Planar reflections tests.
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 年前
Remy
a5884c7a
A nimated cookie texture
Deferred / forward comparison
7 年前
GitHub
671c5dac
Merge pull request #897 from Unity-Technologies/HDRP_GraphicTests
Templates updates (fixed bugs)
7 年前
sebastienlagarde
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
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 年前
GitHub
ce5e1a23
Merge pull request #904 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
Julien Ignace
f956cebd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
7 年前
sebastienlagarde
66873725
Merge remote-tracking branch 'refs/remotes/origin/master' into Branch_RTRefactoring
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
Remy
f8b82f37
Move animated cookie scene to play mode tests
Update Light on tesselcation scene (shadows in reflection probes are fixed now)
7 年前
Remy
fe34a794
Fix reflection probe layout in test 2401
Try to accelerate tests by greatly reducing the number of wait frames. Seems stable.
7 年前
sebastienlagarde
4727ac84
HDRenderPipeline: Update graphic test 2401
7 年前
Evgenii Golubev
a80afa3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
GitHub
6a07965f
Merge pull request #928 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
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 年前
sebastienlagarde
5f14b489
Update all materials with Last PR
7 年前
GitHub
ce027b15
Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass
Update all material for PR 946
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 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
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 年前
Remy
6b3ff1a7
Update animated cookie scene/template (support for cube cookie)
Try to compress more agressively the template files
7 年前
Remy
865163bd
Update animated cookie scene (cube cookie supported)
7 年前
Remy
50737730
Converted all tga textures in graphic tests to png : saves a lot of disk space !
7 年前
GitHub
bf886cd0
Merge pull request #998 from Unity-Technologies/HDRP_GraphicTests
Update, Fixes, and less space used !
7 年前
Evgenii Golubev
504b9374
Merge remote-tracking branch 'upstream/HDRP_GraphicTests' into 2018.1
7 年前
Robert Srinivasiah
667518b2
Merge remote-tracking branch 'origin/master' into lwrp-xr-shader-fixes
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
Paul Melamed
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
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 年前
Julien Ignace
97f5e51c
Update materials in HDRP tests
7 年前
GitHub
4a6f75f8
Merge pull request #1068 from Unity-Technologies/Branch_UpdateMaterials
Update materials in HDRP tests
7 年前
Julien Ignace
88c2ad28
Pushed missing updated materials.
7 年前
GitHub
566e00cc
Merge pull request #1073 from Unity-Technologies/Branch_UpdateMaterials
Pushed missing updated materials.
7 年前
Felipe Lira
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
Julien Ignace
79ecc6d5
Fixed some data and updated reference screenshots for HDRP graphics tests
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
GitHub
39fa31ad
Merge pull request #1085 from Unity-Technologies/Branch_FixGraphicsTests
Fixed some data and updated reference screenshots for HDRP graphics tests
7 年前
Felipe Lira
b33ad0e5
Merged master.
7 年前
Felipe Lira
049fa5ed
Merge branch 'master' into lw/shadow-optimization
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
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 年前
Remy
da27105b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Evgenii Golubev
1d711357
Merge 'upstream/master'
7 年前
Matt Dean
f98f82d0
Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass
7 年前