sebastienlagarde
f61b40c5
HDRenderLoop: Move editor thing in editor directory to be able to build a player
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 年前
joeante
84ff510c
Material Upgrader support first pass
Material Upgrader framework and specific implementation for Standard ->
HD Lit.
Only limited amount of properties are transfererred. More todo.
8 年前
vlad-andreev
5b31375a
Merge branch 'MaterialUpdater' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Paul Demeulenaere
4f7e51fb
Split LitUI and UnlitUI with base class to share behavior with the MaterialGraph
8 年前
Evgenii Golubev
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
GitHub
59bd5b18
Merge pull request #24 from Unity-Technologies/Split-LitUI-and-UnlitUI-with-BaseClass
BaseClass for LitUI and UnlitUI
8 年前
Paul Demeulenaere
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Paul Demeulenaere
592b2ca6
Plug UnlitGraphUI to UnlitTemplate
8 年前
Evgenii Golubev
2df9af84
Merge branch 'SkySystem'
8 年前
Evgenii Golubev
80814477
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePass.hlsl
8 年前
Julien Ignace
668f9372
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs
8 年前
Julien Ignace
9ccb7b24
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
GitHub
2dd27005
Merge pull request #41 from Unity-Technologies/LayeredLit
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
Evgenii Golubev
8bbe4289
Merge remote-tracking branch 'upstream/master'
8 年前
Arnaud Carre
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
sebastienlagarde
6521b4be
HDRenderPipeline: More rename of UnityEditor.Experimental.ScriptableRenderLoop + minor stuff
8 年前
Chman
fc2f9126
Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master' into postfx-hack
8 年前
Evgenii Golubev
478a2e31
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 年前
sebastienlagarde
8a6b2cf1
HDRenderPipeline: Update unlit shader
8 年前
GitHub
28357983
Merge pull request #126 from Unity-Technologies/Update-unlit-shader
HDRenderPipeline: Update unlit shader
8 年前
Tim Cooper
a1e72bda
Merge remote-tracking branch 'origin/master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassResources.cs
8 年前
Evgenii Golubev
ac23a82e
Merge branch 'master' into SSSSS
8 年前
Julien Ignace
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 年前
Arnaud Carré arnaud@unity3d.com
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 年前
Arnaud Carre
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
Sebastien Lagarde
68f6880e
HDRenderPipeline: Cleanup GUI for lit and layered lit material
- reorganize attributes
- remove inputs options
- Add SkyBox/Cubemap to the project
8 年前
GitHub
554a5c02
Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI
Layered lit clean and ui update
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
runes
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
e13205b5
HDRenderPipeline: Change two sided options
Remove all variant of two sided, let double sided mirror for lit
material and double sisded for unlit
8 年前
GitHub
551cee1c
Merge pull request #155 from Unity-Technologies/Change-two-sided-option
HDRenderPipeline: Change two sided options
8 年前
Evgenii Golubev
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
Sebastien Lagarde
00cb67b6
HDRenderPipeline: Clean interface and update UnlitUI
8 年前
GitHub
ba1e0e65
Merge pull request #158 from Unity-Technologies/Cleanup-of-inspectorUI-code
Cleanup and update of Lit and Unlit UI
8 年前
Evgenii Golubev
967eec25
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
7b4ab969
Merge branch 'master' into Branch_SceneSettings
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
8 年前
uygar
77102a68
Merge branch 'master' into shadows
8 年前
sebastienlagarde
794210ad
HDRenderPipeline: Fix compil issue with normal map in object space in litMaterial
8 年前
Evgenii Golubev
a5c5f339
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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 年前
uygar
cefe8b15
Merge branch 'master' into shadows
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 年前
Evgenii Golubev
c05830f9
Remove the default SSS profile
8 年前
GitHub
77b44a0b
Merge pull request #205 from EvgeniiG/master
Refactor SSS
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 年前
Julien Ignace
a58a777f
Added first version of vertex wind and a corresponding test scene.
8 年前
Julien Ignace
19ea7e56
Typo
8 年前
GitHub
5ae8a937
Merge pull request #207 from Unity-Technologies/Branch_WindV1
Added first version of vertex wind and a corresponding test scene.
8 年前
Evgenii Golubev
9d4c2988
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
336f484e
Merge branch 'master' into metal-ios
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 年前
Antti Tapaninen
46f1a7cf
Merge branch 'master' into metal
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 年前
Sebastien Lagarde
5e3e7549
HDRenderPipeline: Allow Disortion to not be display in unlit
8 年前
Evgenii Golubev
42530415
Merge branch 'master'
8 年前
Julien Ignace
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 年前
Sebastien Lagarde
58f36f39
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
8 年前
Filip Iliescu
3a226917
merged master
8 年前
sebastienlagarde
e0790c63
HDRenderPipeline: Show double sided global illumination option on lit shader
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 年前
Filip Iliescu
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
David Rogers
85744e59
Local merge
8 年前
David Rogers
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
8 年前
Julien Ignace
7d46e579
"Simple" LayeredLit WIP
7 年前
Julien Ignace
9f664a03
- Removed "simple" layered lit.
- InlfuenceLayeredLit now shares UI with the Lit shader and displays it in foldouts for each layer.
7 年前
GitHub
0dda7798
Merge pull request #375 from Unity-Technologies/Branch_RenameLayeredShader
LayeredLit refactor
7 年前
Evgenii Golubev
5bf0af64
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
runes
dd5838bd
sample game delta:
-FPS Mode (Render mesh with custom FOV)
-only PCF shadows with game specific limits
-Atmosphere y-offset property
7 年前
Peter Bay Bastian
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Julien Ignace
2d461ae1
Removed DetailMask and Emissive Mode.
- Detail mask is now always in the blue channel of the mask map
- Emissive is now EmissiveMap * EmissiveColor * lerp(1.0, Albedo, albedoAffectEmissive) with EmissiveMap being optional.
7 年前
GitHub
a7bad06d
Merge pull request #392 from Unity-Technologies/Branch_LitAndLayeredImprovements
Removed DetailMask and Emissive Mode.
7 年前
Sebastien Lagarde
f8e4f5df
Merge remote-tracking branch 'refs/remotes/origin/master' into bent-normal-and-specular-occlusion
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
Julien Ignace
9e3a6300
Fixed directional shadow for transparent shaders by adding the right defines.
7 年前
GitHub
02239cb4
Merge pull request #398 from Unity-Technologies/Branch_DeferredDirShadow
Branch deferreddirshadow
7 年前
Peter Andreasen
69c448b2
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Felipe Lira
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
sebastienlagarde
5a6d78c4
Update project from sratch
7 年前
sebastienlagarde
cd5fd6d3
merge latest 2017.3
7 年前
Thomas
076b0d65
Cleaned up unused usings
7 年前
GitHub
89072748
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
7 年前
sebastienlagarde
71713559
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
GitHub
f49bc2d1
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
a40f87a0
Clean/update for distortion + add a transparent depth prepass
- Rename All ForwardDisplayDebug to ForwardDebugDisplay
- Clean/factor code for distortion and SetEnablePass
- Add support for a RenderTransparentDepthPrepass (can be use for hair)
- Distortion pass is now consider as always a separate pass (no MRT
during particles rendering)
7 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Sebastien Lagarde
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
7 年前
sebastienlagarde
81a9725b
HDRenderPipeline: Update UI to only display option for alpha test shadow/prepass with transparent
7 年前
Evgenii Golubev
8d403196
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Evgenii Golubev
ea93b8f4
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
GitHub
28e0a528
Merge pull request #452 from Unity-Technologies/Distortion-cleanup-and-transparent-depth-pass
Distortion cleanup and transparent depth pass
7 年前
sebastienlagarde
cb146691
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Julien Ignace
30bdceed
- Properly integrated fog for transparent Lit/Unlit materials.
- Added density parameter for exp fog
7 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Frédéric Vauchelles
448737fc
Prototype for distorstion
7 年前
Frédéric Vauchelles
315455b3
(wip) distortion rejection with stencil buffer
7 年前
Frédéric Vauchelles
e533651d
Added a nullify option for distortion, based on stencil buffer usage
7 年前
Frédéric Vauchelles
acca5c71
Use a multiply blend mode instead of stencil to control distortion
7 年前
Frédéric Vauchelles
5cf7b5ab
Added remapping for distortion blur
7 年前
Frédéric Vauchelles
7c7d937f
Updated UI text
7 年前
GitHub
95f1f3a0
Merge pull request #474 from Unity-Technologies/feature/distortion
Feature/distortion
7 年前
GitHub
17bdc932
Merge pull request #476 from Unity-Technologies/Unity-2017.3
Merge 2017.3
7 年前
Sebastien Lagarde
6dd42b8c
Update forward only mechanism
Before we have ForwardOpaqueOnly and ForwardOpaqueDepthOnly and they
were required to be both present at the same time in sahder with regular
pass. Now pass are exclusive:
Guidelines: In deferred by default there is no opaque in forward.
However it is possible to force an opaque material to render in
forward
by using the pass "ForwardOnly". In this case the .shader should
not have "Forward" but only a "ForwardOnly" pass.
It must also have a
"DepthForwardOnly" and no "DepthOnly" pass as forward material (either
deferred or forward only rendering) have always a depth pass.
7 年前
Sebastien Lagarde
bd84a419
Correct wrong define used in test + fix issue with transparent keyword not reset
7 年前
GitHub
fa099da4
Merge pull request #481 from Unity-Technologies/Fix-forwardOnly-unlit
Rewrite forwardOnly management
7 年前
GitHub
9cacf651
Merge branch 'master' into Unity-2017.3
7 年前
GitHub
9d30417f
Merge pull request #482 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Thomas
83fb54f8
Merge branch 'Unity-2017.3' into msvo
7 年前
Felipe Lira
cdc50657
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Peter Andreasen
e2332032
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Sebastien Lagarde
f3fffa10
HDRenderPipeline: Fix Distortion UI (Correctly replicate attribute on shader)
- Lit/LitTessellation have distortion
- LayeredLit/LayeredLitTessellation haven't
7 年前
GitHub
21c95ebc
Merge pull request #491 from Unity-Technologies/Fix-distortion-UI-issue
HDRenderPipeline: Fix Distortion UI (Correctly replicate attribute on shader)
7 年前
Frédéric Vauchelles
722dee63
(wip) Prepass for transparent
7 年前
Frédéric Vauchelles
791c45f8
Moved keyword setup in BaseLitUI.cs
7 年前
Frédéric Vauchelles
1e32285e
Renamed PreTransparent to PreRefraction
7 年前
Frédéric Vauchelles
74ced4de
Property check on material property
7 年前
GitHub
4d41fcaa
Merge pull request #496 from Unity-Technologies/feature/transparentPrepass
Feature/transparent prepass
7 年前
sebastienlagarde
522098e8
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
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 年前
Julien Ignace
4a214e97
- Fixed shader compilation errors on PS4
- Fixed auto-merge mistake
- Renamed blend mode to more artists friendly names and removed SoftAdd mode.
7 年前
Frédéric Vauchelles
ce940be0
Removed distortion only for lit shader
7 年前
Frédéric Vauchelles
9ecea206
Hide blend mode popup when using refraction
7 年前
Julien Ignace
7da1ae05
Added "enable fog" parameter to layered shader.
7 年前
GitHub
6ef6a1b3
Merge pull request #503 from Unity-Technologies/Branch_FogAndProceduralSky
Branch fog and procedural sky
7 年前
sebastienlagarde
aa798d74
HDRenderPipeline: Remove useless _BLENDMODE_SOFT_ADD
7 年前
GitHub
2df3e46a
Merge branch 'Unity-2017.3' into feature/transparentSpecularBlending
7 年前
GitHub
6773024c
Merge pull request #504 from Unity-Technologies/feature/transparentSpecularBlending
Feature/transparent specular blending
7 年前
sebastienlagarde
b4ced9f3
HDRenderPipeline: Rename BlendDiffuseSpecular to ApplyBlendMode + fix some comment
7 年前
Sebastien Lagarde
cd755f87
Add _SURFACE_TYPE_TRANSPARENT keyword (so fog work with rough refraction)
7 年前
Sebastien Lagarde
d5855c4e
Move _surface_type_transparent definition to BaseUnlitUI.cs
7 年前
sebastienlagarde
7e7d8661
HDRenderPipeline: Update UI and fog test scene
7 年前
GitHub
c7d467a6
Merge pull request #505 from Unity-Technologies/Fix-fog-rough-refraction
Fix fog rough refraction
7 年前
sebastienlagarde
36c0ec18
Add _BLENDMODE_ACCURATE_LIGHTING keyword - change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- rename _LinearFogOoRange as _LinearFogOneOverRange
- add _BLENDMODE_ACCURATE_LIGHTING keyword
- change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- update test scene
- fix issue with refractoinMask not correct by default- rename
_LinearFogOoRange as _LinearFogOneOverRange
- add _BLENDMODE_ACCURATE_LIGHTING keyword
- change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- update test scene
7 年前
sebastienlagarde
d33ee23f
more renaming
- Rename _EnableTransparentFog to _EnableFogOnTransparent
- Rename _BLENDMODE_ACCURATE_LIGHTING to
_BLENDMODE_PRESERVE_SPECULAR_LIGHTING
7 年前
GitHub
78752582
Merge pull request #506 from Unity-Technologies/Update-Transparent-code
Update fog and blend mode
7 年前
sebastienlagarde
5e418eb0
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-blend-mode
7 年前
sebastienlagarde
27b99b20
Update blend mode and fix issue with UI
- Change alpha blend mode to One / InvSrc alpha and the multiplication
is done in the shader. Avoid precision issue
- Make a comment ApplyBlendMode function
- Update test scene
- Fix an issue with the UI and the Popup of blend mode
7 年前
GitHub
f86a150a
Merge pull request #508 from Unity-Technologies/Fix-blend-mode
Update blend mode
7 年前
Evgenii Golubev
733171ce
Merge branch 'Unity-2017.3'
7 年前
sebastienlagarde
fed282ba
HDRenderPipeline: Fix UI with transparent
7 年前
Frédéric Vauchelles
1e05f581
Merge Unity-2017.3
7 年前
Julien Ignace
36a22fff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FixDebugWindow
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 年前
Frédéric Vauchelles
55f274a4
Automatically sync double sided GI property with material's double sided property
7 年前
GitHub
081fbb34
Merge pull request #525 from Unity-Technologies/feature/syncDoubleSidedGI
Automatically sync double sided GI property with material's double si…
7 年前
sebastienlagarde
bb4add89
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
Remy
cffd854a
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
Julien Ignace
eb9b38db
Hack for GI to handle Alpha Test correctly: Filled the hard-coded property used by the GI system to resolve opacity with our own equivalent so that GI works correctly with alpha-test. Disabled for now for Unlit because of a name conflict.
7 年前
GitHub
068e18e4
Merge pull request #532 from Unity-Technologies/Branch_FixPVROpacity
Hack for GI to handle Alpha Test correctly: Filled the hard-coded pro…
7 年前
sebastienlagarde
6c9a5ca6
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-refraction-cubemap-support
7 年前
sebastienlagarde
5fab912f
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Refactor-LightLoop-Glue-Code
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Julien Ignace
0bd39134
Renamed _ColorXXX properties in Unlit to _UnlitColor to avoid conflict with legacy Unity names which are required for Alpha test to work with GI.
7 年前
Sebastien Lagarde
3eb94be0
Update files to better match unity 2017.3
7 年前
GitHub
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
GitHub
298835b9
Merge pull request #539 from Unity-Technologies/Branch_FixPVROpacity
Renamed _ColorXXX properties in Unlit to _UnlitColor to avoid conflic…
7 年前
GitHub
3876705e
Merge pull request #540 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
11388041
HDRenderPipeline: Add tile/scale uv control to emissive color map
7 年前
GitHub
0bf4e0e7
Merge pull request #547 from Unity-Technologies/Update-Emissive-color-with-tile/scale
HDRenderPipeline: Add tile/scale uv control to emissive color map
7 年前
GitHub
b6cf8abe
Merge pull request #549 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
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 年前
sebastienlagarde
bc549388
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
GitHub
9e651ebf
Merge pull request #558 from Unity-Technologies/Update-metapass
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
sebastienlagarde
2d587903
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Sebastien Lagarde
36f3cfd4
merge unity 2017.3
7 年前
GitHub
64affbce
Merge pull request #559 from Unity-Technologies/Unity-2017.3
Unity 2017 3
7 年前
Evgenii Golubev
6e30e2d6
Merge branch 'Unity-2017.3'
7 年前
Salvador Jacobi
4bd00346
Merge branch 'master' into organize-menu-items
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Evgenii Golubev
b452c309
Merge branch 'Unity-2017.3'
7 年前
Julien Ignace
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
Julien Ignace
e49a48c0
Added correct callback to handle the change of shader in our various material editors.
7 年前
GitHub
fe7d9ccf
Merge pull request #569 from Unity-Technologies/Branch_FixNewShaderOnMaterial
Branch fix new shader on material
7 年前
GitHub
9ef5873f
Merge pull request #571 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
f9690423
HDRenderPipeline: Update UI for AO (Remap), Distortion (ScaleBias) and UnlitColor (UVs mapping)
7 年前
GitHub
25e3b085
Merge pull request #572 from Unity-Technologies/Update-various-UI
HDRenderPipeline: Update UI for AO (Remap), Distortion (ScaleBias) an…
7 年前
GitHub
569840ef
Merge pull request #573 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
6cea0d27
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
Evgenii Golubev
fdcd7680
Merge branch 'Unity-2017.3' of https://github.com/EvgeniiG/ScriptableRenderLoop into volumetrics
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
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 年前
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 年前
Sebastien Lagarde
54642339
HDRenderPipeline: Remove multiplicative mode 2
7 年前
GitHub
36c8a29b
Merge pull request #595 from Unity-Technologies/Remove-multiply-blendmode
Remove multiply blendmode
7 年前
Sebastien Lagarde
61e38068
HDRenderPipeline: Add support for depth postpass and backface/frontface rendering
7 年前
GitHub
fa729f24
Merge pull request #597 from Unity-Technologies/Implement-depth-post-pass
HDRenderPipeline: Add support for depth postpass and backface/frontface rendering
7 年前
Evgenii Golubev
e84fe4b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
eea6961b
HDRenderPipeline: Fix issue with double sided and back face rendering + move transparent prepass to prepass
7 年前
Evgenii Golubev
6be2053b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
Sebastien Lagarde
15b64fff
Replace SetKeyword by CoreUtils.SetKeyword
7 年前
GitHub
bb9d2f89
Merge pull request #628 from Unity-Technologies/update-SetKeyword-to-UnityEngine.Experimental.RenderingCoreUtils.SetKeyword
Replace SetKeyword by CoreUtils.SetKeyword
7 年前
Evgenii Golubev
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Remy
5b6ad5e8
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Frédéric Vauchelles
6541de0b
Merge master
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
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 年前
sebastienlagarde
0af1be7a
HDRenderPipeline: Move Depth postpass to after transparent (solve issue) + add it to lit shader
7 年前
sebastienlagarde
fa6e0a3a
Various typo fix + disable extra pass if distortion only
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
GitHub
d1768cbc
Merge pull request #654 from Unity-Technologies/Add-transparent-depth-postpass-support
HDRenderPipeline: Move Depth postpass to after transparent (solve issue) + add it to lit shader
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 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Sebastien Lagarde
0690038f
HDRenderPipeline: Homegenize name prepass postpass
7 年前
GitHub
fa0eed63
Merge pull request #718 from Unity-Technologies/Homogeneous-naming-postpas-prepass
HDRenderPipeline: Homegenize name prepass postpass
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 年前
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 年前
sebastienlagarde
4a2a867b
HDRenderPipeline: Don't add keyword _BLENDMODE_PRESERVE_SPECULAR_LIGHTING if material is not transparent
7 年前
Julien Ignace
35537fc9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Sebastien Lagarde
cd92c7dc
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 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
10a938eb
Add support for transparent queue priority
7 年前
sebastienlagarde
c99235da
Move range renderqueue to class HDRenderQueue
7 年前
GitHub
4cb77cb7
Merge pull request #851 from Unity-Technologies/Add-transparent-priority-support
Add transparent priority support
7 年前
sebastienlagarde
2345a375
Rename transparentQueuePriority to transparentSortPriority
+ rename GeometryLast => OpaqueLast
7 年前
GitHub
7d86032b
Merge pull request #852 from Unity-Technologies/Add-transparent-priority-support
Add transparent priority support
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Remy
ae087b6d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
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 年前
sebastienlagarde
0b8efbbc
Add support of UV1 to UV3 set on base color
Note that if users select > UV1 this will have a perf impact as due to
surface gradient calculation
7 年前
GitHub
865a869a
Merge pull request #874 from Unity-Technologies/Support-UV0-UV3-on-lit-for-base
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 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
sebastienlagarde
48efe04c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
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 年前
sebastienlagarde
3d4d194e
Debug display is now a multi compile option
7 年前
GitHub
14257e27
Merge pull request #909 from Unity-Technologies/debug-display-as-multicompile
Debug display is now a multi compile option
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 年前
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 年前
sebastienlagarde
8a1d7457
Forward pass now control its depth test. Optimization with clip and depth prepass is only for Lit/layeredLit shader
7 年前
sebastienlagarde
e7850ca7
Update UI
7 年前
sebastienlagarde
94301889
Move EnableMotionVectorForVertexAnimation to baseUnlit + remove motion vector from unlit.shader
7 年前
GitHub
bbd2c5ef
Merge pull request #946 from Unity-Technologies/Improve-forward-opaque-pass
Remove the constrain to have a depth prepass for a forward material
7 年前
sebastienlagarde
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Remy
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Robert Srinivasiah
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Julien Ignace
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
7 年前
Remy
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Remy
b295db15
Material upgrader now correctly supports standards -> lit and unlits -> unlit
7 年前
GitHub
f7f81ac1
Merge pull request #982 from Unity-Technologies/MaterialUpgrader_Upgrade
Material upgrader upgrade
7 年前
Sebastien Lagarde
0d688467
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Peter Bay Bastian
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Sebastien Lagarde
60bcac15
Fix several shader and C# warning
7 年前
Sebastien Lagarde
edfea7bc
Fix several shader and C# warning
7 年前
GitHub
a29f9db9
Merge pull request #1010 from Unity-Technologies/fix-shader-warning
Fix several shader and C# warning
7 年前
Joel de Vahl
56f21e1e
Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades
7 年前
Remy
50623c84
Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader
7 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
7 年前
Robert Srinivasiah
7733d48a
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
John Parsaie
0fe793d7
Merge 2018.1
7 年前
sebastienlagarde
0d28adac
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
7 年前
sebastienlagarde
1a7511d7
Update comment
7 年前
Felipe Lira
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
7 年前
Julien Ignace
f00d20a6
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
GitHub
5fc4e97e
Update comment
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
GitHub
bd98e302
Merge pull request #1067 from Unity-Technologies/Branch_RemoveGBufferWithPrepass
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materi…
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
John Parsaie
73467192
Merge branch '2018.1' into projects/TheLastStand
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 年前
Frédéric Vauchelles
5ab7101f
Moved algorithm selection to shader variant
7 年前
Raymond Graham
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
Yao Xiaoling
5639b1fc
Added Terrain shader and TerrainUI based on layered lit shader.
7 年前
Yao Xiaoling
846b792e
Small fixes due to removal of vertex animation and transparent mode.
7 年前
Tim Cooper
fafb59af
Run code formatter.
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 年前
sebastienlagarde
aed1c4eb
Fix issue with emissionColor not reset to white in material reset
fogbuzz https://fogbugz.unity3d.com/f/cases/1038511/
7 年前
GitHub
5a490473
Merge pull request #1427 from Unity-Technologies/Fix-issue-with-emissioncolor
Fix issue with emissionColor not reset to white in material reset
7 年前
GitHub
2274ce9d
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
7 年前
sebastienlagarde
55b91556
Replace EmissiveIntesnity by EmissveColor HDR
Remove all occurrence of EmissiveIntensity. Emissive color is now HDR (with HDR color picker). Data need to be updated
7 年前
GitHub
a3255733
Merge pull request #1445 from Unity-Technologies/Replace-EmissiveIntesnity-by-EmissveColor-HDR
Replace EmissiveIntesnity by EmissiveColor HDR
7 年前
Sebastien Lagarde
dcbff94f
refactor shader variant per material + Add variant stripper for stacklit and selection
7 年前
sebastienlagarde
23e50c80
Rename SahderPreprocessorMaterial to BaseShaderPreprocessor
7 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
GitHub
1ea2f496
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
7 年前
Remy
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
Stephane Laroche
7933fd8d
Merge branch 'master' into StackLit2
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
sebastienlagarde
6c870111
Merge branch 'master' into FalseColorMode
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
Chris Tchou
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
7 年前
Yao Xiaoling
38856112
Fix merge.
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
7 年前
Yao Xiaoling
ced29fd6
Allows some of the properties on BaseLit and BaseUnlit to be absent.
7 年前
GitHub
08e34742
Merge pull request #1793 from Unity-Technologies/gpu-terrain/common-changes
Allows some of the properties on BaseLit and BaseUnlit to be absent.
7 年前
GitHub
6ec5b4df
Merge branch 'HDRP/staging' into IndirectLightingControlVolume
7 年前
GitHub
c3119430
Merge pull request #1803 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
7 年前
Yao Xiaoling
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
7 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Anis Benyoub
949ce831
More work on cloth UI
6 年前
GitHub
0f00f09d
Merge pull request #1847 from Unity-Technologies/Add-cloth-material-anis
Finishing a first version of the implementation of the Fabric Shader
6 年前
Sebastien Lagarde
82c30969
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
GitHub
f25dd24a
Merge branch 'master' into HDRP/staging
6 年前
GitHub
2befab52
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
Julien Ignace
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
egomeh
e7c59a70
Resolve merge conflicts
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前