Andre McGrail
67918a7b
Added 040_UpgradeScene test, this is essentially Nightmare converted to LWpipe
Added touch support for the LWpipeSwitcher script
7 年前
Andre McGrail
2978ddd1
Fixed test 040_UpgradeScene FBX import options
7 年前
Felipe Lira
23ae75d9
pushing deleted meta folders.
7 年前
Sebastien Lagarde
36f3cfd4
merge unity 2017.3
7 年前
Andre McGrail
8752dc7f
Updated/Added Lightweight pipe tests, created templates
7 年前
GitHub
1b90eb6b
Merge pull request #687 from Unity-Technologies/LightweightPipeline
Lightweight pipeline upgrade to SRP shader library
7 年前
sebastienlagarde
8c9cc9e2
fix meta issue in master
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 年前
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 年前
Remy
bfbb6604
Remove multiplicative blend mode from tests.
7 年前
sebastienlagarde
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
GitHub
84a0053a
Merge pull request #789 from Unity-Technologies/HDRP-GraphicTests
Hdrp graphic tests
7 年前
GitHub
c36be30a
Revert "Hdrp graphic tests"
7 年前
GitHub
fa3e734e
Merge pull request #790 from Unity-Technologies/revert-789-HDRP-GraphicTests
Revert "Hdrp graphic tests"
7 年前
GitHub
9909bf32
Revert "Revert "Hdrp graphic tests""
7 年前
GitHub
02a16451
Merge pull request #792 from Unity-Technologies/revert-790-revert-789-HDRP-GraphicTests
Revert "Revert "Hdrp graphic tests""
7 年前
GitHub
d1a57b2a
Revert "Revert "Revert "Hdrp graphic tests"""
7 年前
GitHub
b4149381
Merge pull request #793 from Unity-Technologies/revert-792-revert-790-revert-789-HDRP-GraphicTests
Revert "Revert "Revert "Hdrp graphic tests"""
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
GitHub
10174353
Merge pull request #800 from Unity-Technologies/FixFix_TestFrameworkTools
Fix fix test framework tools
7 年前
Sebastien Lagarde
a79042e5
Merge branch 'master' into pr/798
7 年前
GitHub
9d3b9c14
Merge pull request #801 from Unity-Technologies/pr/798
Pr 798
7 年前
Sebastien Lagarde
d111863a
update scene material
7 年前
Remy
b092479b
Delete remaining meta files and empty folders
7 年前
GitHub
5ebc5ca8
Merge pull request #802 from Unity-Technologies/Clean-Meta
Delete remaining meta files and empty folders
7 年前
Remy
2289f880
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/Scripts/Editor/GraphicTests/HDRenderPipeline/DebugViewController_Editor.cs.meta
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
Remy
c6a3aa71
Update fbx metadatas
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 年前
Felipe Lira
d7a50ff9
update lw assets.
7 年前
Sebastien Lagarde
5f384459
HDRenderPipeline: Update all materials
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 年前
John
3c40b17c
Merge brnganch 'LightweightPipeline' into LW-ScreenSpaceShadows
Fetching 5x5 tent PCF
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
GitHub
c05bd70c
Merge pull request #832 from Unity-Technologies/LightweightPipeline
Lightweight pipeline
7 年前
sebastienlagarde
54919201
Merge remote-tracking branch 'refs/remotes/origin/master' into Fix-issue-with-SSS-and-layering
7 年前
Evgenii Golubev
5b66c29a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into opt_ps4_2018_01
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
Sebastien Lagarde
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
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 年前
Remy
5f60d1a8
Make SSS max distance test more readable
Add pre-post scatter test
7 年前
GitHub
647cbfdb
Merge pull request #846 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
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 年前
Remy
456977b5
Fix FBX import errors
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Frédéric Vauchelles
d6743fba
Merge branch 'master' into feature/PlanarReflection
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 年前
GitHub
84e022c3
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
7 年前
sebastienlagarde
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
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 年前
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 年前
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 年前
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 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
Mike Wuetherick
0d5b90fd
updated mats for 2018.1.0b6
7 年前
John
360fd4d8
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Aleksandr Kirillov
1f46d9ea
Testing scene setup for simplified lighting (040).
7 年前
Aleksandr Kirillov
99890a99
Cleaned up particle code. Added a shader for lit particles with SimpleLighting.
7 年前
Aleksandr Kirillov
97ca9cc7
Reverted an accidental change.
7 年前
Felipe Lira
d3c4d6f9
Cleaned up particle code. Added a shader for lit particles with SimpleLighting.
7 年前
Felipe Lira
f5fa81b0
Reverted an accidental change.
7 年前
Felipe Lira
9526b0d2
Moved LWRP test folder
7 年前
GitHub
4e5fc617
Merge pull request #1394 from Unity-Technologies/lw/move-test-folder
Lw/move test folder
7 年前
Frédéric Vauchelles
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
7 年前
Tim Cooper
3dd99694
Fix lfs issue
7 年前
GitHub
16b41fe4
Merge pull request #1542 from Unity-Technologies/gfx-tests-postfx
Gfx tests postfx
7 年前
GitHub
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
7 年前
Remy
409f30cb
Merge branch 'master' into HDRP-Tests
# Conflicts:
# .gitattributes
# com.unity.testframework.graphics/Runtime/GraphicsTestSettings.cs
7 年前
GitHub
d4992b3f
Merge branch 'master' into lw/camera-additional-data
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Tim Cooper
cba42a6a
Remove large files.
7 年前
Tim Cooper
ce3b9547
Add files and non large files.
7 年前
GitHub
bd393bda
Merge branch 'master' into switch-support
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Stephane Laroche
f46075fb
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
GitHub
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
7 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
Tim Cooper
5380179a
Updated LWRP tests, fixed shadow cascades ( #1808 )
* Init push
-Updated existing tests, simplified and compressed
-Added new tests, many more, to cover missing coverage and prepare for upcoming features
-Compressed Images to save space
-Removed duplicate or unused assets
* Added Shadergraph test scene
Tweaked existing material files
* Updated missing prefabs (due to nested prefabs)
Added all OSX Metal reference images
* Fixed issue with test 050_shader_graphs where the UVs broke in playmode
* Updated Build List
* Added check for only enabled scenes in the build menu, this will help avoid issues running tests not in the build and also easily be able to disable tests if needed
* Tweaked tests
Added OSXEditor Metal reference images
Added WindowsEditor DX11 reference images
* Fix shadow cascade issue that was due to cut and paste error lol
* Updated cascade test with correct references
Updated Adam prefab to nested prefabs
* Update windowsEditor DX11 ...
6 年前
Sebastien Lagarde
cd85f0d3
Merge branch 'master' into HDRP/staging
6 年前
Antoine Lelievre
d5e69c03
Merge HDRP/staging
6 年前
sebastienlagarde
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
GitHub
c0ff7b91
Convert LW / Core RP tests into pacakges ( #1829 )
Port LW and Core tests to live in packages. They will be built as part of the package build process and also published. This means the can be used on katana and similar for testing.
LW / core are 'first version' of this. We need 'real usage' before we port HD / Shader Graph.
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
Sebastien Lagarde
05036cac
Merge branch 'HDRP/staging' into HDLightExplorerExtension
6 年前
Frédéric Vauchelles
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
RSlysz
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
egomeh
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前