From 20e4150fc146d4ec411f96aa1d9ac83d79013683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Freire?= Date: Tue, 28 Jan 2025 14:47:12 +0100 Subject: [PATCH 1/4] Pin sample dependency to supporter versions Currently using the latest versions of Cinemachine and Probuilder have errors when using this Samples assets. The change minimizes them showing up when the Sample is imported through the Samples view of Input System Package Manager window. --- Assets/Samples/TouchSamples/TouchSamples.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Samples/TouchSamples/TouchSamples.asset b/Assets/Samples/TouchSamples/TouchSamples.asset index af2a09819c..282c17bdd0 100644 --- a/Assets/Samples/TouchSamples/TouchSamples.asset +++ b/Assets/Samples/TouchSamples/TouchSamples.asset @@ -15,5 +15,5 @@ MonoBehaviour: url: https://github.com/Unity-Technologies/InputSystem/releases/download/%VERSION%/TouchSamples-%VERSION%.unitypackage packageDeps: - com.unity.inputsystem - - com.unity.cinemachine - - com.unity.probuilder + - com.unity.cinemachine@2.10.3 + - com.unity.probuilder@5.2.3 From 215f26e97c7819c1dafc398ed48c4a3c31d04cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Freire?= Date: Tue, 28 Jan 2025 14:52:40 +0100 Subject: [PATCH 2/4] Make room for package version characters Otherwise, the package installed status is on top of the package version which is undesirable. --- .../InputSystem/Editor/DownloadableSample.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/DownloadableSample.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/DownloadableSample.cs index c52943ce24..52c7e14518 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/DownloadableSample.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/DownloadableSample.cs @@ -72,8 +72,8 @@ public override void OnInspectorGUI() Rect rect = EditorGUILayout.GetControlRect(true, 20); GUI.Label(rect, new GUIContent(req), EditorStyles.label); - rect.width -= 160; - rect.x += 160; + rect.width -= 200; + rect.x += 200; if (add != null || !list.IsCompleted) { using (new EditorGUI.DisabledScope(true)) From a481e2a86bcb4ec88b140eb16fcf53b08c4ae87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Freire?= Date: Wed, 29 Jan 2025 10:09:08 +0100 Subject: [PATCH 3/4] Update CHANGELOG --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 7a5da6ef97..a4f8d900e7 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -16,6 +16,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed GamepadButton.LeftTrigger and GamepadButton.RightTrigger enum values not matching displayed dropdown values in editor when using GamepadButtonPropertyDrawer [ISXB-1270](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1270). - Fixed an issue causing InvalidOperationException when entering playmode with domain reload disabled. [ISXB-1208](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1208). - Fixed an issue where compiling Addressables with Input System package present would result in failed compilation due to `IInputAnalytic.TryGatherData` not being defined [ISXB-1203](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1203). +- Pinned Touch Samples sample package dependencies to avoid errors with Cinemachine 3.x and Probuilder 6.x. [ISXB-1245](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1245) ## [1.12.0] - 2025-01-15 From 2e28965fd0b4a93a4142a1281f806e113f37f8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Freire?= Date: Tue, 28 Jan 2025 15:51:23 +0100 Subject: [PATCH 4/4] Add ExternalSampleProjects minimal README --- ExternalSampleProjects/README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 ExternalSampleProjects/README.md diff --git a/ExternalSampleProjects/README.md b/ExternalSampleProjects/README.md new file mode 100644 index 0000000000..53782c170c --- /dev/null +++ b/ExternalSampleProjects/README.md @@ -0,0 +1,18 @@ +# External Sample Projects + +These Samples are self-contained projects because they are too big to be included as a package Sample. + +When editing these projects, you need to manually add a few packages for them to work. +The projects don't contain the packages themselves. + +The `InputDeviceTester` needs: + +- Input System package (latest version) +- Unity UI package (2.0.0 version at least) +- Jetbrains Rider Editor / Visual Studio package for IDE tooling. + +The `TouchSamples` need: + +- All the same as ´InputDeviceTester` +- Cinemachine (2.10.3 maximum; 3.x has errors with the project but are easy to fix) +- Probuilder (5.2.3 version maximum at the moment; 6.x has problems building for iOS and Android)