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
a3bbf88f
material upgrader: support texture scale/offset, disable saving assets for now
8 年前
vlad-andreev
93ca6ef0
more property conversions, light intensity conversion, shader LOD toggle, sample shader (WIP), standard specular conversion (WIP)
8 年前
Tim Cooper
2b3f2f91
[refactor namespace]
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering.{LoopName}
8 年前
GitHub
4925d00e
Merge pull request #77 from Unity-Technologies/namespace-refactor
[refactor namespace]
8 年前
Evgenii Golubev
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
c5bf4cfb
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitSurfaceData.hlsl
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 年前
Felipe Lira
33d7e522
Upgrade mateiral upgrader to suit LDRenderLoop needs.
8 年前
Felipe Lira
11a8a1a4
MaterialUpgrader for Mobile to LDRenderPipeline and small changes to allow gloss & shineness on LDRenderPipeline. Temporary workaround the issue that was causing Lightmap to crash unity.
8 年前
Felipe Lira
37ce1cf7
Added emission map. Upgrade selected, and specular power now has a similar computation to legacy ones (shininess multiply) so when upgrading projects lighting behaves more or like the same as legacy.
8 年前
Felipe Lira
85eec1f1
Added ReflectionCubemap support to lowend mobile. Added Material upgraders to most of legacy shaders.
8 年前
Felipe Lira
8753342a
Implemented AssignNewShader callback to update shader keyword upon material upgrade.
8 年前
Felipe Lira
6b76e6ce
Added emission self-illumin upgrader to low end mobile pipeline.
8 年前
Felipe Lira
15fae8de
Changed the upgrader to apply conversion parameters in the AssignNewShadertoMaterial callback so when changing the shader in the material UI it also upgrade properly.
8 年前
Torbjorn Laedre
18149668
MaterialUpdater: Updated to work with current state of affairs. Added options for converting keywords to properties, configurable input/output shaders on standard type upgraders, finalizer delegate option for material post-processing (like setting keywords etc).
8 年前
GitHub
1255a80d
Merge pull request #194 from Unity-Technologies/MaterialUpgrader
MaterialUpdater: Updated to work with current state of affairs. Added…
8 年前
runes
c39b8a1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
764e5269
Merge branch 'master' into metal-ios
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 年前
Felipe Lira
6c22422b
Changes to lowend upgraders after material upgrader callback.
8 年前
GitHub
baac8e54
Merge pull request #189 from Unity-Technologies/lowendmobile
Lowendmobile
8 年前
Antti Tapaninen
0df1b41e
Merge branch 'master' into metal-ios
8 年前
Antti Tapaninen
0574ef6b
Merge branch 'master' into metal
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 年前
Thomas
c6639f12
LightEditor refactor for 2017.3
Awaiting 2018.1 features to simplify & improve it
7 年前
GitHub
ba11639e
Merge pull request #439 from Unity-Technologies/refactor-light-editor
LightEditor refactoring
7 年前
sebastienlagarde
24c669b1
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
Sebastien Lagarde
78609ffc
Merge branch 'Unity-2017.3' into YibingProject
7 年前
GitHub
1137cfb3
Merge pull request #441 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
df6297b3
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Thomas
8d6418ec
Introducing CoreEditorUtils
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 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Sebastien Lagarde
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
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 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Thomas
3d4686f1
Full SSS refactor
7 年前
GitHub
1b740960
Merge pull request #462 from Unity-Technologies/sss-refactor
Full SSS refactor
7 年前
sebastienlagarde
62435a94
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Update-detail-texture-blend-formula
7 年前
sebastienlagarde
3946f7cd
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
sebastienlagarde
3305fbf3
Merge remote-tracking branch 'refs/remotes/origin/Add-Per-Pixel-scale' into Add-Per-Pixel-Scale-Seb-Test
7 年前
Evgenii Golubev
86fe9ae4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
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 年前
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 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Paul Melamed
6a8f9743
Transitional shader for system shock material upgrade
7 年前
Paul Melamed
740ffb6b
Add convert project folder option
7 年前
Paul Melamed
f735f83d
Added partial support for specular setup conversion
7 年前
Paul Melamed
86ed9235
fix detail tiling conversion
7 年前
Paul Melamed
7a08434c
cleanup some common code
7 年前
Paul Melamed
d5c19ff9
only upgrade materials with the correct shader
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Sebastien Lagarde
8b2b4a16
HDRenderPipeline: Add include shader path for external generated shader
7 年前
Peter Andreasen
5d36f104
Merged master
7 年前
Tim Cooper
c6f38d1a
temp commit
7 年前
Evgenii Golubev
7b797ff7
Merge branch 'master'
7 年前
Peter Bay Bastian
1729e2ba
Proper include paths
7 年前
Peter Bay Bastian
b7db3ef9
Merge branch 'shader-include-paths-2'
7 年前
Frédéric Vauchelles
fe773302
Merge master
7 年前
Peter Bay Bastian
c3ce7007
Update `CoreShaderIncludePaths` to use `SRPMARKER`
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 年前
Julien Ignace
6145dbe8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Thomas
40603f1c
CoreEditorUtils additions
7 年前
GitHub
d8ba0411
Merge pull request #631 from Unity-Technologies/volume-framework
Generic volume framework
7 年前
sebastienlagarde
b0813df9
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
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 年前
runes
da8acc5e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Thomas
b0298639
Simplified HDLightEditor code and added color temperature gradient
7 年前
GitHub
906b39a7
Merge pull request #634 from Unity-Technologies/light-editor-cleanup
Light editor cleanup
7 年前
sebastienlagarde
e89a930f
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
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 年前
Peter Bay Bastian
14ac0ce2
Initial work on support assembly definition files
7 年前
Felipe Lira
64095289
Addressed Arira's comment on upgrader message.
7 年前
Felipe Lira
d3e2a290
Added error log message to lightweight materials upgraders. Added to error information material name.
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
c9ee9e33
Merge remote-tracking branch 'refs/remotes/origin/master' into add-xbone-one-support
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
sebastienlagarde
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
Peter Bay Bastian
981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
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 年前
Thomas
efb29ec0
Fixed volume component editor accessors
7 年前
GitHub
efeee59b
Merge pull request #661 from Unity-Technologies/volume-fixes
Fixed volume component editor accessors
7 年前
Peter Bay Bastian
9ad0740a
Bump version + Various fixes for assembly definition files:
- Re-create meta files due to some cache going bad
- Add missing references
- Move tests outside of HD folder (can go into HD package, but must be in its own assembly with test references enabled if so)
- Put core shader include path class into own assembly, such that C# errors do not break shader compilation
- Update PostProcessing to latest, which also has had its asmdef meta files regenerated
7 年前
GitHub
dee4cb69
Merge pull request #663 from Unity-Technologies/asmdef-fixes
Bump package version + Various fixes for assembly definition files
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Julien Ignace
7faea4fc
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# PostProcessing
7 年前
Paul Melamed
3b75ece2
temp fixed include issues for some .compute shaders
added metal, smoothness to decals
7 年前
Thomas
7d7f8fa4
Added "add component overrides" button in volume UI
7 年前
Thomas
22b07e66
Force open just-added components
7 年前
Thomas
f615090a
Improved the infotip when a volume is empty
7 年前
Evgenii Golubev
c16681df
Merge branch 'master'
7 年前
sebastienlagarde
99e8024a
Fix enumeration of assembly for CsharpToHLSL
7 年前
GitHub
248a47ba
Merge pull request #677 from Unity-Technologies/Fix-issue-with-AssemblyGenerator-after-Assembly-split
Fix enumeration of assembly for CsharpToHLSL
7 年前
Remy
bb73d4c6
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
GitHub
10e23187
Merge branch 'master' into volume-improvements
7 年前
Frédéric Vauchelles
d9fa2f6c
Added drawers
7 年前
Frédéric Vauchelles
5e6d2b66
Updated drawers
7 年前
GitHub
79a8c1d1
Merge pull request #680 from Unity-Technologies/volume-improvements
More volume improvements
7 年前
Remy
76db5308
Merge branch 'master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
effdbb9c
Merge branch 'master'
7 年前
Julien Ignace
71f453af
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/RuntimeFilterIBL.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
Sebastien Lagarde
657828b3
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-frameSettings
7 年前
Evgenii Golubev
7779e807
Merge branch 'master'
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Frédéric Vauchelles
50a43207
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
GitHub
05de367f
Merge pull request #686 from Unity-Technologies/feature/ReflectionProbeEditor
Reflection Probe Editor
7 年前
Frédéric Vauchelles
b8ba7123
[ReflectionProbeEditor] (wip) Blend distance per face
7 年前
Paul Melamed
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 年前
Evgenii Golubev
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Frédéric Vauchelles
ce05c4be
[ReflectionProbeEditor] Fixed blend normal
7 年前
GitHub
1f92867b
Merge pull request #715 from Unity-Technologies/feature/ReflectionProbeEditor
Reflection Probe Editor improvement
7 年前
sebastienlagarde
20c2964d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
Julien Ignace
4673aa9b
List of available skies is now generated from reflection information.
7 年前
GitHub
5426acfa
Merge pull request #727 from Unity-Technologies/Branch_SkyLightingOverride
List of available skies is now generated from reflection information.
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 年前
Frédéric Vauchelles
6bdf3918
[HDCameraEditor] (wip)
7 年前
Thomas
bee1cad8
[Breaking] Moved volume components & profiles to disk-based assets
Because prefabs, copy-pasting, etc...
7 年前
Frédéric Vauchelles
43c18028
[HDCameraEditor] Refactored drawers for frame settings
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
Thomas
f019bf89
Simplified property fetching
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 年前
GitHub
77906a48
Merge pull request #752 from Unity-Technologies/volume-asset-switch
Changed the volume framework to use disk-based assets
7 年前
Frédéric Vauchelles
10c87755
[HDCameraEditor] cleaning
7 年前
Frédéric Vauchelles
3a51c9b2
[HDCameraEditor] Refactored UI Framework
7 年前
Frédéric Vauchelles
3a8bf9f8
[HDCameraEditor] Moved Camera utilities to Core
7 年前
GitHub
82a58487
Merge pull request #751 from Unity-Technologies/feature/HDCameraEditor
Feature/hd camera editor
7 年前
Felipe Lira
f53d33dc
Material upgrader now displays a dialog informing that at least one material must be selected when clicking on upgrade selection option.
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
sebastienlagarde
29acffeb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Sebastien Lagarde
61c2e24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Frédéric Vauchelles
467308e8
[PlanarReflection] (wip) Added Projection Volume
7 年前
Thomas
efb5f16b
Fixed a serialization issue with scene settings
7 年前
GitHub
2680b9a5
Merge pull request #769 from Unity-Technologies/scene-settings-serialization-fix
Fixed a serialization issue with scene settings
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
3ba5f5fc
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Frédéric Vauchelles
1d4bba47
[PlanarReflection]Update UI
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
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 年前
Frédéric Vauchelles
3f5a5830
[PlanarReflection] (wip) added capture camera gizmos
7 年前
Frédéric Vauchelles
c8c5a6a6
[PlanarReflection] Update capture frustrum calculation
7 年前
Frédéric Vauchelles
668f65ae
[PlanarReflectionProbe] Added preview in scene view
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
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 年前
Frédéric Vauchelles
0f4291cb
[PlanarReflection] (wip) simple reflection
7 年前
Frédéric Vauchelles
1fb483ef
[PlanarReflection] (wip) oblique frustrum drawing
7 年前
John
cf25c602
Merge master
7 年前
Frédéric Vauchelles
78f1ddf8
[PlanarProbe] Include custom HLSL files with shader generator
7 年前
GitHub
84e022c3
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
7 年前
sebastienlagarde
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
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 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
Sebastien Lagarde
aadc4b09
Update menu item location and label
Based on discussion with Shawn MacClelland
7 年前
sebastienlagarde
950eb920
Update naming based on feedback
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 年前
GitHub
22cb3935
Merge pull request #884 from Unity-Technologies/Update-Menu-location-and-label
Update menu item location and label
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
Remy
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Julien Ignace
85039c4d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Alex Lian
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
sebastienlagarde
9801577c
Change code generation to allow multiple debug case for the same field. allow debug view normal
7 年前
GitHub
2d823db6
Merge pull request #914 from Unity-Technologies/Add-normal-in-view-space-debug-mode
Change code generation to allow multiple debug case for the same field. allow debug view normal
7 年前
Remy
0fe67279
Upgrade material upgrader
7 年前
Remy
fa8d58d8
Material upgrader working quite fine now :)
7 年前
sebastienlagarde
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Frédéric Vauchelles
0aed191f
[UI] Removed animation on foldouts
7 年前
GitHub
249256e5
Merge pull request #923 from Unity-Technologies/fix/RemoveAnimationFoldouts
[UI] Removed animation on foldouts
7 年前
Remy
5197454b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity
7 年前
Robert Srinivasiah
44fabb65
Merge branch 'master' into hdrp-xr-initial
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 年前
sebastienlagarde
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Remy
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
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 年前
Julien Ignace
44e117d8
Added Culling test scene
7 年前
Remy
ab4675c0
Unified all variants of standard shader in one converter.
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Peter Bay Bastian
fc78e5ae
Update asmdef files to work with changes to assembly definition files wrt unsafe code
7 年前
GitHub
dc047614
Merge pull request #950 from Unity-Technologies/fix-asmdef-unsafe
Fix errors about unsafe code
7 年前
Remy
6252406b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Robert Srinivasiah
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Thomas
45dc22f9
Refactored the debug menu
Now with proper serialization in the editor and better runtime UI capabilities
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
sebastienlagarde
42c1a872
Add default value for HDRP shadow data
7 年前
Sebastien Lagarde
ea8ce865
First draft
7 年前
Sebastien Lagarde
946c1494
Shader generation now working
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
GitHub
2376836c
Merge pull request #858 from Unity-Technologies/shadows-biasing
Shadows biasing
7 年前
Robert Srinivasiah
6626255e
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Sebastien Lagarde
0c54bec9
Move resources outside of resource folder
- Move all shader/material in Resources folder to CoreResource folder
- Move DisplayShadowMap.Shader out of Resources folder
- Pass needed material to Core function through parameters
- Update reflection system to take RenderPipeline resource into account
7 年前
GitHub
b878dd91
Merge pull request #967 from Unity-Technologies/improve-resources--management
Improve resources management
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
Evgenii Golubev
2d48e00b
Merge branch 'master'
7 年前
Thomas
8a390de1
Skip drawing empty panels
7 年前
GitHub
4ce28f8a
Merge pull request #970 from Unity-Technologies/debug-menu-refactor
Debug menu refactor
7 年前
Evgenii Golubev
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
Robert Srinivasiah
6f2b52f2
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
Manual fixup of some LightLoop stuff (stereo + decals living together in light cull data)
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 年前
Julien Ignace
c4e4129a
Moved Cascade and Contact shadows settings to the volume system.
7 年前
Remy
b295db15
Material upgrader now correctly supports standards -> lit and unlits -> unlit
7 年前
GitHub
841f635b
Merge pull request #980 from Unity-Technologies/Branch_ShadowsInVolume
Moved Cascade and Contact shadows settings to the volume system.
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 年前
Thomas
dbc3bf08
Fixed override checkbox in volume editors
7 年前
GitHub
28affc4f
Merge pull request #1004 from Unity-Technologies/volume-editor-indent-fix
Fixed override checkbox in volume editors
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
sebastienlagarde
2d03b0c8
Fixed override checkbox in volume editors
7 年前
Paul Melamed
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Remy
ada0ecaa
Support for non-linear texture as input for the texture combiner.
Make _Metallic attribute 1 if a map is used.
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Remy
4097366b
Merge branch 'HDRP_MaterialUpgrader' of github.com:Unity-Technologies/ScriptableRenderPipeline into 2018.1
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/StandardsToHDLitMaterialUpgrader.cs
7 年前
GitHub
22b140ec
Merge pull request #1013 from Unity-Technologies/2018.1_HDRP_MaterialUpgrader
Merge branch 'HDRP_MaterialUpgrader' of github.com:Unity-Technologies…
7 年前
GitHub
c1b7ac66
Merge pull request #1012 from Unity-Technologies/HDRP_MaterialUpgrader
Hdrp material upgrader
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 年前
Felipe Lira
8a6de19e
Added Cascade Split UI
7 年前
Frédéric Vauchelles
4d0d4da6
[ReflectionProbe] Refactored reflection probes
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 年前
Thomas
82ec2403
Disallowed using the editor debug window at the same time as the runtime one
7 年前
GitHub
0adb2b7b
Merge pull request #1054 from Unity-Technologies/LW-UI
Added Cascade Split UI
7 年前
GitHub
0598d413
Merge pull request #1040 from Unity-Technologies/debug-window-tweak
Disallowed using the editor debug window at the same time as the runtime one
7 年前
Julien Ignace
2c03d5de
Merge branch '2018.1' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugWindowFixes
7 年前
Remy
cc4d54eb
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
sebastienlagarde
240571a1
Undo/redo/sync/serialization fixes
7 年前
Felipe Lira
aa4af411
Added Cascade Split UI
7 年前
John Parsaie
40539650
Merge branch '2018.1' into projects/TheLastStand
7 年前
Felipe Lira
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
7 年前
Thomas
12334521
Undo/redo/sync/serialization fixes
7 年前
GitHub
4e44f2d7
Merge pull request #1065 from Unity-Technologies/various-debug-fixes
Undo/redo/sync/serialization fixes
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
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
3ebd77c1
Added Flags.ForceUpdate on DebugPanels
7 年前
Felipe Lira
9efc11d0
[case 1012629] Fixed - Upgrade select materials tool softlocks editor
7 年前
Julien Ignace
51790cf9
(WIP) Added debug exposure to material debug views.
7 年前
Felipe Lira
b46950e2
Fixed issue that was causing the upgrader to ignore zero selected materials message when pressing dialog x button
7 年前
Julien Ignace
d71724e7
Fixed a null ref exception with DebugWindow when users keep the window open then close/reopen Unity
7 年前
GitHub
c8b5dd66
Merge pull request #1115 from Unity-Technologies/Branch_DebugWindowFix
Fixed a null ref exception with DebugWindow when users keep the windo…
7 年前
Remy
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Felipe Lira
933c7fdd
Merge branch 'LWRP' into lw/bugfixes
7 年前
Raymond Graham
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
GitHub
7f7b6cd3
Merge pull request #1118 from Unity-Technologies/lw/bugfixes
Lw/bugfixes
7 年前
Felipe Lira
de8adb82
Merge branch 'LWRP' into lw/multipass
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLitSimple.hlsl
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLitSimple.hlsl.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardSimpleLighting.shader
7 年前
Matt Dean
f98f82d0
Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass
7 年前
Julien Ignace
b5270042
Fixed a null ref exception with DebugWindow when users keep the window open then close/reopen Unity
7 年前
Felipe Lira
0161a6be
[case 1012629] Fixed - Upgrade select materials tool softlocks editor
7 年前
Frédéric Vauchelles
5d1e46bc
Moved CoreRP files in folders for readbility
7 年前
Felipe Lira
7647c889
Fixed issue that was causing the upgrader to ignore zero selected materials message when pressing dialog x button
7 年前
Frédéric Vauchelles
4fbb1c4f
(wip) Added refraction model
7 年前
GitHub
b782fae4
Merge pull request #1142 from Unity-Technologies/feature/RefactorCoreRPFiles
Refactor CoreRP root files
7 年前
Frédéric Vauchelles
412bd010
Merge master
7 年前
Stephane Laroche
5ad6a9db
Merge branch 'master' into StackLitWork
7 年前
GitHub
d4b16f1c
Merge pull request #1131 from Unity-Technologies/backport/bugfixes
Backport/bugfixes
7 年前
Frédéric Vauchelles
7c52d2d3
Renamed Flags.ForceUpdate => Flags.EditorForceUpdate
7 年前
GitHub
a2790a45
Merge pull request #1159 from Unity-Technologies/feature/RefractionModes
Screen Space Refraction Projection Model
7 年前
Frédéric Vauchelles
d61424da
Commented code specific to 4.x .NET runtime
7 年前
Frédéric Vauchelles
3320fc64
Skip in memory assemblies for the shader generator
7 年前
GitHub
7a76fbbe
Merge pull request #1174 from Unity-Technologies/fix/ShaderCompilationInMemoryAssemblies
Skip in memory assemblies for the shader generator
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Paul Melamed
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
7 年前
Felipe Lira
65fc1c54
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
7 年前
Frédéric Vauchelles
4bd00e90
Merge master
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
GitHub
ab445387
Merge pull request #1209 from Unity-Technologies/LWRP
LWRP
7 年前
GitHub
362e32d7
Merge branch 'master' into expose-numlights-per-cluster
7 年前
Remy
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
7 年前
Frédéric Vauchelles
09596c67
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Stephane Laroche
61ee5830
Merge branch 'master' into stacklit
7 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
Thomas
e06c7278
Added support for instantiated volume profiles in the inspector
7 年前
Thomas
19caf308
Fixed HDR ColorParameter
7 年前
Thomas
9d376773
Typo fix
7 年前
GitHub
df846344
Merge pull request #1280 from Unity-Technologies/volume-improvements-next
Volume improvements
7 年前
Stephane Laroche
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
sebastienlagarde
2c1c78cf
Merge branch 'master' into 2018.1-experimental
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
Frédéric Vauchelles
4bfaa623
merge master
7 年前
sebastienlagarde
f6e93052
Fix various C sharp and shader warning
7 年前
GitHub
212ff6b3
Merge pull request #1324 from Unity-Technologies/Fix-misc-warning
Fixed warnings as requested by Spotlight customer
7 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
7 年前
sebastienlagarde
96ce456b
Fix issue with framesettings on HDRP Asset and debug windows
When the debug windows is open, the HDRP Asset runtime framesetting are
overwritten by the debug windows settings, whereas it is the debug
windows that should update itself.
7 年前
GitHub
eeb59394
Merge pull request #1341 from Unity-Technologies/Fix-issue-with-framesettings-and-debug-windows
Fix issue with framesettings on HDRP Asset and debug windows
7 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Thomas
7fc1f0a9
Fixed empty editor debug window on srp asset reload
7 年前
GitHub
877c58df
Merge pull request #1380 from Unity-Technologies/debug-hack-fix
Fixed empty editor debug window on srp asset reload
7 年前
Thomas
a7687896
Improved volume UI & styling
7 年前
Frédéric Vauchelles
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Peter Bay Bastian
927000b8
Merge branch 'master' into sg/texture-types
7 年前
GitHub
1c9edcfa
Merge pull request #1382 from Unity-Technologies/volume-ux-improvements
Improved volume UI & styling
7 年前
sebastienlagarde
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
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
d6b439fd
Remove SRPMARKER reference as it doesn't exist anymore
7 年前
GitHub
b0d2599c
Merge pull request #1403 from Unity-Technologies/Remove-SRPMARKER
Remove SRPMARKER reference as it doesn't exist anymore
7 年前
Remy
8c6fd7ef
Moved "SceneRenderPipeline.cs" out of editor folder, and added proper compilation condition to avoid errors.
The component can now be attached back to gameobjects
7 年前
GitHub
c64e11b4
Merge pull request #1426 from Unity-Technologies/corerp/scenerenderpipeline
Moved "SceneRenderPipeline.cs" out of editor folder
7 年前
GitHub
2274ce9d
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
7 年前
Remy
a41421a3
Allow to assign any RenderPipelineAsset when double clicking (or open action) on the asset file in the project view.
7 年前
GitHub
8abde9b6
Merge pull request #1433 from Unity-Technologies/corerp/AssignRPAssetOnDoubleClick
Allow to assign any RenderPipelineAsset easily.
7 年前
sebastienlagarde
e118502b
Misc various improvement
Add versionning on all HD asset (and correct previous way of doing it)
Add menu items for Density volume and planar reflection
Correctly do the naming for new created HD game object (Decal, scene settings...)
Change plane orientation of planar reflection from forward to up
Add new resource material: defaultHDMaterial
Do a small fix at runtime for GI (no impact)
7 年前
sebastienlagarde
0ce04d4e
Update changelog + Remove RenderPipelineAssetHandler (cause trouble)
7 年前
GitHub
e2c6895a
Merge pull request #1448 from Unity-Technologies/Various-workflow-improvement
Various workflow improvement + minor fix
7 年前
sebastienlagarde
b9f53360
HDRP: Rename debug windows + change menu location
7 年前
GitHub
0863102d
Merge pull request #1455 from Unity-Technologies/Rename-debug-windows
HDRP: Rename debug windows + change menu location
7 年前
sebastienlagarde
56693471
Improve upgrade material system + Add versionning via HDRPProjectVersion.txt to project settings
7 年前
GitHub
274022c0
Merge pull request #1457 from Unity-Technologies/Improve-upgrade-material-system
Improve upgrade material system + Add versionning via HDRPProjectVers…
7 年前
Paul Melamed
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
7 年前
Stephane Laroche
d85052d9
Merge branch 'master' into StackLit2
7 年前
Felipe Lira
9c13d20e
Fixed null reference caused by accessing property.objectReferenceValue. We don't need to record it as we should call ApplyModifiedProperties on serializedObject.
7 年前
Chris Tchou
e8ce5056
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
7 年前
sebastienlagarde
7f2358af
Move Checkout core function to CoreEditor + create file for shadowmapGUI + rename VSSEnabledto VCSEnabled
7 年前
GitHub
f3c9daff
Merge pull request #1477 from Unity-Technologies/Fix-issue-with-wrong-location-of-checkout
Move Checkout core function to CoreEditor + create file for shadowmapGUI
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
69bd5389
Merge pull request #1483 from Unity-Technologies/lw/bugfixes
Lw/bugfixes
7 年前
sebastienlagarde
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
Oliver Schnabel
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
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 年前
sebastienlagarde
16cef1a8
Update include generator to use space instead of tabs
7 年前
GitHub
2ed78d94
Merge pull request #1500 from Unity-Technologies/Update-generator
Update include generator to use space instead of tabs
7 年前
Sebastien Lagarde
c95b7c47
Merge branch 'master' into normal-buffer-support
7 年前
Paul Melamed
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
7 年前
GitHub
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
7 年前
RSlysz
e3df0fc8
Add DrawVector6 feature to CoreEditorUtils
7 年前
Stephane Laroche
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
Oliver Schnabel
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
RSlysz
511b8e89
Adding colors to DrawVector3
7 年前
Remy
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
RSlysz
a28801d0
Add monochrome support for new gizmo
7 年前
Felipe Lira
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
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 年前
Martin Thorzen
28b10444
Initial UI fixes. Lots of commented code. Will clean later. Just submitting for bckp
7 年前
RSlysz
885eadde
Clean CoreEditorUtils unused method
7 年前
Martin Thorzen
9a23a53f
Removed the label and made the spacing work with indentation
7 年前
sebastienlagarde
ec4f2ed5
Add option to remove shader variant + update changelog to correct format
Add option to remove shader variant of LOD Cross fade (allow faster build)
Fix priority of Render Pipeline Debug Windows (Ux Team) Request
Update format of the Changelog
7 年前
GitHub
159ea553
Merge pull request #1540 from Unity-Technologies/Add-option-to-remove-shader-variant-update-changelog-to-correct-format
Add option to remove shader variant + update changelog to correct format
7 年前
Remy
57fedd6c
Merge branch 'master' into HDRP-Tests
7 年前
GitHub
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
7 年前
GitHub
8fbd1282
Merge pull request #1536 from Unity-Technologies/lw/lw-pipeline-asset-inspector
LW pipeline asset inspector UI
7 年前
GitHub
d4992b3f
Merge branch 'master' into lw/camera-additional-data
7 年前
sebastienlagarde
55e4d1aa
Merge branch 'master' into DominantLightContactShadow
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 年前
Peter Bay Bastian
9c5843f7
Remove PostProcessing dependency from Core
7 年前
GitHub
981030f0
Merge pull request #1610 from Unity-Technologies/remove-core-postprocessing-dependency
Remove PostProcessing dependency from Core
7 年前
sebastienlagarde
7934a87a
Merge branch 'master' into LightUnits
7 年前
Paul Melamed
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
7 年前
Remy
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
7 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
7 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
7 年前
GitHub
73e0bd06
Merge pull request #1622 from Unity-Technologies/feature/HDReflectionProbe-refactor-inspector
Feature/hd reflection probe refactor inspector
7 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
RSlysz
39187ff0
Moving Gizmo6FacesBox to Editor folder
7 年前
RSlysz
9a03990d
Merge remote-tracking branch 'origin/master' into fix/Gizmo6FacesBox-folder
7 年前
GitHub
a03a53f4
Merge pull request #1631 from Unity-Technologies/fix/Gizmo6FacesBox-folder
Moving Gizmo6FacesBox to Editor folder
7 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
7 年前
Nerites
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
7 年前
Nerites
22989ca2
Refiled XRGraphicsConfig and protected editor-only sections to enable
building
7 年前
GitHub
e35bea1a
Merge pull request #1640 from Unity-Technologies/xrsettings
Split off editor-only code for XRGraphicsConfig to reenable builds
7 年前
Nerites
2ff04938
Hid viewportscale and renderscale in XR GUI section. Tied XR renderscale
to SRP renderscale and tied XR viewport scale to 1 pending viewport
scale fixes.
7 年前
GitHub
162e4cee
Merge pull request #1645 from Unity-Technologies/xrsettings
UI cleanup for XRGraphicsConfig renderScale/viewportScale
7 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
7 年前
GitHub
61a18996
Fix assembly names to match unity convention. ( #1675 )
* Fix assembly names to match unity convention.
* Update post process version to use.
* Update post to depend on the correct (next) version.
6 年前
Nerites
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
sebastienlagarde
17749894
Merge branch 'master' into HDRP/staging
6 年前
Julien Ignace
e93b061e
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPPCopy
6 年前
Remy
1bce3600
Merge branch 'master' into tests/hdrp/distortion
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
sebastienlagarde
367f433e
Move debug windows to Analysis sub menu
6 年前
GitHub
6824165d
Merge pull request #1703 from Unity-Technologies/Move-debug-windows
Move debug windows
6 年前
GitHub
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
GitHub
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Nerites
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
Nerites
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Antoine Lelievre
03c9b17a
Add option to disable light by type in the debug menu
6 年前
Antoine Lelievre
c278bbee
Simplified Show light type debug settings
6 年前
Tim Cooper
de2f585d
Fix compiler warnings.
6 年前
Sebastien Lagarde
cd85f0d3
Merge branch 'master' into HDRP/staging
6 年前
Antoine Lelievre
d5e69c03
Merge HDRP/staging
6 年前
sebastienlagarde
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
RSlysz
e18daf64
clean reflection editors
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
Antoine Lelievre
ebc99757
Fix sRGB forced into preview camera render
6 年前
GitHub
0554e9b7
Merge pull request #1843 from Unity-Technologies/FixCameraDarkenSceneViewWhenSelected
Fix sRGB forced into preview camera render
6 年前
GitHub
5c6caff1
Merge pull request #1846 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
egomeh
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
Remy
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
sebastienlagarde
793cbb29
Move light Gizmo Drawing to core
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
GitHub
bc502caa
Merge pull request #1855 from Unity-Technologies/Move-light-Gizmo-Drawing-to-core
Move light Gizmo Drawing to core
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 年前
GitHub
543c68af
Merge pull request #1813 from Unity-Technologies/HDRP/refactor-reflectionProbe/merge-probe-editors
Hdrp/refactor reflection probe/merge probe editors
6 年前
Julien Ignace
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
GitHub
8b08d5f9
Revert "Hdrp/refactor reflection probe/merge probe editors"
6 年前
sebastienlagarde
cda8c343
Merge branch 'master' into HDRP/staging
6 年前
GitHub
0eeccd2c
Merge pull request #1868 from Unity-Technologies/revert-1813-HDRP/refactor-reflectionProbe/merge-probe-editors
Revert "Hdrp/refactor reflection probe/merge probe editors"
6 年前
sebastienlagarde
33f9970c
merge
6 年前
Paul Melamed
f1d163d5
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
sebastienlagarde
8f96dc05
Merge branch 'master' into HDRP/staging
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
b6f96081
Merge pull request #1869 from Unity-Technologies/onceagain
merge reflection probe change
6 年前
egomeh
e7c59a70
Resolve merge conflicts
6 年前
RSlysz
41d6655a
Disable lightLayers conditionaly to RenderPipelineSettings
6 年前
GitHub
3cf71cd7
Merge pull request #1873 from Unity-Technologies/HDRP/add-LightLayer-in-probes
Hdrp/add light layer in probes
6 年前
Yao Xiao Ling
6302a183
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
egomeh
170858df
Merge master
6 年前
JulienIgnace-Unity
195a1aa2
Hdrp/fix/light gizmos and handles ( #1905 )
Hide legacy gizmo for all spot lights and introduce pyramid and box light handle.
(Cone spot light handle should be branched once validated in LW)
6 年前