Merge branch 'develop' into stable

Author: Dmytro Ivanov

.github/ISSUE_TEMPLATE/please-don-t-file-new-issues-here--use-the-bug-reporter-instead-.md

@@ -0,0 +1,15 @@
+---
+name: PLEASE DON'T FILE NEW ISSUES HERE. Use the bug reporter instead.
+about: Please use the bug reporter to file new issues
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Hello,
+
+If you have a bug to report, please file it as described here https://unity3d.com/unity/qa/bug-reporting
+For general feedback and discussions you can go to https://forum.unity.com/forums/new-input-system.103/
+
+Thank you!

.gitignore

@@ -3,12 +3,18 @@ InitTestScene*
 *.orig
 *.orig.meta
 .vs/
+.vsconfig
 Assets/Plugins/Editor/JetBrains
 Assets/Plugins/Editor/JetBrains.meta
-Builds/
-Logs/
-Library/
-Temp/
+
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
 *.sln
 *.sln*user
 *.csproj

.yamato/config.metadata

@@ -3,7 +3,9 @@ editors:
     disable_tvos_run: true
   - version: 2021.3
   - version: 2022.2
+  - version: 2023.1
   - version: trunk
+    disable_tvos_run: true
 
 utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
 utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.5.0
+//     version 1.5.1
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.5.0
+//     version 1.5.1
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -3607,6 +3607,40 @@ public void Actions_CanAddBindingsToActions()
         Assert.That(action.controls, Has.Exactly(1).SameAs(gamepad.rightStick));
     }
 
+    [Test]
+    [Category("Actions")]
+    public void Actions_CanRemoveBindingsFromActions()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+        var action = new InputAction();
+
+        action.AddBinding("<Gamepad>/leftStick");
+        action.AddBinding("<Gamepad>/rightStick");
+
+        action.AddCompositeBinding("OneModifier")
+            .With("Modifier", "<Keyboard>/Control")
+            .With("Button", "<Keyboard>/a");
+
+        // Total number of bindings should be 5: 2 normal bindings and 3 from the composite
+        // bindings
+        Assert.That(action.bindings, Has.Count.EqualTo(5));
+
+        // Since we have a composite bindings, all bindings will be removed at once
+        action.ChangeBinding(2).Erase();
+        Assert.That(action.bindings, Has.Count.EqualTo(2));
+
+        // Remove all remaining bindings
+        action.ChangeBinding(0).Erase();
+        action.ChangeBinding(0).Erase();
+        Assert.That(action.bindings, Has.Count.EqualTo(0));
+
+        // Add a binding to be removed
+        action.AddBinding("<Gamepad>/rightStick");
+        Assert.That(action.bindings, Has.Count.EqualTo(1));
+        action.ChangeBinding(0).Erase();
+        Assert.That(action.bindings, Has.Count.EqualTo(0));
+    }
+
     [Test]
     [Category("Actions")]
     public void Actions_CanAddBindingsToActions_ToExistingComposite()

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -1346,6 +1346,63 @@ public void Actions_CanSaveAndLoadRebinds()
         Assert.That(secondActionInAsset.bindings[0].overrideProcessors, Is.EqualTo("invert"));
     }
 
+    [Test]
+    [Category("Actions")]
+    public void Actions_CanSaveAndLoadRebindOnlyForOverridesSet()
+    {
+        var action = new InputAction();
+        action.AddBinding("<Gamepad>/buttonSouth", processors: "invert");
+        action.AddBinding("<Keyboard>/space", interactions: "tap");
+
+        // Check that the effective paths are correct
+        Assert.That(action.bindings[0].effectivePath, Is.EqualTo("<Gamepad>/buttonSouth"));
+        Assert.That(action.bindings[0].effectiveInteractions, Is.EqualTo(null));
+        Assert.That(action.bindings[0].effectiveProcessors, Is.EqualTo("invert"));
+
+        Assert.That(action.bindings[1].effectivePath, Is.EqualTo("<Keyboard>/space"));
+        Assert.That(action.bindings[1].effectiveInteractions, Is.EqualTo("tap"));
+        Assert.That(action.bindings[1].effectiveProcessors, Is.EqualTo(null));
+
+        action.ApplyBindingOverride(0, "<Gamepad>/buttonWest");
+        action.ApplyBindingOverride(1, new InputBinding
+        {
+            overridePath =  "<Keyboard>/a",
+            overrideInteractions = "",
+            overrideProcessors = "multiply",
+        });
+
+        var actionRebindsJson = action.SaveBindingOverridesAsJson();
+        Debug.Log(actionRebindsJson.ToString());
+
+        action.LoadBindingOverridesFromJson(actionRebindsJson);
+
+        // Check that effective binding path changed
+        Assert.That(action.bindings[0].effectivePath, Is.EqualTo("<Gamepad>/buttonWest"));
+        Assert.That(action.bindings[0].overridePath, Is.EqualTo("<Gamepad>/buttonWest"));
+        Assert.That(action.bindings[0].path, Is.EqualTo("<Gamepad>/buttonSouth"));
+        // Check that effective interaction maintained it's null value
+        Assert.That(action.bindings[0].effectiveInteractions, Is.EqualTo(null));
+        Assert.That(action.bindings[0].overrideInteractions, Is.EqualTo(null));
+        Assert.That(action.bindings[0].interactions, Is.EqualTo(null));
+        // Check that effective interaction maintained it's previously set value
+        Assert.That(action.bindings[0].effectiveProcessors, Is.EqualTo("invert"));
+        Assert.That(action.bindings[0].overrideProcessors, Is.EqualTo(null));
+        Assert.That(action.bindings[0].processors, Is.EqualTo("invert"));
+
+        // Check that effective binding path changed
+        Assert.That(action.bindings[1].effectivePath, Is.EqualTo("<Keyboard>/a"));
+        Assert.That(action.bindings[1].overridePath, Is.EqualTo("<Keyboard>/a"));
+        Assert.That(action.bindings[1].path, Is.EqualTo("<Keyboard>/space"));
+        // Check that effective binding was disabled
+        Assert.That(action.bindings[1].effectiveInteractions, Is.EqualTo(""));
+        Assert.That(action.bindings[1].overrideInteractions, Is.EqualTo(""));
+        Assert.That(action.bindings[1].interactions, Is.EqualTo("tap"));
+        // Check that effective binding which was null before, now has changed
+        Assert.That(action.bindings[1].effectiveProcessors, Is.EqualTo("multiply"));
+        Assert.That(action.bindings[1].overrideProcessors, Is.EqualTo("multiply"));
+        Assert.That(action.bindings[1].processors, Is.EqualTo(null));
+    }
+
     [Test]
     [Category("Actions")]
     public void Actions_ActionMapFindBinding_ShouldReturnNegativeOne_IfEmpty()

Assets/Tests/InputSystem/CoreTests_Actions_Rebinding.cs

@@ -2339,6 +2339,7 @@ public void Editor_RenamingAction_WillAutomaticallyEnsureUniqueNames()
         var map = new InputActionMap("set1");
         map.AddAction("actionA", binding: "<Gamepad>/leftStick");
         map.AddAction("actionB");
+        map.AddAction("A");
         var asset = ScriptableObject.CreateInstance<InputActionAsset>();
         asset.AddActionMap(map);
 
@@ -2353,6 +2354,14 @@ public void Editor_RenamingAction_WillAutomaticallyEnsureUniqueNames()
         Assert.That(map.actions[0].name, Is.EqualTo("actionB1"));
         Assert.That(map.actions[0].bindings, Has.Count.EqualTo(1));
         Assert.That(map.actions[0].bindings[0].action, Is.EqualTo("actionB1"));
+
+        // now check that unique renaming ignores the action being renamed, so A can be renamed to a and not a1.
+        var actionAProperty = mapProperty.FindPropertyRelative("m_Actions").GetArrayElementAtIndex(2);
+
+        InputActionSerializationHelpers.RenameAction(actionAProperty, mapProperty, "a");
+        obj.ApplyModifiedPropertiesWithoutUndo();
+
+        Assert.That(map.actions[2].name, Is.EqualTo("a"));
     }
 
     [Test]

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.5.0
+//     version 1.5.1
 //     from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if