7e712073
Fixed LayeredLit detail maps and improved the LayeredLitTest scene.
8 年前
2fc686ba
Synchronized properly texture scale/offset for layeredLit.
8 年前
d4e1f7c7
Fixed multipliers on LayeredLit for Smoothness, Metallic and Anisotropy (were always 0 before).
8 年前
f44b8fd2
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
b835a78b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
9ccb7b24
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
462e7b4d
Merge branch 'master' into scriptablerenderloop-graphicssettings
8 年前
d4b4b0be
dupplicate BasicRenderLoopTutorial renderloop to make various tests about batching
8 年前
2913ae51
now fastbatch shader use fixed bind slot 0, and UnityPerDraw too (changed in UnityShaderVariables.cginc )
8 年前
2dd27005
Merge pull request #41 from Unity-Technologies/LayeredLit
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
a06bdec6
- Fixed procedural sky renderer to use the provided ScreenSize
- Added missing meshes for layered lit test scene.
8 年前
ad90df53
HDRenderLoop: Add mainTex scale bias on lit.shader and layeredLit.shader
8 年前
e668399e
Merge pull request #50 from Unity-Technologies/Add-scale-bias-mainTex
HDRenderLoop: Add mainTex scale bias on lit.shader and layeredLit.shader
8 年前
5905c1d5
Merge pull request #52 from Unity-Technologies/SkyFramework
Small fix
8 年前
0c1762ae
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-uv2-control
8 年前
9a38f1ae
Updated LayeredLit test scene with UV2
8 年前
8937d782
Merge pull request #53 from Unity-Technologies/LayeredLit
Updated LayeredLit test scene with UV2
8 年前
8bbe4289
Merge remote-tracking branch 'upstream/master'
8 年前
5da35f57
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
36d89c76
- Improved LayeredLit test scene.
- Added a menu item to re-synchronize all LayeredLit materials.
- Fixed some multi-editing issues with LayeredLit material.
8 年前
31df85eb
LayeredLit: Vertex colors now act as a height offset when using height based blend.
8 年前
973d16b4
Merge pull request #73 from Unity-Technologies/LayeredLit
Layeredlit improvements
8 年前
9613bb46
- Added the possibility for material layers to inherit from the base layer normal map.
- Changed the way normal are handled in Lit/LayeredLit shader so that we could properly implement the point above (namely, GetSurfaceData now returns the tangent space normal instead of world space directly, this allows to blend them correctly for layered shader).
8 年前
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
05fd006e
HDTest scene for fast batch rendering
8 年前
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
610b8d11
Merge pull request #79 from Unity-Technologies/LayeredLit
Layeredlit
8 年前
478a2e31
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
339762d5
Updated LayeredLit test scene with latest changes.
8 年前
900efeeb
Merge pull request #91 from Unity-Technologies/Branch_update-layered-test-scene
Updated LayeredLit test scene with latest changes.
8 年前
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
05e84b23
Merge branch 'master' into lowendmobile
8 年前
613a80ee
HDRenderPipeline; Add Pom test level
8 年前
4ed323aa
Merge pull request #105 from Unity-Technologies/Add-POM-and-Tesselation-Test-Level
Add pom and tesselation test level
8 年前
8b521e10
Merge branch 'master' into SSSSS
8 年前
89421bcf
Merge branch 'master' into metal
8 年前
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
810afcf1
HDRenderPipeline: Update layered material
8 年前
ecd950f5
Merge pull request #118 from Unity-Technologies/Update-layered-material
HDRenderPipeline: Update layered material
8 年前
8ff712ff
Merge branch 'master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/ProceduralSkyRenderer.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Utilities.cs
8 年前
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
bfff24ea
fix some scenes (too many point lights for 4096*4096 lightmap)
8 年前
be52007a
Merge branch 'master' into lowendmobile
8 年前
ac23a82e
Merge branch 'master' into SSSSS
8 年前
df95d960
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
8 年前
ec53036a
Fixed LayeredLit test scene after last modifications.
8 年前
aef2a1fa
Merge pull request #138 from Unity-Technologies/Branch_FixLayeredTestScene
Fixed LayeredLit test scene after last modifications.
8 年前
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
1d022582
Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp
8 年前
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
37c3566f
Update material files with the definition of '_StenclRef'
{ material.SetInt("_StencilRef", x); } relies on serialization. Therefore, if the property is not declared in the *.mat file, attempting to set this property in C# has no effect.
8 年前
a1e0f1e9
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline
- Rename all "loop" name to "pipeline" name for FPTL/Basic/HD
- Update all include in HDRenderPipeline to match C++ #include path that
is Asset/ScriptableRenderPipeline
Caution: This PR require the new C++ code
8 年前
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
8 年前
ab900a3a
HDRenderPipeline: Allow different keyword by layers
- Add keywork normal, specularocclusion, detailmap, mask to layered
shader
- Remove smoothness in alpha option
- Remove code related to detail heightmap
- Remove the restriction on GUI of layered lit layer 1, 2, 3 matching
layer 0
8 年前
554a5c02
Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI
Layered lit clean and ui update
8 年前
fa549add
Create branch for renderpass test scene
8 年前
c8a27740
Merge branch 'master' into shadows
8 年前
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
38a9956f
Due to target hardware restrictions (ALU/bandwidth) LD won't support the same standard shader workflow. Instead a specular limited will be available.
8 年前
37933307
HDRenderPipeline: Update scene test material
8 年前
ba1e0e65
Merge pull request #158 from Unity-Technologies/Cleanup-of-inspectorUI-code
Cleanup and update of Lit and Unlit UI
8 年前
967eec25
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
29e588a8
Merge pull request #156 from EvgeniiG/master
Implement painted-thickness-based transmittance for SSS
8 年前
7b4ab969
Merge branch 'master' into Branch_SceneSettings
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
8 年前
77102a68
Merge branch 'master' into shadows
8 年前
14dc6caa
HDRenderPipeline: Replace tangentToWorld by the correct term worldToTangent
8 年前
0365d4e5
HDRenderPipeline: Change LayerUV to UVMapping + add keyword MAPPING_PLANAR
- added _LAYER_MAPPING_PLANAR0 keyword
- Planar mapping is now a shader feature
- Move all SampleLayer to to ShaderLibrary and rename LayerUV to
UVMapping
- Create an enum UVMappingType instead of using isPlanar / is Triplanar
- Move double/mirror sided function to materialUtilities
- Update a lot of materials in test scene
8 年前
fd4b72d5
Merge pull request #166 from Unity-Technologies/normal-surface-gradient
Add Morten's Surface Gradient support
8 年前
a5c5f339
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
3c290788
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
8 年前
cb7bce50
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
cefe8b15
Merge branch 'master' into shadows
8 年前
dc4b3493
Fixed sRGB flag on detail map for layered lit test scene.
8 年前
557acdfd
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
8 年前
92cf9ffa
Merge pull request #203 from Unity-Technologies/Branch_FixLayeredLitScene
Fixed sRGB flag on detail map for layered lit test scene.
8 年前
0df1b41e
Merge branch 'master' into metal-ios
8 年前
0574ef6b
Merge branch 'master' into metal
8 年前
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
8 年前
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
8db09493
Merge branch 'master' into shadows
8 年前
8844bd4a
Added missing .meta files.
8 年前
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
f8d04c4e
Add missing .meta files
8 年前
dcb8638a
Merge pull request #225 from EvgeniiG/master
Improve the SSS implementation (+ *.meta files)
8 年前
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
c31d6106
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.asset
8 年前
712ff1d3
Merge pull request #228 from Unity-Technologies/shadows
Update Shadows system
8 年前
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
3a226917
merged master
8 年前
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
024a70fc
Merged master.
7 年前
8d6acfbc
HDRenderPipeline: Update Layered test scene
7 年前
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 年前
60296408
HDRenderPipeline: Update all material Keywords
7 年前
733171ce
Merge branch 'Unity-2017.3'
7 年前
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
aed9d43e
- Fixed meta pass to use correctly UV 2 and 3 and world space position for planar (planar still does not work though because of possible C++ dependency in the meta pass)
- Added a planar lit case in LayeredLitTest scene
7 年前
efb76d07
Missing files
7 年前
7b0b6b5b
Missing files
7 年前
84f1dbd1
Merge pull request #546 from Unity-Technologies/FixMetaPassUV
Fix meta pass uv
7 年前
b6cf8abe
Merge pull request #549 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
a1929730
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Character.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/Textures.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/0xxx.meta
7 年前
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
f052451a
merged from master
7 年前
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
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 年前
2c9bfb4e
HDRenderPipeline: fix all material in current project
7 年前
fc5778fa
Merge pull request #655 from Unity-Technologies/Fix-all-material-in-project
HDRenderPipeline: fix all material in current project
7 年前
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
2b24ec8c
Update all material
7 年前
7ab47949
Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data
Add versionning on additonal data
7 年前
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
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 年前
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
87c36d52
merged with master
7 年前
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 年前
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 年前
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 年前
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
2fd0a788
HDRenderPipeline: Update all materials
7 年前
fbce26f6
Merge pull request #770 from Unity-Technologies/update-all-materials
HDRenderPipeline: Update all materials
7 年前
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
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 年前
544aba56
Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
4b33a1b6
Merge branch 'master' into lw-gc-optim
7 年前
6ba9292e
Revered matrerial update after heightmap parametrization change.
7 年前
cdd44d73
Re-updated materials with new heightmap parametrization
7 年前
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
37a266ac
Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate
Branch fix height map update
7 年前
01b7d081
HDRenderPipeline: Update all materils keyword in scene and project
7 年前
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
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 年前
77f9f167
Merge branch 'master'
7 年前
3ccf74cc
merged from master
7 年前
4bef6509
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
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 年前
7d2031ec
Merge branch 'master'
7 年前
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
86df6636
Merge master
7 年前
5f384459
HDRenderPipeline: Update all materials
7 年前
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
ca10cd2f
Merge
7 年前
c51ce48c
Merged master
7 年前
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
cf25c602
Merge master
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
a28733e8
HDRenderPipeline: Update all materials
7 年前
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
0bfdddfc
Merge Screen Shadows
7 年前
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 年前
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
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 年前
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
ffbd199e
- Fixed objects motion vectors (they were upside down)
- Fixed some warnings
7 年前
ed3443be
Revert "- Fixed objects motion vectors (they were upside down)"
This reverts commit c85edb82a9a539fba719f345433b9e2a11134046.
7 年前
0d5b90fd
updated mats for 2018.1.0b6
7 年前
360fd4d8
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
7 年前
5f14b489
Update all materials with Last PR
7 年前
ce027b15
Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass
Update all material for PR 946
7 年前
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
e768893e
Merge branch 'master'
7 年前
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
04b933d9
merged with master
7 年前
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Julien Ignace
Paul Demeulenaere
Sebastien Lagarde
Felipe Lira
arnaudcarre
Arnaud Carré arnaud@unity3d.com
GitHub
sebastienlagarde
Evgenii Golubev
Filip Iliescu
Arnaud Carre
Tim Cooper
Chman
Mikko Strandborg
uygar
runes
Antti Tapaninen
vlad-andreev
Robert Srinivasiah
Peter Andreasen
Paul Melamed
Raymond Graham
Frédéric Vauchelles
Remy
Mike Wuetherick
lyndon homewood
Thomas
John