MERGE: develop => stable.

Author: Rene Damm

.yamato/upm-ci.yml

@@ -48,8 +48,10 @@ platforms:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
-    - {% if platform.installscript %} {{ platform.installscript }} {{ editor.version }} {% endif %} 
-    - upm-ci~/tools/utr/utr --testproject $PWD --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_6 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} 
+    {% if platform.installscript %}
+    - {{ platform.installscript }} {{ editor.version }}
+    {% endif %}
+    - upm-ci~/tools/utr/utr --testproject . --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_6 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} 
   triggers:
     branches:
       only:

Assets/Samples/CustomComposite/CustomComposite.cs

@@ -35,6 +35,14 @@
 #if UNITY_EDITOR
 [InitializeOnLoad]
 #endif
+// We can customize the way display strings are formed for our composite by
+// annotating it with DisplayStringFormatAttribute. The string is simply a
+// list with elements to be replaced enclosed in curly braces. Everything
+// outside those will taken verbatim. The fragments inside the curly braces
+// in this case refer to the binding composite parts by name. Each such
+// instance is replaced with the display text for the corresponding
+// part binding.
+[DisplayStringFormat("{multiplier}*{stick}")]
 public class CustomComposite : InputBindingComposite<Vector2>
 {
     // In the editor, the static class constructor will be called on startup

Assets/Samples/InGameHints.meta

@@ -0,0 +1,4 @@
+{
+  "displayName": "In-Game Hints",
+  "description": "Demonstrates how to create in-game hints in the UI which reflect current bindings and active control schemes."
+}