Julien Ignace
|
ad89bd6f
|
My changes
|
8 年前 |
|
Julien Ignace
|
7d178554
|
Added some unlit materials to test Unlit GI
|
8 年前 |
runes
|
2998b7cd
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
Paul Demeulenaere
|
e7df382c
|
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/Lit.cs
|
8 年前 |
Evgenii Golubev
|
d42f0b22
|
Upgrade all materials in the HD test scene
|
8 年前 |
GitHub
|
24918600
|
Merge pull request #162 from EvgeniiG/master
Improve the SSS profile UI
|
8 年前 |
uygar
|
77102a68
|
Merge branch 'master' into shadows
|
8 年前 |
Arnaud Carre
|
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 年前 |
|
runes
|
cb7bce50
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
|
Julien Ignace
|
293776aa
|
Compilation fix on PS4: removed static keyword and reverted Cluster size to 16 because there's not enough VGPR on PS4 to compile it otherwise (to investigate)
|
8 年前 |
|
Julien Ignace
|
813ade24
|
Revert "Compilation fix on PS4: removed static keyword and reverted Cluster size to 16 because there's not enough VGPR on PS4 to compile it otherwise (to investigate)"
This reverts commit de20a6598ac2ad76369047a9c7de0d524054f8dc.
|
8 年前 |
Felipe Lira
|
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 年前 |
Tim Cooper
|
c30d33b8
|
[Format]Reformat via format.pl to match the new conventions
|
8 年前 |
Antti Tapaninen
|
a261aadf
|
Merge branch 'master' into metal-ios
|
8 年前 |
|
Antti Tapaninen
|
06aa5d1c
|
Merge branch 'master' into metal
|
8 年前 |
|
Evgenii Golubev
|
9d4c2988
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
|
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
|
8 年前 |
vlad-andreev
|
3a5b105e
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
8 年前 |
|
uygar
|
8db09493
|
Merge branch 'master' into shadows
|
8 年前 |
Filip Iliescu
|
6e428acc
|
Merge branch 'metal' into classicDeferredMobile
|
8 年前 |
sebastienlagarde
|
b010d5c1
|
HDrenderPipeline: Add some comment to shadow tessellation fix
|
8 年前 |
|
Arnaud Carre
|
a9656da4
|
Merge branch 'master' into Branch_Batching2
|
8 年前 |
|
Filip Iliescu
|
4adbf45e
|
Merge branch 'master' into OnTileDeferred
|
8 年前 |
|
Filip Iliescu
|
23202e49
|
merge in OnTileDeferredBranch after merging in master to it
|
8 年前 |
Mike Wuetherick
|
0d5b90fd
|
updated mats for 2018.1.0b6
|
7 年前 |
John
|
360fd4d8
|
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
|
7 年前 |
