Andre McGrail
|
a21b0c40
|
Created both Metallic and Specular PBR validation scenes with template image done in legacy pipe.
|
7 年前 |
Felipe Lira
|
6076bb69
|
Fixed up LightweightStandardShaderGUI to only support BakedEmissive lightmap mode.
|
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 年前 |
Felipe Lira
|
c9712307
|
Updated LOD0 material importing options to use the project embedded materials and prevent creating a new one.
|
7 年前 |
Felipe Lira
|
9ea83a56
|
Added Occlusion keyword. Updated materials. More refactor on the shader.
|
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 年前 |
Peter Andreasen
|
867c8236
|
Merge remote-tracking branch 'origin/master' into sample_game
|
7 年前 |
GitHub
|
26d799fa
|
Merge branch 'YibingProject' into Unity-2017.3
|
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 年前 |
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 年前 |
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 年前 |
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 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |