 Nico de Poel
|
8884a52d1a
|
Merge branch 'master' into ww1dev/hdrp17/staging
|
9 months ago |
|
Nico de Poel
|
ae8d04a703
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.visualeffectgraph/Shaders/VFXRayTracingCommon.hlsl.meta
|
9 months ago |
|
Nico de Poel
|
fa80a739c1
|
Auto-sync from SVN revision 61880
|
9 months ago |
|
Nico de Poel
|
0c74b5d467
|
Updated packages to those from Unity 6000.1.3f1
|
9 months ago |
|
Nico de Poel
|
9c32a27f68
|
Merge branch 'master' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.render-pipelines.core/Runtime/Vrs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/CopyPasteTestComponent1.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/CopyPasteTestComponent2.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/CopyPasteTestComponent3.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/VolumeComponentCustomRenderPipelineAsset.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/VolumeComponentNoSupportedOn.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/VolumeComponentNotSpecifiedSupportedOn.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/VolumeComponentSupportedEverywhere.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/VolumeComponentSupportedOnAnySRP.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeComponents/VolumeComponentSupportedOnCustomSRP.cs.meta
|
9 months ago |
|
Nico de Poel
|
eea959c801
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
|
9 months ago |
|
Nico de Poel
|
6f397e9a2e
|
Auto-sync from SVN revision 61331
|
9 months ago |
|
Nico de Poel
|
0978f9fe80
|
Updated packages to those from Unity 6000.1.0f1
|
9 months ago |
|
Nico de Poel
|
fed2e8e0f6
|
Merge branch 'master' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
|
11 months ago |
|
Nico de Poel
|
5d46921cde
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
|
11 months ago |
|
Nico de Poel
|
6ff93e79ad
|
Auto-sync from SVN revision 59715
|
11 months ago |
|
Nico de Poel
|
0ca51cc8f0
|
Updated packages to those from Unity 6000.0.40f1
|
11 months ago |
|
Nico de Poel
|
62d006e423
|
Merge branch 'master' into ww1dev/hdrp17/staging
|
12 months ago |
|
Nico de Poel
|
e0505114da
|
Auto-sync from SVN revision 59524
|
12 months ago |
|
Nico de Poel
|
7e0ad27a68
|
Changed line ending style to CRLF (\r\n) across the board, which is the standard used by WW1 Series
|
12 months ago |
|
Nico de Poel
|
a51b5ad142
|
Imported standard Unity UGUI packages from Unity 6000.0.34f1
|
12 months ago |
|
Nico de Poel
|
71d75f6a29
|
Auto-sync from SVN revision 59524
|
12 months ago |
|
Nico de Poel
|
d4546922cd
|
Imported standard Unity HDRP packages from Unity 6000.0.34f1
|
12 months ago |
