 Nico de Poel
|
d661359f57
|
Merge branch 'master' into ww1dev/hdrp17/staging
|
5 months ago |
|
Nico de Poel
|
aa31ed9422
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.render-pipelines.core/ShaderLibrary/TextureXR.hlsl
|
5 months ago |
|
Nico de Poel
|
35f56bc781
|
Auto-sync from SVN revision 64771
|
5 months ago |
|
Nico de Poel
|
6a3740cb71
|
Updated packages to those from Unity 6000.2.1f1
|
5 months ago |
|
Nico de Poel
|
833e41d667
|
Merge branch 'master' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.animation.rigging/DocCodeExamples/CustomPlayableGraphEvaluator.cs
# Packages/com.unity.animation.rigging/Editor/Utils/BakeUtils.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationJobs/IAnimationJobBinder.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/IRigConstraint.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/IRigLayer.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/OverrideRigConstraint.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/OverrideRigLayer.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/RigBuilder.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/RigConstraint.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/RigLayer.cs
# Packages/com.unity.animation.rigging/Runtime/AnimationRig/SyncSceneToStreamLayer.cs
# Packages/com.unity.render-pipelines.core/Tests/Runtime/ObservableListTests.cs.meta
# Packages/com.unity.visualeffectgraph/Editor/TemplateWindow/VFXTemplateDescriptor.cs.meta
# Packages/com.unity.visualeffectgraph/Editor/TemplateWindow/VFXTemplateHelper.cs.meta
# Packages/com.unity.visualeffectgraph/Editor/TemplateWindow/VFXTemplateWindow.cs.meta
# Packages/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXTemplateWindow.uss.meta
# Packages/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXTemplateItem.uxml.meta
# Packages/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXTemplateSection.uxml.meta
# Packages/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXTemplateWindow.uxml.meta
|
6 months ago |
|
Nico de Poel
|
8861ac08e5
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
|
6 months ago |
|
Nico de Poel
|
223fe8331f
|
Auto-sync from SVN revision 64696
|
6 months ago |
|
Nico de Poel
|
2033212c79
|
- Updated packages to those from Unity 6000.2.0f1
- Added Animation Rigging package, as we have custom modifications to that now
|
6 months ago |
|
Nico de Poel
|
3618c21d55
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.animation.rigging/DocCodeExamples/CustomPlayableGraphEvaluator.cs.meta
# Packages/com.unity.animation.rigging/Editor/AnimationRig/Constraints/BlendConstraintEditor.cs.meta
# Packages/com.unity.animation.rigging/Editor/AnimationRig/Constraints/ChainIKConstraintEditor.cs.meta
|
6 months ago |
|
Nico de Poel
|
185f601c08
|
Auto-sync from SVN revision 64696
|
6 months ago |
|
Nico de Poel
|
c1ceeb1d32
|
Merge branch 'master' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.rendering.light-transport/Runtime/UnifiedRayTracing/Common/TerrainToMesh.cs
# Packages/com.unity.rendering.light-transport/Tests/Editor/UnifiedRayTracing/AccelStructTests.cs
# Packages/com.unity.rendering.light-transport/package.json
|
6 months ago |
|
Nico de Poel
|
895b189db6
|
Auto-sync from SVN revision 63332
|
6 months ago |
|
Nico de Poel
|
8c56fe1834
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
|
6 months ago |
|
Nico de Poel
|
07157996c7
|
- Updated packages to those from Unity 6000.1.15f1
- Added Light Transport package, as we have custom modifications to that now
|
6 months ago |
|
Nico de Poel
|
126b8bc3bb
|
Merge branch 'master' into ww1dev/hdrp17/staging
|
8 months ago |
|
Nico de Poel
|
1cf05a399e
|
Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging
# Conflicts:
# Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeDebugData.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentCopyPasteTests.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentEditorSupportedOnTests.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentVisibilityTests.cs.meta
# Packages/com.unity.render-pipelines.core/Tests/Runtime/TestVolume.cs.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
# Packages/com.unity.render-pipelines.core/Tests/Runtime/VolumeManagerTests.cs.meta
# Packages/com.unity.visualeffectgraph/Shaders/VFXRayTracingCommon.hlsl.meta
|
8 months ago |
|
Nico de Poel
|
783ebe7dcb
|
Auto-sync from SVN revision 62736
|
8 months ago |
|
Nico de Poel
|
6cf0705e0e
|
Updated packages to those from Unity 6000.1.8f1
|
8 months ago |
|
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 |
