Julien Ignace
|
36d89c76
|
- Improved LayeredLit test scene.
- Added a menu item to re-synchronize all LayeredLit materials.
- Fixed some multi-editing issues with LayeredLit material.
|
8 年前 |
GitHub
|
973d16b4
|
Merge pull request #73 from Unity-Technologies/LayeredLit
Layeredlit improvements
|
8 年前 |
Arnaud Carre
|
66610d8f
|
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
|
8 年前 |
Evgenii Golubev
|
f38f5e1a
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
|
Julien Ignace
|
339762d5
|
Updated LayeredLit test scene with latest changes.
|
8 年前 |
|
GitHub
|
900efeeb
|
Merge pull request #91 from Unity-Technologies/Branch_update-layered-test-scene
Updated LayeredLit test scene with latest changes.
|
8 年前 |
|
Evgenii Golubev
|
74657c39
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
Felipe Lira
|
05e84b23
|
Merge branch 'master' into lowendmobile
|
8 年前 |
Paul Demeulenaere
|
40290c81
|
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
|
8 年前 |
|
Arnaud Carre
|
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 年前 |
|
Julien Ignace
|
dc4b3493
|
Fixed sRGB flag on detail map for layered lit test scene.
|
7 年前 |
|
GitHub
|
92cf9ffa
|
Merge pull request #203 from Unity-Technologies/Branch_FixLayeredLitScene
Fixed sRGB flag on detail map for layered lit test scene.
|
7 年前 |
Antti Tapaninen
|
0df1b41e
|
Merge branch 'master' into metal-ios
|
7 年前 |
|
Antti Tapaninen
|
0574ef6b
|
Merge branch 'master' into metal
|
7 年前 |
|
Arnaud Carre
|
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
|
7 年前 |
vlad-andreev
|
3a5b105e
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
uygar
|
8db09493
|
Merge branch 'master' into shadows
|
7 年前 |
Filip Iliescu
|
6e428acc
|
Merge branch 'metal' into classicDeferredMobile
|
7 年前 |
sebastienlagarde
|
8d6acfbc
|
HDRenderPipeline: Update Layered test scene
|
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 年前 |
Sebastien Lagarde
|
a4fddf9c
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
|
7 年前 |
Peter Andreasen
|
f052451a
|
merged from master
|
7 年前 |
