From 8fc32a865a7285e3a84e8085eaedc359ed0b288c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Thu, 29 Aug 2024 12:13:57 +0200 Subject: [PATCH 1/4] FIX: Attempt to narrow scope to only editor analytics for previous bug fix in --- .../com.unity.inputsystem/InputSystem/NativeInputRuntime.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs index f82d5fa8b3..874e5efbd6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs +++ b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs @@ -393,8 +393,7 @@ public Action onProjectChange public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) { - #if ENABLE_CLOUD_SERVICES_ANALYTICS - #if (UNITY_EDITOR) + #if (UNITY_EDITOR && ENABLE_CLOUD_SERVICES_ANALYTICS) #if (UNITY_2023_2_OR_NEWER) EditorAnalytics.SendAnalytic(analytic); #else @@ -413,7 +412,6 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) else Debug.Log(error); // Non fatal #endif //UNITY_EDITOR - #endif //ENABLE_CLOUD_SERVICES_ANALYTICS } #endif // UNITY_ANALYTICS || UNITY_EDITOR From 8c0cbd0796d152f93c391dd6855ffb5ccf6a7e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Thu, 29 Aug 2024 12:21:32 +0200 Subject: [PATCH 2/4] Added CHANGELOG entry --- 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 ea645adeca..3f44740d31 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -17,6 +17,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed an update loop in the asset editor that occurs when selecting an Action Map that has no Actions. - Fixed Package compilation when Unity Analytics module is not enabled on 2022.3. [ISXB-996](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-996) - Fixed 'OnDrop' event not called when 'IPointerDownHandler' is also listened. [ISXB-1014](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1014) +- Fixed conditional compilation for non-editor analytics on platforms not enabling analytics. ### Added - Added Hinge Angle sensor support for foldable devices. From 418c6cb42dc058616befd653a79d5a649e75b34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Wed, 11 Sep 2024 23:31:26 +0200 Subject: [PATCH 3/4] Moved services check to the correct conditional compilation check --- .../com.unity.inputsystem/InputSystem/NativeInputRuntime.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs index 874e5efbd6..5c4c4a2734 100644 --- a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs +++ b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs @@ -393,7 +393,7 @@ public Action onProjectChange public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) { - #if (UNITY_EDITOR && ENABLE_CLOUD_SERVICES_ANALYTICS) + #if (UNITY_EDITOR) #if (UNITY_2023_2_OR_NEWER) EditorAnalytics.SendAnalytic(analytic); #else @@ -404,7 +404,7 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) EditorAnalytics.SendEventWithLimit(info.Name, analytic); #endif // UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS || UNITY_2023_1_OR_NEWER #endif // UNITY_2023_2_OR_NEWER - #elif (UNITY_ANALYTICS) // Implicitly: !UNITY_EDITOR + #elif (ENABLE_CLOUD_SERVICES_ANALYTICS) // Implicitly: !UNITY_EDITOR && UNITY_ANALYTICS var info = analytic.info; Analytics.Analytics.RegisterEvent(info.Name, info.MaxEventsPerHour, info.MaxNumberOfElements, InputAnalytics.kVendorKey); if (analytic.TryGatherData(out var data, out var error)) From 4be0f1c5a2f15fc035dff80324292208a3d08c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Mon, 23 Sep 2024 15:55:44 +0200 Subject: [PATCH 4/4] FIX: formatting error in CHANGELOG --- 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 77d3f3bb54..c5c45b05e7 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -10,7 +10,7 @@ however, it has to be formatted properly to pass verification tests. ## [Unreleased] - yyyy-mm-dd -## Fixed +### Fixed - Fixed Multiple interactions could breaks on Composite Binding. [ISXB-619](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-619) - Fixed memory leak when the OnScreenStick component was destroyed [ISXB-1070](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1070). Contribution by [LukeUnityDev](https://github.com/LukeUnityDev). - Fixed Action Maps contextual menu in Action Editor UI that occasionally displays unrelated items.