diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index bb2b38b83c..e4e72d4612 100755 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. Due to package verification, the latest version below is the unpublished version and the date is meaningless. however, it has to be formatted properly to pass verification tests. -## [Unreleased] +## [1.1.0] - 2021-08-27 ### Changed diff --git a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md index 7f6f92fcec..5b5d433220 100644 --- a/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md +++ b/Packages/com.unity.inputsystem/Documentation~/ActionBindings.md @@ -601,7 +601,8 @@ You can also use this method to replace the text string with images. // Call GetBindingDisplayString() such that it also returns information about the // name of the device layout and path of the control on the device. This information // is useful for reliably associating imagery with individual controls. - var bindingString = action.GetBindingDisplayString(out deviceLayout, out controlPath); + // NOTE: The first argument is the index of the binding within InputAction.bindings. + var bindingString = action.GetBindingDisplayString(0, out deviceLayout, out controlPath); // If it's a gamepad, look up an icon for the control. Sprite icon = null; diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs index c4b949d312..2b4c7b5fff 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs @@ -1268,7 +1268,27 @@ public InputActionReference trackedDevicePosition /// /// This instantiates and assigns it to . It also /// assigns all the various individual actions such as and . + /// + /// Note that if an InputSystemUIInputModule component is programmatically added to a GameObject, + /// it will automatically receive the default actions as part of its OnEnable method. Use + /// to remove these assignments. + /// + /// + /// + /// var go = new GameObject(); + /// go.AddComponent<EventSystem>(); + /// + /// // Adding the UI module like this will implicitly enable it and thus lead to + /// // automatic assignment of the default input actions. + /// var uiModule = go.AddComponent<InputSystemUIInputModule>(); + /// + /// // Manually remove the default input actions. + /// uiModule.UnassignActions(); + /// + /// /// + /// + /// public void AssignDefaultActions() { var defaultActions = new DefaultInputActions(); @@ -1286,11 +1306,13 @@ public void AssignDefaultActions() } /// - /// Remove all action assignment + /// Remove all action assignments, that is as well as all individual + /// actions such as . /// /// - /// This clears and the various individual action references such as and . + /// If the current actions were enabled by the UI input module, they will be disabled in the process. /// + /// public void UnassignActions() { actionsAsset = default; diff --git a/Packages/com.unity.inputsystem/ValidationExceptions.json b/Packages/com.unity.inputsystem/ValidationExceptions.json index 800fff2d9e..841156da55 100644 --- a/Packages/com.unity.inputsystem/ValidationExceptions.json +++ b/Packages/com.unity.inputsystem/ValidationExceptions.json @@ -3,7 +3,7 @@ { "ValidationTest": "API Validation", "ExceptionMessage": "Breaking changes require a new major version.", - "PackageVersion": "1.1.0-pre.6" + "PackageVersion": "1.1.0" } ], "WarningExceptions": [] diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json index 055a4cffde..2a18d89828 100755 --- a/Packages/com.unity.inputsystem/package.json +++ b/Packages/com.unity.inputsystem/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.inputsystem", "displayName": "Input System", - "version": "1.1.0-pre.6", + "version": "1.1.0", "unity": "2019.4", "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.", "keywords": [