Skip to content

Commit e1f0221

Browse files
author
Rene Damm
committed
MERGE: develop => stable.
2 parents 63fd8a3 + 592a244 commit e1f0221

File tree

15 files changed

+39
-205
lines changed

15 files changed

+39
-205
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.1.0
4+
// version 1.1.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.1.0
4+
// version 1.1.1
55
// from Assets/Samples/SimpleDemo/SimpleControls.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
88
Due to package verification, the latest version below is the unpublished version and the date is meaningless.
99
however, it has to be formatted properly to pass verification tests.
1010

11+
## [1.1.1] - 2021-09-03
12+
13+
### Fixed
14+
15+
- Fixed `InvalidCastException: Specified cast is not valid.` and `InvalidOperationException: Already have an event buffer set! Was OnUpdate() called recursively?` when upgrading from 1.1.0-pre.5 or earlier. If you experience this issue you can also restart the editor to resolve it.
16+
- Fixed `InputDeviceChange.Destroyed` not being available, now it's correctly marked as obsolete instead.
17+
- Removed documentation around platform user account management of `InputUser` which was ahead of actual backend support for the feature.
18+
1119
## [1.1.0] - 2021-08-27
1220

1321
### Changed

‎Packages/com.unity.inputsystem/Documentation~/UserManagement.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The Input System supports multi-user management through the [`InputUser`](../api
44

55
>__Note__: The user management API is quite low-level in nature. The stock functionality of [`PlayerInputManager`](Components.md#playerinputmanager-component) (see [Components](./Components.md)) provides an easier way to set up user management. The API described here is useful when you want more control over user management.
66
7-
In the Input System, each [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html) represents a human interacting with the application. For example, you can have multiple users playing a game together on a single computer or device (local multiplayer), where each user has one or more [paired Input Devices](#device-pairing). A user might be associated with a platform [user account](#user-account-management), if the platform and Devices support it.
7+
In the Input System, each [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html) represents a human interacting with the application. For example, you can have multiple users playing a game together on a single computer or device (local multiplayer), where each user has one or more [paired Input Devices](#device-pairing).
88

99
The [`PlayerInputManager`](Components.md#playerinputmanager-component) class uses [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html) internally to handle users.
1010

@@ -34,16 +34,6 @@ If paired Input Devices disconnect during the session, the system notifies the [
3434

3535
To get notifications about these changes, subscribe to the [`InputUser.onChange`](../api/UnityEngine.InputSystem.Users.InputUser.html#UnityEngine_InputSystem_Users_InputUser_onChange) event.
3636

37-
## User account management
38-
39-
The Input System can associate a user with a platform-specific user account, if both the platform and the Devices support this. Consoles commonly support this functionality. Platforms that support user account association are Xbox One, PlayStation 4, Nintendo Switch, and UWP.
40-
41-
Use the [`platformUserAccountHandle`](../api/UnityEngine.InputSystem.Users.InputUser.html#UnityEngine_InputSystem_Users_InputUser_platformUserAccountHandle) property to query the associated user account for an [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html). This property gets determined when the user is first [paired to a Device](#device-pairing), and the Device has any platform user information the Input System can query.
42-
43-
The account associated with an InputUser might change if the player uses the platform's facilities to switch to a different account ([`InputUser.onChange`](../api/UnityEngine.InputSystem.Users.InputUser.html#UnityEngine_InputSystem_Users_InputUser_onChange) receives an `InputUserChange.AccountChanged` notification).
44-
45-
Note that for WSA/UWP apps, the *User Account Information* capability must be enabled for the app in order for user information to come through on input devices.
46-
4737
## Debugging
4838

4939
Check the debugger documentation to learn [how to debug active users](Debugging.md#debugging-users-and-playerinput).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static partial class InputSystem
1515
// Keep this in sync with "Packages/com.unity.inputsystem/package.json".
1616
// NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
1717
// "-preview" suffixes here.
18-
internal const string kAssemblyVersion = "1.1.0";
18+
internal const string kAssemblyVersion = "1.1.1";
1919
internal const string kDocUrl = "https://docs.unity3d.com/Packages/[email protected]";
2020
}
2121
}

‎Packages/com.unity.inputsystem/InputSystem/Devices/InputDevice.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -619,16 +619,16 @@ internal enum DeviceFlags
619619

620620
HasStateCallbacks = 1 << 1,
621621
HasControlsWithDefaultState = 1 << 2,
622-
HasDontResetControls = 1 << 3,
623-
HasEventMerger = 1 << 4,
622+
HasDontResetControls = 1 << 10,
623+
HasEventMerger = 1 << 13,
624624

625-
Remote = 1 << 5, // It's a local mirror of a device from a remote player connection.
626-
Native = 1 << 6, // It's a device created from data surfaced by NativeInputRuntime.
625+
Remote = 1 << 3, // It's a local mirror of a device from a remote player connection.
626+
Native = 1 << 4, // It's a device created from data surfaced by NativeInputRuntime.
627627

628-
DisabledInFrontend = 1 << 7, // Explicitly disabled on the managed side.
629-
DisabledInRuntime = 1 << 8, // Disabled in the native runtime.
630-
DisabledWhileInBackground = 1 << 9, // Disabled while the player is running in the background.
631-
DisabledStateHasBeenQueriedFromRuntime = 1 << 10, // Whether we have fetched the current enable/disable state from the runtime.
628+
DisabledInFrontend = 1 << 5, // Explicitly disabled on the managed side.
629+
DisabledInRuntime = 1 << 7, // Disabled in the native runtime.
630+
DisabledWhileInBackground = 1 << 8, // Disabled while the player is running in the background.
631+
DisabledStateHasBeenQueriedFromRuntime = 1 << 6, // Whether we have fetched the current enable/disable state from the runtime.
632632

633633
CanRunInBackground = 1 << 11,
634634
CanRunInBackgroundHasBeenQueried = 1 << 12,

‎Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceChange.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using UnityEngine.InputSystem.LowLevel;
23
using UnityEngine.InputSystem.Utilities;
34

@@ -119,5 +120,8 @@ public enum InputDeviceChange
119120
/// This notification is sent before the actual reset happens.
120121
/// </summary>
121122
HardReset,
123+
124+
[Obsolete("Destroyed enum has been deprecated.")]
125+
Destroyed,
122126
}
123127
}

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

0 commit comments

Comments
 (0)