Skip to content

Commit 82e180f

Browse files
Merge branch 'develop' into ci-ui-tests-increase-timeout-to-10-secs
2 parents 9b0e617 + 9cc79d7 commit 82e180f

File tree

10 files changed

+17
-10
lines changed

10 files changed

+17
-10
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/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

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.14.1
4+
// version 1.15.0
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.14.1")]
7+
[assembly: AssemblyVersion("1.15.0")]
88
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")]
99
[assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
1010
[assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")]

Packages/com.unity.inputsystem/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.unity.inputsystem",
33
"displayName": "Input System",
4-
"version": "1.14.1",
4+
"version": "1.15.0",
55
"unity": "2021.3",
66
"description": "A new input system which can be used as a more extensible and customizable alternative to Unity's classic input system in UnityEngine.Input.",
77
"keywords": [

0 commit comments

Comments
 (0)