From 6d0a58d1c913c12695e947bd8d89cfd1ed36bd2b Mon Sep 17 00:00:00 2001 From: Anthony Yakovlev Date: Wed, 21 May 2025 13:08:56 +0300 Subject: [PATCH 1/6] make sure we actually apply the loaded settings, since there is quite a bit of derived state that is invalid otherwise --- Packages/com.unity.inputsystem/InputSystem/InputManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 10e3c17fb8..2e09ba4d7d 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -4122,7 +4122,8 @@ internal void RestoreStateWithoutDevices(SerializedState state) if (m_Settings != null) Object.DestroyImmediate(m_Settings); - m_Settings = state.settings; + + settings = state.settings; #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS // Note that we just reassign actions and never destroy them since always mapped to persisted asset From 8281faa55382af14e5c7b14cd9da8da4a0073d2e Mon Sep 17 00:00:00 2001 From: Anthony Yakovlev Date: Wed, 21 May 2025 13:26:29 +0300 Subject: [PATCH 2/6] update the 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 7479fcbc14..e33d993a0b 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -23,6 +23,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed an issue where an action with a name containing a slash "/" could not be found via `InputActionAsset.FindAction(string,bool)`. [ISXB-1306](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1306). - Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090) - Fixed reenabling the VirtualMouseInput component may sometimes lead to NullReferenceException. [ISXB-1096](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1096) +- Fixed the default button press point not being respected in Editor (as well as some other Touchsreen properties). [ISXB-1152](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1152) - Fixed PlayerInput component automatically switching away from the default ActionMap set to 'None'. - Fixed a console error being shown when targeting visionOS builds in 2022.3. - Fixed a Tap Interaction issue with analog controls. The Tap interaction would keep re-starting after timeout. [ISXB-627](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-627) From 7716176df1bf429974ecdca9afcda473f598dac4 Mon Sep 17 00:00:00 2001 From: Anthony Yakovlev Date: Wed, 21 May 2025 13:27:29 +0300 Subject: [PATCH 3/6] fix up the typo in comments --- Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index eb7a35dcd7..1ebb0f44bf 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -3878,7 +3878,7 @@ private static void Reset(bool enableRemoting = false, IInputRuntime runtime = n s_Manager.UninstallGlobals(); } - // Create temporary settings. In the tests, this is all we need. But outside of tests,d + // Create temporary settings. In the tests, this is all we need. But outside of tests, // this should get replaced with an actual InputSettings asset. var settings = ScriptableObject.CreateInstance(); settings.hideFlags = HideFlags.HideAndDontSave; From 1e2bdb92f18ae0f2d96a8efc76fe720d2331c3d5 Mon Sep 17 00:00:00 2001 From: Anthony Yakovlev Date: Wed, 21 May 2025 15:25:16 +0300 Subject: [PATCH 4/6] format code --- Packages/com.unity.inputsystem/InputSystem/InputManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index 2e09ba4d7d..cb75d7d6f6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -4122,7 +4122,7 @@ internal void RestoreStateWithoutDevices(SerializedState state) if (m_Settings != null) Object.DestroyImmediate(m_Settings); - + settings = state.settings; #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS From e4920cbaec2221acfddd9a5ee54d6038161bea2d Mon Sep 17 00:00:00 2001 From: Anthony Yakovlev Date: Thu, 22 May 2025 14:05:16 +0300 Subject: [PATCH 5/6] force usage of an older utr release in an attempt to get rid of iOS and tvOS instabilities (per the Slack advice) --- .yamato/upm-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 4f82281452..a08ac81f72 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -121,6 +121,7 @@ build_ios_{{ editor.version }}_{{ category.name }}: flavor: b1.large variables: EDITOR_VERSION: {{ editor.version }} + UTR_VERSION: 1.35.1 commands: - {{ utr_install_nix }} - {{ unity_downloader_install }} @@ -170,6 +171,7 @@ build_tvos_{{ editor.version }}_{{ category.name }}: flavor: b1.large variables: EDITOR_VERSION: {{ editor.version }} + UTR_VERSION: 1.35.1 commands: - {{ utr_install_nix }} - {{ unity_downloader_install }} From 5735715b36d996c34e391db7374b5c13ba2408ae Mon Sep 17 00:00:00 2001 From: Anthony Yakovlev Date: Mon, 2 Jun 2025 11:32:22 +0300 Subject: [PATCH 6/6] Update Packages/com.unity.inputsystem/CHANGELOG.md --- Packages/com.unity.inputsystem/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index e33d993a0b..a974f5a027 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -23,7 +23,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed an issue where an action with a name containing a slash "/" could not be found via `InputActionAsset.FindAction(string,bool)`. [ISXB-1306](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1306). - Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090) - Fixed reenabling the VirtualMouseInput component may sometimes lead to NullReferenceException. [ISXB-1096](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1096) -- Fixed the default button press point not being respected in Editor (as well as some other Touchsreen properties). [ISXB-1152](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1152) +- Fixed the default button press point not being respected in Editor (as well as some other Touchscreen properties). [ISXB-1152](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1152) - Fixed PlayerInput component automatically switching away from the default ActionMap set to 'None'. - Fixed a console error being shown when targeting visionOS builds in 2022.3. - Fixed a Tap Interaction issue with analog controls. The Tap interaction would keep re-starting after timeout. [ISXB-627](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-627)