Felipe Lira
263a503c
Added terrain shaders test
7 年前
Andre McGrail
2e3bce5f
Switched terrain scene over to the Lightweight shader
Added meta files
7 年前
Felipe Lira
04829cba
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
GitHub
26d799fa
Merge branch 'YibingProject' into Unity-2017.3
7 年前
Sebastien Lagarde
48c698bd
Revert last wrongly merge in Unity2017.3, should not have been done...
7 年前
Felipe Lira
ed1d3a8f
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
GitHub
62808466
Merge pull request #585 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
d1c74bcb
Merge branch 'master'
7 年前
Julien Ignace
0a60dd2a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
Paul Melamed
d31d3ab4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Peter Andreasen
5d36f104
Merged master
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 年前
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 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Julien Ignace
65bd8e1d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
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 年前
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 年前
Mike Wuetherick
0d5b90fd
updated mats for 2018.1.0b6
7 年前
John
360fd4d8
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
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 年前
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 年前
Tim Cooper
cba42a6a
Remove large files.
7 年前
Tim Cooper
ce3b9547
Add files and non large files.
7 年前
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 ...
7 年前
Sebastien Lagarde
cd85f0d3
Merge branch 'master' into HDRP/staging
7 年前
Antoine Lelievre
d5e69c03
Merge HDRP/staging
7 年前
sebastienlagarde
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
7 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
7 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
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 年前
Andre McGrail
654f18cb
Enabled instancing on the terrain test
6 年前
GitHub
237718e2
Merge pull request #1901 from Unity-Technologies/gpu-terrain
Enabled per-pixel terrain normal on LW terrain shader.
6 年前
GitHub
aae1a458
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
6 年前