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 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) 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 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))