Skip to content

Commit 0377398

Browse files
ekcohekcoh
authored
Merge branch 'develop' into isx-2322-polling-frequency
2 parents b8e17c9 + 4c0bab2 commit 0377398

File tree

13 files changed

+25
-19
lines changed

13 files changed

+25
-19
lines changed

‎Assets/Samples/InGameHints/InGameHintsActions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.14.1
4+
// version 1.15.0
55
// from Assets/Samples/InGameHints/InGameHintsActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
@@ -87,6 +87,7 @@ public partial class @InGameHintsActions: IInputActionCollection2, IDisposable
8787
public @InGameHintsActions()
8888
{
8989
asset = InputActionAsset.FromJson(@"{
90+
""version"": 1,
9091
""name"": ""InGameHintsActions"",
9192
""maps"": [
9293
{

‎Assets/Samples/SimpleDemo/SimpleControls.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.14.1
4+
// version 1.15.0
55
// from Assets/Samples/SimpleDemo/SimpleControls.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
@@ -85,6 +85,7 @@ public partial class @SimpleControls: IInputActionCollection2, IDisposable
8585
public @SimpleControls()
8686
{
8787
asset = InputActionAsset.FromJson(@"{
88+
""version"": 1,
8889
""name"": ""SimpleControls"",
8990
""maps"": [
9091
{

‎Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override IEnumerator UnitySetup()
4545

4646
#region Helper methods
4747

48-
IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs = 5.0)
48+
IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs = kDefaultTimeoutSecs)
4949
{
5050
return WaitUntil(() =>
5151
{
@@ -58,7 +58,7 @@ IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs
5858
}, $"WaitForActionMapRename {index} {isActive}", timeoutSecs);
5959
}
6060

61-
IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5.0)
61+
IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = kDefaultTimeoutSecs)
6262
{
6363
return WaitUntil(() =>
6464
{
@@ -208,10 +208,8 @@ public IEnumerator CanRenameAction()
208208
// Re-fetch the actions since the UI may have refreshed.
209209
actionItem = actionContainer.Query<InputActionsTreeViewItem>().ToList();
210210

211-
// Click twice to start the rename
212211
SimulateClickOn(actionItem[1]);
213212
yield return WaitForNotDirty();
214-
215213
// If the item is already focused, don't click again
216214
if (!actionItem[1].IsFocused)
217215
{

‎Assets/Tests/InputSystem.Editor/UIToolkitBaseTestWindow.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
public class UIToolkitBaseTestWindow<T> where T : EditorWindow
1616
{
1717
protected T m_Window;
18+
protected const double kDefaultTimeoutSecs = 10.0;
1819

1920
#region setup and teardown
2021
[OneTimeSetUp]
@@ -124,7 +125,7 @@ protected void SimulateDeleteCommand()
124125
/// Wait for UI toolkit scheduler to process the frame
125126
/// </summary>
126127
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
127-
protected IEnumerator WaitForSchedulerLoop(double timeoutSecs = 5.0)
128+
protected IEnumerator WaitForSchedulerLoop(double timeoutSecs = kDefaultTimeoutSecs)
128129
{
129130
bool done = false;
130131
m_Window.rootVisualElement.schedule.Execute(() => done = true);
@@ -136,7 +137,7 @@ protected IEnumerator WaitForSchedulerLoop(double timeoutSecs = 5.0)
136137
/// </summary>
137138
/// <param name="ve">VisualElement to be focused</param>
138139
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
139-
protected IEnumerator WaitForFocus(VisualElement ve, double timeoutSecs = 5.0)
140+
protected IEnumerator WaitForFocus(VisualElement ve, double timeoutSecs = kDefaultTimeoutSecs)
140141
{
141142
return WaitUntil(() => ve.focusController.focusedElement == ve, "WaitForFocus", timeoutSecs);
142143
}
@@ -145,7 +146,7 @@ protected IEnumerator WaitForFocus(VisualElement ve, double timeoutSecs = 5.0)
145146
/// Wait for the windows to be not dirty
146147
/// </summary>
147148
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
148-
protected IEnumerator WaitForNotDirty(double timeoutSecs = 5.0)
149+
protected IEnumerator WaitForNotDirty(double timeoutSecs = kDefaultTimeoutSecs)
149150
{
150151
return WaitUntil(() => m_Window.rootVisualElement.panel.isDirty == false, "WaitForNotDirty", timeoutSecs);
151152
}
@@ -156,7 +157,7 @@ protected IEnumerator WaitForNotDirty(double timeoutSecs = 5.0)
156157
/// <param name="action">Lambda to call between frame</param>
157158
/// <param name="assertMessage">Assert Message</param>
158159
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
159-
protected IEnumerator WaitUntil(Func<bool> action, string assertMessage, double timeoutSecs = 5.0)
160+
protected IEnumerator WaitUntil(Func<bool> action, string assertMessage, double timeoutSecs = kDefaultTimeoutSecs)
160161
{
161162
var endTime = EditorApplication.timeSinceStartup + timeoutSecs;
162163
do

‎Assets/Tests/InputSystem/CoreTests_Editor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3398,7 +3398,7 @@ internal static Type Compile(string code, string typeName, string options = null
33983398
{
33993399
var codeProvider = CodeDomProvider.CreateProvider("CSharp");
34003400
var cp = new CompilerParameters { CompilerOptions = options };
3401-
cp.ReferencedAssemblies.Add($"{EditorApplication.applicationContentsPath}/Managed/UnityEngine/UnityEngine.CoreModule.dll");
3401+
cp.ReferencedAssemblies.Add(typeof(UnityEngine.Vector2).Assembly.Location);
34023402
cp.ReferencedAssemblies.Add("Library/ScriptAssemblies/Unity.InputSystem.dll");
34033403
#if UNITY_2022_1_OR_NEWER
34043404
// Currently there is are cross-references to netstandard, e.g. System.IEquatable<UnityEngine.Vector2>, System.IFormattable

‎Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
4-
// version 1.14.1
4+
// version 1.15.0
55
// from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
@@ -85,6 +85,7 @@ public partial class @InputActionCodeGeneratorActions: IInputActionCollection2,
8585
public @InputActionCodeGeneratorActions()
8686
{
8787
asset = InputActionAsset.FromJson(@"{
88+
""version"": 1,
8889
""name"": ""InputActionCodeGeneratorActions"",
8990
""maps"": [
9091
{

‎Packages/com.unity.inputsystem/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ however, it has to be formatted properly to pass verification tests.
1010

1111
## [Unreleased] - yyyy-mm-dd
1212

13+
14+
15+
## [1.14.1] - 2025-07-10
16+
1317
### Added
1418

1519
- Support for Xbox controllers over USB on macOS, using macOS's default driver. [ISXB-1548]

‎Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static partial class InputSystem
1616
// Keep this in sync with "Packages/com.unity.inputsystem/package.json".
1717
// NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
1818
// "-preview" suffixes here.
19-
internal const string kAssemblyVersion = "1.14.1";
20-
internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.14";
19+
internal const string kAssemblyVersion = "1.15.0";
20+
internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.15";
2121
}
2222
}

‎Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
4-
// version 1.14.1
4+
// version 1.15.0
55
// from "Keyboard" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
4-
// version 1.14.1
4+
// version 1.15.0
55
// from "Mouse" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

0 commit comments

Comments
 (0)