diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 5dbd55f93..789f67533 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -26,7 +26,9 @@ validate_-_cinemachine_-_2022_3_-_macos: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -90,7 +92,9 @@ validate_-_cinemachine_-_2022_3_-_ubuntu: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -154,7 +158,9 @@ validate_-_cinemachine_-_2022_3_-_windows: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -218,7 +224,9 @@ validate_-_cinemachine_-_6000_0_-_macos: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -282,7 +290,9 @@ validate_-_cinemachine_-_6000_0_-_ubuntu: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -346,7 +356,9 @@ validate_-_cinemachine_-_6000_0_-_windows: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -410,7 +422,9 @@ validate_-_cinemachine_-_6000_3_-_macos: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -474,7 +488,9 @@ validate_-_cinemachine_-_6000_3_-_ubuntu: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -538,7 +554,9 @@ validate_-_cinemachine_-_6000_3_-_windows: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -602,7 +620,9 @@ validate_-_cinemachine_-_6000_4_-_macos: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -666,7 +686,9 @@ validate_-_cinemachine_-_6000_4_-_ubuntu: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -730,7 +752,9 @@ validate_-_cinemachine_-_6000_4_-_windows: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -794,7 +818,9 @@ validate_-_cinemachine_-_6000_5_-_macos: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -858,7 +884,9 @@ validate_-_cinemachine_-_6000_5_-_ubuntu: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -922,7 +950,9 @@ validate_-_cinemachine_-_6000_5_-_windows: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -986,7 +1016,9 @@ validate_-_cinemachine_-_6000_6_-_macos: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -1050,7 +1082,9 @@ validate_-_cinemachine_-_6000_6_-_ubuntu: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 @@ -1114,7 +1148,9 @@ validate_-_cinemachine_-_6000_6_-_windows: - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 5 retries: 0 - - command: echo No additional PVP profiles to declared to check. + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 - command: 'UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' timeout: 20 retries: 1 diff --git a/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs b/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs index e20b986b0..811556b96 100644 --- a/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs +++ b/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs @@ -30,7 +30,7 @@ public class CinemachineSettings public bool ProjectAndEditorAreCompatible(string project, string editorVersion) => true; - //ISet PvPprofilesToCheck = new HashSet() { "PVP-20-1" }; + ISet PvPprofilesToCheck = new HashSet() { "supported" }; public CinemachineSettings() { @@ -40,7 +40,7 @@ public CinemachineSettings() useLocalPvpExemptions: true ); - //Wrench.PvpProfilesToCheck = PvPprofilesToCheck; + Wrench.PvpProfilesToCheck = PvPprofilesToCheck; var defaultUbuntuPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.Ubuntu]; // Use Ubuntu image package-ci/ubuntu-22.04 which is required by 6000.0+ versions. diff --git a/com.unity.cinemachine/Samples~/Cinemachine Example Scenes/Shared/Materials/Bouncy 1.physicMaterial b/com.unity.cinemachine/Samples~/Cinemachine Example Scenes/Shared/Materials/Bouncy 1.physicMaterial new file mode 100644 index 000000000..7efd07709 --- /dev/null +++ b/com.unity.cinemachine/Samples~/Cinemachine Example Scenes/Shared/Materials/Bouncy 1.physicMaterial @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Bouncy 1 + dynamicFriction: 0.3 + staticFriction: 0.3 + bounciness: 1 + frictionCombine: 0 + bounceCombine: 3 +--- !u!1002 &13400001 +EditorExtensionImpl: + serializedVersion: 6 diff --git a/com.unity.cinemachine/Samples~/Cinemachine Example Scenes/Shared/Materials/Bouncy 1.physicMaterial.meta b/com.unity.cinemachine/Samples~/Cinemachine Example Scenes/Shared/Materials/Bouncy 1.physicMaterial.meta new file mode 100644 index 000000000..0ec63330e --- /dev/null +++ b/com.unity.cinemachine/Samples~/Cinemachine Example Scenes/Shared/Materials/Bouncy 1.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9bec0ecadc5ab6479d11776b9b63b5d +timeCreated: 1427463081 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: