sebastienlagarde
c95acc41
Update directory structure of graphic test
- Move framework in framework directory
- Move scene in RenderPipeline/LowEndMobile directory
- Add RenderPipeline/HDRenderPipeline
8 年前
GitHub
1eaf565f
Merge pull request #264 from Unity-Technologies/Add-graphic-test-for-HD
Add graphic test for hd
8 年前
Julien Ignace
9ba99a5b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
8 年前
Felipe Lira
6275e9d2
Added baked emission support to LD pipe and proper test scene
8 年前
sebastienlagarde
77c2c22a
Merge remote-tracking branch 'refs/remotes/origin/master' into Remove-Resources-folder
8 年前
Sebastien Lagarde
dee59c09
Merge branch 'master' into ssao-test
8 年前
Arnaud Carre
df0c1521
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/PostProcessing
8 年前
Felipe Lira
3fc943aa
Fixed failing LD test scenes. Uploaded a new template image for baked emission scene.
8 年前
Felipe Lira
6f3e7b0a
Refactored LD to Lightweight
8 年前
sebastienlagarde
3ccea10f
Merge branch 'master' into ssao-test
8 年前
sebastienlagarde
6efb11c7
HDRenderPipeline: Finish to fix issue with AO
Store inverse AO in the buffer to to waste a sampler in lightloop
8 年前
sebastienlagarde
13e14f67
Merge branch 'master' into ssao-test
8 年前
Felipe Lira
d559f6f0
Added default materials to lightweight pipe. Changed shaders scene to add transparent, unlit and cutout.
8 年前
Evgenii Golubev
ad3d47b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
2d2ea8bb
Added 2D Test Scene
8 年前
Evgenii Golubev
e7d27153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
David Rogers
85744e59
Local merge
8 年前
Felipe Lira
53105986
Added lightweight unlit and its shader GUI
8 年前
Julien Ignace
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Felipe Lira
0f4a886b
LightweightPipeline settings per light objects with StructuredBuffer. Right now for gles 2.0 we need an alternate solution. Added multiple point lights scene.
8 年前
Rune Stubbe
4e715f16
Moved material classification to separate pass
Light and material classification are now orthogonal and can now be enabled/disabled independently
8 年前
sebastienlagarde
5acef24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-hlsl-generator
8 年前
Julien Ignace
c7e7065b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
8 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
8 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
8 年前
Felipe Lira
0a1fead0
Fixed rendering when no lights we present in the scene. Updated test scenes and images.
8 年前
Tim Cooper
88c53704
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into reduce-gc
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
8 年前
Arnaud Carre
e9b3071e
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
5570c647
Merge branch 'master'
8 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
Felipe Lira
8265d3ce
Added support to per-object light list for SM 2.0 devices
8 年前
Felipe Lira
231211f7
Added more objects to multiple point lights scene
8 年前
Felipe Lira
70cb4cca
Added more lights/objects to multiplePointLights scene
8 年前
Felipe Lira
4c1c0d7b
Added SpritesDefault shader with the lightweight pipeline tag to avoid issueing more drawrenderers.
8 年前
Felipe Lira
0463c44a
removed deleted folder metas
8 年前
Felipe Lira
8f9eef29
Added support to MSAA.
8 年前
Felipe Lira
d855e68b
Merge branch 'LightweightPipeline'
7 年前
Arnaud Carre
a9656da4
Merge branch 'master' into Branch_Batching2
7 年前
Felipe Lira
b7b421cf
Updated cornel box model to use legacy materials importing.
7 年前
Filip Iliescu
4adbf45e
Merge branch 'master' into OnTileDeferred
7 年前
Filip Iliescu
23202e49
merge in OnTileDeferredBranch after merging in master to it
7 年前
Felipe Lira
aeda1de5
Merge branch 'LightweightPipeline'
7 年前
Felipe Lira
64861bf2
Added Lightweight PBR Sphere Test Scene
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
79b72748
Updated some of the lightweight pipeline sample and test scenes.
7 年前
Felipe Lira
ee1ea198
Added some test scenes to lightweight pipeline. Fixed the multiple point lights test scene.
7 年前
Felipe Lira
9c00a86c
Merge branch 'LightweightPipeline'
# Conflicts:
# Assets/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity
7 年前
Felipe Lira
a6a01a17
Fixed merge errors in the scene lightweight lights scene.
7 年前
Felipe Lira
6d592a3d
Merge branch 'master' into LightweightPipeline
7 年前
Felipe Lira
981737f7
Moved PBR materials folder. Added a copy of SkyEnvironment to Lightweight.
7 年前
Felipe Lira
5aba3a6e
Revert " Moved PBR materials folder. Added a copy of SkyEnvironment to Lightweight."
This reverts commit c48c439359a5f0c4e738f443557e7e6c068e9d26.
7 年前
Felipe Lira
bc3f5b1a
Fixed SpriteDemo test scene that was failing due to a diff in background color in the scene.
7 年前
Felipe Lira
457b3a17
Renamed test scenes to use XXX-TestScene name standard. Added test scene assets to each folder.
7 年前
Felipe Lira
3c1912c0
Removed unused materials. Moved reflection probe material to 010 test scene.
7 年前
Felipe Lira
b7e797ee
Fixed material reference in 010 test scene.
7 年前
Felipe Lira
605dc966
Fixed most of the lightweight graphics tests.
7 年前
Andre McGrail
c48c275b
Added tests
-013_CameraMulti_Splitscreen - tests 4 player split screen setup with UI
-014_CameraMulti_MiniMap - tests small camera rect acting as a top down map view
-015_CameraMulti_FPSCam - tests two camera setup for separate weapon rendering
7 年前
Andre McGrail
79a008db
Added tests
-016_Lighting_Scene_Directional: tests directional light with shadow in a medium scene
-017_Lighting_Scene_DirectionalBaked: tests baked directional light in a medium scene
-018_Lighting_Scene_DirectionalBakedIndirect: tests directional light with shadow and baked indirect in a medium scene
-019_Lighting_Scene_PointLights: tests multiple point lights in a medium scene with baked indirect
-020_Lighting_BasicDirectional: tests directional light(with shadows) on both non-PBR and PBR shaders
-021_Lighting_BasicPoint: tests point light on both non-PBR and PBR shaders
-022_Lighting_BasicSpot: tests spotlight on both non-PBR and PBR shaders
7 年前
Andre McGrail
64797a02
Updated Lightweight tests and created template images
7 年前
Felipe Lira
87ac03cd
Added LightweightPipeline shader GUI. Updated PBR material with the new keywords.
7 年前
Andre McGrail
c844ad5d
Added tests:
023_Lighting_Mixed: tests mixed light modes(broken right now)
024_Shader_PBRvalidation: Contains adam and some test spheres, original template made against legacy pipe
General clean up of other tests
7 年前
Felipe Lira
55afe234
Fixed MettalicGloss map not being applied.
7 年前
Felipe Lira
2174bed4
Added microfacet BRDF model. Some changes to keywords in the LightweightStandard shader GUI.
7 年前
Felipe Lira
602d1a7c
Fixed a normalization issue. Fixed keywords not being properly set in SpecularSetup.
7 年前
Felipe Lira
ef02bc3e
Added missing env BRDF surface reduction. Now BRDF matches reference image.
7 年前
Andre McGrail
a21b0c40
Created both Metallic and Specular PBR validation scenes with template image done in legacy pipe.
7 年前
Andre McGrail
32f08396
Added PBR material test scene, has a wide variety of different surfaces. Template image created in legacy pipe, may never pass as the shadows will always be out..
7 年前
Felipe Lira
6076bb69
Fixed up LightweightStandardShaderGUI to only support BakedEmissive lightmap mode.
7 年前
Andre McGrail
e4557fc9
Removed shadows from LW test 026
7 年前
Andre McGrail
78e94c46
Added PostProcessing test that requires depth.
Changed lightweight default particle to be additive and also assigned the default particle texture
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
Felipe Lira
af290f39
Fixed scene 012 template and materials.
7 年前
Felipe Lira
3828c63f
Enabled autogenerat GI flag to properly generate graphics test template image.
7 年前
Andre McGrail
75220589
Fixed Cornell box UVs
7 年前
Felipe Lira
ce712ae5
Fixed tests and templates to account for LDR rendering.
7 年前
Felipe Lira
b72b35d7
Added MSAA support to the test framework.
7 年前
Felipe Lira
d8554026
Fixed tests for scene 15 and 17
7 年前
Felipe Lira
4bf2abf5
Merge branch 'LightweightPipeline'
7 年前
Andre McGrail
9c5b499e
Added tests
-027_PostProcessing - Tests Post stack v2
-028_PostProcessing_Custom - Tests custom effects at different hook point(wip)
-029_Particles - Tests basic particle usages and the legacy particle shaders(wip)
7 年前
Felipe Lira
f4fc9498
Updated shader and materials to use same metallic/spec gloss map and keywords as standard. This will allow substance workflow to work in lightweight.
7 年前
sebastienlagarde
8f8eb990
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-shader-pass
7 年前
Felipe Lira
c9712307
Updated LOD0 material importing options to use the project embedded materials and prevent creating a new one.
7 年前
Felipe Lira
c5450cac
Fixed glossy env color from ambient probe. Added gfx tests 31-34 to test various setup of SH/Lightmap with different ambient sources.
7 年前
Andre McGrail
30b40f2a
Particle scene update with bug repro
7 年前
Peter Andreasen
c62bfeca
Merged with master
7 年前
Felipe Lira
9ea83a56
Added Occlusion keyword. Updated materials. More refactor on the shader.
7 年前
Andre McGrail
dd73696d
Fixed Substance load behaviour for test 026
7 年前
Felipe Lira
3a920b52
Added lightingdata for scene 017 to speed up test.
7 年前
Felipe Lira
0afc0404
Fixed emission property on SimpleLightingShader. Removed Env mapping support for consistency with old legacy shader library.
7 年前
Felipe Lira
f01f666d
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
GitHub
0742fb7a
Merge pull request #413 from Unity-Technologies/Unity-2017.3
Merge Unity 2017.3 to master
7 年前
Felipe Lira
d1cf8765
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
GitHub
a82f6ffc
Merge pull request #421 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
cafbee5d
Fixed crash in particles scene.
7 年前
Andre McGrail
c6969950
Added Custom post to have both before transparent and before stack. Created reference image for Postprocessing test
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Felipe Lira
263a503c
Added terrain shaders test
7 年前
Felipe Lira
f6959393
Fixed light setting to test scene 21 to not use shadows and prevent a warning.
7 年前
Sebastien Lagarde
93ccd48f
Update constantly updating meta fille of LT
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 年前
Remy
972c7922
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
Andre McGrail
929e0de8
Added test scene for Directional Lightmap
7 年前
Andre McGrail
02e4f272
Added test 037 for lightweight conversion of StandardParticleShader/StandardUnlitParticleShader
7 年前
Andre McGrail
0ec73af5
Added tests 038-039 for testing both Directional and Spot light cookies(currently spot not working)
7 年前
Andre McGrail
37a9b54a
Updated test 028 CustomPostProcessing
7 年前
Andre McGrail
ba821dcf
Updated and cleaned all LW pipe tests and re-created template images
7 年前
Andre McGrail
2e3bce5f
Switched terrain scene over to the Lightweight shader
Added meta files
7 年前
Andre McGrail
c06a72c0
Tweaks to existing tests
Setup both particle tests(29 & 37) to work in the edit mode test
7 年前
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 年前
Andre McGrail
8b5b9ea5
Added test 041_Lighting_BasicArea for area light
7 年前
GitHub
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
23ae75d9
pushing deleted meta folders.
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
04829cba
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
Felipe Lira
645aa670
Fixed missing material reference in test 11.
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
1531aa64
Renamed/Moved test 037 files to avoid windows path character limit.
7 年前
Felipe Lira
ed1d3a8f
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Felipe Lira
7867cec0
Fixed some issues on OpenGL and fixed test scene 007 material keywords.
7 年前
GitHub
62808466
Merge pull request #585 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
42e09fc5
Added correct template images for test scenes.
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 年前
GitHub
45f497ea
Merge pull request #593 from Unity-Technologies/LightweightPipeline
Lightweight pipeline
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 年前
Felipe Lira
18e0d6e8
Merge branch 'Unity-2017.3'
7 年前
Evgenii Golubev
7b797ff7
Merge branch 'master'
7 年前
Peter Bay Bastian
85e38a3c
Merge branch 'master' into shader-include-paths-2
7 年前
Sebastien Lagarde
8e92ddef
HDRenderPipeline: Remove multiply blend mode
- Multiply make it easy to do mistake (inf, negative number, NaN) and
prevent optimization like half res rendering or offscreen compositing
7 年前
GitHub
36c8a29b
Merge pull request #595 from Unity-Technologies/Remove-multiply-blendmode
Remove multiply blendmode
7 年前
Felipe Lira
e7c2f725
Moved lightweight pipeline asset to tests folder.
7 年前
Evgenii Golubev
e84fe4b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Felipe Lira
e62690b9
Merge branch 'LightweightPipeline'
7 年前
Felipe Lira
2387e5a5
Added GI to unlit standard shader.
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 年前
Peter Andreasen
b6423cf9
merge
7 年前
Felipe Lira
c62e8861
Refactored upgraders. Added Terrain and Particles upgraders.
7 年前
sebastienlagarde
f142c657
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
7 年前
Felipe Lira
bc18e113
First part of relatime shadows refactor.
7 年前
Julien Ignace
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
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 年前
Andre McGrail
8752dc7f
Updated/Added Lightweight pipe tests, created templates
7 年前
sebastienlagarde
c9ee9e33
Merge remote-tracking branch 'refs/remotes/origin/master' into 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 年前
Andre McGrail
0effa5f2
Removed substance dependancies from LW tests and also re-created affected template images
7 年前
Andre McGrail
6d8f7475
Added missing metas and updated mats that source tree didn’t pickup :(
7 年前
GitHub
1b90eb6b
Merge pull request #687 from Unity-Technologies/LightweightPipeline
Lightweight pipeline upgrade to SRP shader library
7 年前
Felipe Lira
85558334
Default Resources are not serialised anymore in the LW pipeline asset. They come from resource asset and are also not exposed anymore.
7 年前
sebastienlagarde
8c9cc9e2
fix meta issue in master
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 年前
GitHub
71a0b586
Merge pull request #707 from Unity-Technologies/LW_UI_Improvements
Lightweight UI improvements
7 年前
Felipe Lira
742b06fb
Moved LW files to LWRP folder to for better handling with package manager.
7 年前
Julien Ignace
713d15c0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
sebastienlagarde
72c9c06e
Merge branch 'master' into move-lw-to-lwrp
7 年前
GitHub
9bc3353a
Merge pull request #711 from Unity-Technologies/move-lw-to-lwrp
Move lw to lwrp
7 年前
sebastienlagarde
15efd9d7
Merge branch 'master' into Convert-shaderLibrary-to-half-float-support
7 年前
sebastienlagarde
0165d836
Pushing missing meta files
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 年前
Felipe Lira
9ab6af9c
Fixed scene for test 010. Updated template of scene 039 to account for the new spotlight falloff.
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 年前
Felipe Lira
1f07c2da
Updated scenes and templates to account for new shadow bias algorithm.
7 年前
sebastienlagarde
8e74657a
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
GitHub
c58c9930
Merge pull request #705 from Unity-Technologies/Convert-shaderLibrary-to-half-float-support
Change ShaderLibrary to use REAL instead of float/half
7 年前
Sebastien Lagarde
24ac5a9e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
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 年前
Felipe Lira
f30f7fa7
Fixed missing reference to resource file in lightweight asset.
7 年前
sebastienlagarde
bf347a23
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Sebastien Lagarde
61c2e24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Evgenii Golubev
b8684ef4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Sebastien Lagarde
ef3442e8
HDRenderPipeline: move InfluenceFadeNormalWeight to shader library
7 年前
Sebastien Lagarde
e059a00a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
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 年前
Robert Srinivasiah
a9de3b79
Move script files to Editor folders if needed
Some namespaces (e.g. NUnit) can't be used unless the script is inside an Editor folder.
This moves the minimum set of files to Editor folders, relative to the original file location.
There may be more files that should be re-arranged.
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
GitHub
1017d3de
Merge pull request #776 from Unity-Technologies/fix-paths-from-pr775
Move script files to Editor folders if needed
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
b8348971
Merge pull request #781 from Unity-Technologies/PlayMode_Tests_and_Build_Fix
Fix Fix for playmode tests (no more build failure)
7 年前
Remy
c09a6280
Create test assembly deffinition files, to avoid to have to "enable playmode test for all assemblies"
7 年前
Thomas
4b33a1b6
Merge branch 'master' into lw-gc-optim
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 年前
Remy
4008da43
Fix TestFrameworkTools (relative scenes path issue)
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 年前
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 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Felipe Lira
038a6561
updated lighweight pipeline asset and added versioning to it.
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 年前
Felipe Lira
63f633bd
Merge branch 'LightweightPipeline'
7 年前
Remy
3b93f076
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
a5184a75
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
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
da986831
Updated pipeline asset to a new version.
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 年前
Tim Cooper
55238b57
Split resources into editor and runtime resources
7 年前
GitHub
7b9f9990
Merge pull request #855 from Unity-Technologies/LW-Resources
Split resources into editor and runtime resources
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
Remy
456977b5
Fix FBX import errors
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 年前
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 年前
Remy
da4312b1
Modify test framework to be able to use multiple render pipeline assets for a single test, in order to test parity of features.
Modified LWRP testscenes accordingly.
7 年前
GitHub
f5287a0f
Merge pull request #906 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
sebastienlagarde
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
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
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
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 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Peter Andreasen
04b933d9
merged with master
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 年前
Felipe Lira
9d9d5435
Initial prototype.
7 年前
Aleksandr Kirillov
1f46d9ea
Testing scene setup for simplified lighting (040).
7 年前
Felipe Lira
5b48f6c3
Single Light Shader
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 年前
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 年前
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
3bbb9197
Upgraded lightweight UI to have local shadow settings. Upgrader asset version. Stripping local shadows based on pipeline capabilities.
7 年前
GitHub
9aa25b18
Merge pull request #1243 from Unity-Technologies/lw/shader-keywords-stripping
Lw/shader keywords stripping
7 年前
Kay Chang
53b01e3a
WIP adding Switch support.
7 年前
Kay Chang
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
7 年前
GitHub
231beaa3
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
7 年前
Felipe Lira
d426889d
Added shader stripping settings for the pipeline.
7 年前
GitHub
cb320925
Merge pull request #1279 from Unity-Technologies/lw/shader-stripping-settings
Added shader stripping settings for the pipeline.
7 年前
sebastienlagarde
0ddaf44e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
7 年前
Stephane Laroche
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
Frédéric Vauchelles
4bfaa623
merge master
7 年前
sebastienlagarde
f6e93052
Fix various C sharp and shader warning
7 年前
GitHub
212ff6b3
Merge pull request #1324 from Unity-Technologies/Fix-misc-warning
Fixed warnings as requested by Spotlight customer
7 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
7 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
c27f37c6
Merge pull request #1378 from Unity-Technologies/LWRP
Lwrp
7 年前
Frédéric Vauchelles
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Peter Bay Bastian
927000b8
Merge branch 'master' into sg/texture-types
7 年前
sebastienlagarde
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前