Frédéric Vauchelles
|
156f44e6
|
[ReflectionProbeEditor] Moved resources
|
7 年前 |
GitHub
|
7bfbe6b8
|
Merge pull request #700 from Unity-Technologies/feature/ReflectionProbeEditor
Reflection Probe Editor improvements
|
7 年前 |
runes
|
364ad2cc
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
Julien Ignace
|
65bd8e1d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
|
7 年前 |
Sebastien Lagarde
|
c22ec643
|
HDRenderPipeline: Update relfection probe view shader to be at the norme
|
6 年前 |
sebastienlagarde
|
5e5e46c8
|
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
|
6 年前 |
Remy
|
619cd52e
|
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
|
6 年前 |
|
sebastienlagarde
|
35560656
|
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
|
6 年前 |
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
|
6 年前 |
Evgenii Golubev
|
070349c8
|
Merge branch 'master'
|
6 年前 |
|
sebastienlagarde
|
a450e83a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
6 年前 |
Tim Cooper
|
aeefe219
|
Merge branch 'master2' into LW-LightOptimizations
|
6 年前 |
Robert Srinivasiah
|
7427bb14
|
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
|
6 年前 |
|
Evgenii Golubev
|
e768893e
|
Merge branch 'master'
|
6 年前 |
Peter Andreasen
|
04b933d9
|
merged with master
|
6 年前 |
John Parsaie
|
8cc0d941
|
Merge SRP 2018.1
|
6 年前 |
|
sebastienlagarde
|
003ed8ce
|
Add pipeline subshader tags for HD
|
6 年前 |
|
sebastienlagarde
|
9630d754
|
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
|
6 年前 |
Matt Dean
|
938ae294
|
Add pipeline subshader tags for HD
|
6 年前 |
|
sebastienlagarde
|
2e64322b
|
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
|
6 年前 |
|
GitHub
|
41034aa7
|
Merge pull request #1016 from Unity-Technologies/pr/1014
Pr 1014
|
6 年前 |
|
Robert Srinivasiah
|
7733d48a
|
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
|
6 年前 |
|
Frédéric Vauchelles
|
fd3d298d
|
Merge branch 'master' into feature/ReflectionProbeBaking
|
6 年前 |
|
Paul Melamed
|
07ab7b09
|
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
6 年前 |
|
John Parsaie
|
0fe793d7
|
Merge 2018.1
|
6 年前 |
|
Evgenii Golubev
|
720c8a19
|
Merge branch 'master'
|
6 年前 |
|
Evgenii Golubev
|
dd8b51a8
|
Merge branch 'master'
|
6 年前 |
|
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
|
6 年前 |
Felipe Lira
|
35cef52a
|
Fixed shader include paths
|
6 年前 |
|
GitHub
|
1108f618
|
Merge pull request #1171 from Unity-Technologies/fix-shader-include-paths
Fix shader include paths
|
6 年前 |
|
Evgenii Golubev
|
8d663ac4
|
Merge upstream/master
|
6 年前 |
|
Paul Melamed
|
5e4ad2d7
|
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
|
6 年前 |
|
Felipe Lira
|
e3f706be
|
Fix shader include case sensitiviness
|
6 年前 |
|
GitHub
|
e3cbd9c5
|
Merge pull request #1190 from Unity-Technologies/backport/fix-shader-includes
Fix shader include case sensitiviness
|
6 年前 |
|
Frédéric Vauchelles
|
4bd00e90
|
Merge master
|
6 年前 |
|
Evgenii Golubev
|
999f9fa8
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
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...
|
6 年前 |
|
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
6 年前 |
|
Tim Cooper
|
fafb59af
|
Run code formatter.
|
6 年前 |
|
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
|
6 年前 |
|
sebastienlagarde
|
666cd772
|
HDRP: Fix reflection probe preview at wrong location (due to camera relative rendereing)
|
6 年前 |
Nerites
|
ec2d7882
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
GitHub
|
7281fe31
|
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
|
6 年前 |
Stephane Laroche
|
73aab246
|
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
|
6 年前 |
