Skip to content

Commit 60ed7c0

Browse files
unitALGunitALG
committed
Merge branch 'develop' into docatt-qsprint-batch-fixes
2 parents 2511adb + 2a1328b commit 60ed7c0

File tree

11 files changed

+17
-12
lines changed

11 files changed

+17
-12
lines changed

‎Assets/Samples/InGameHints/InGameHintsActions.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:InputActionCodeGenerator
4-
// version 1.15.0
4+
// version 1.15.1
55
// from Assets/Samples/InGameHints/InGameHintsActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Samples/SimpleDemo/SimpleControls.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:InputActionCodeGenerator
4-
// version 1.15.0
4+
// version 1.15.1
55
// from Assets/Samples/SimpleDemo/SimpleControls.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Assets/Samples/UIvsGameInput/.sample.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"displayName": "UI vs. Game Input",
3-
"description": "An example that shows how to deal with ambiguities that may arrise when overlaying interactive UI elements on top of a game scene."
3+
"description": "An example that shows how to deal with ambiguities that may arise when overlaying interactive UI elements on top of a game scene."
44
}

‎Assets/Tests/InputSystem/InputActionCodeGeneratorActions.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:InputActionCodeGenerator
4-
// version 1.15.0
4+
// version 1.15.1
55
// from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ Due to package verification, the latest version below is the unpublished version
99
however, it has to be formatted properly to pass verification tests.
1010

1111
## [Unreleased] - yyyy-mm-dd
12-
- Fixed InputControl picker not updating correctly when the Input Actions Window was dirty. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221)
13-
- Fixed formatting issues on processor documentation page
12+
13+
14+
15+
## [1.15.0] - 2025-10-03
1416

1517
### Changed
1618
- Expanded `RebindingUISample` to include a "game mode" state and a "menu state" to be more similar to a real game. Also added action-performed indicators (`InputActionIndicator`) illustrating when actions get triggered.
@@ -28,6 +30,8 @@ however, it has to be formatted properly to pass verification tests.
2830
- Fixed the compilation warnings when used with Unity 6.4 (ISX-2349).
2931
- Fixed an issue where `InputSystemUIInputModule.localMultiPlayerRoot` could not be set to `null` when using `MultiplayerEventSystem`. [ISXB-1610](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1610)
3032
- Fixed an issue in `Keyboard` where the sub-script operator would return a `null` key control for the deprecated key `Key.IMESelected`. Now, an aliased `KeyControl`mapping to the IMESelected bit is returned for compability reasons. It is still strongly advised to not rely on this key since `IMESelected` bit isn't strictly a key and will be removed from the `Key` enumeration type in a future major revision. [ISXB-1541](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1541).
33+
- Fixed InputControl picker not updating correctly when the Input Actions Window was dirty. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221)
34+
- Fixed formatting issues on processor documentation page
3135

3236
## [1.14.2] - 2025-08-05
3337

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
99
[assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")]
1010
[assembly: InternalsVisibleTo("Unity.InputSystem.ForUI")] // To avoid minor bump
11+
[assembly: InternalsVisibleTo("Unity.AI.Assistant.Editor")]
1112

1213
namespace UnityEngine.InputSystem
1314
{
@@ -16,7 +17,7 @@ public static partial class InputSystem
1617
// Keep this in sync with "Packages/com.unity.inputsystem/package.json".
1718
// NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
1819
// "-preview" suffixes here.
19-
internal const string kAssemblyVersion = "1.15.0";
20+
internal const string kAssemblyVersion = "1.15.1";
2021
internal const string kDocUrl = "https://docs.unity3d.com/Packages/[email protected]";
2122
}
2223
}

‎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.15.0
4+
// version 1.15.1
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.15.0
4+
// version 1.15.1
55
// from "Mouse" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.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.15.0
4+
// version 1.15.1
55
// from "Touchscreen" layout
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

‎Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Keep this in sync with "Packages/com.unity.inputsystem/package.json".
55
// NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
66
// "-preview" suffixes here.
7-
[assembly: AssemblyVersion("1.15.0")]
7+
[assembly: AssemblyVersion("1.15.1")]
88
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")]
99
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
1010
[assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")]

0 commit comments

Comments
 (0)