Merge branch 'releases/2.4.0' into docs

Author: David Kline

Assets/MRTK/Core/Extensions/UnityObjectExtensions.cs

@@ -24,7 +24,7 @@ public static void DontDestroyOnLoad(this Object target)
         }
 
         /// <summary>
-        /// Destroys a Unity object appropriately depending if running in in edit or play mode.
+        /// Destroys a Unity object appropriately depending if running in edit or play mode.
         /// </summary>
         /// <param name="obj">Unity object to destroy</param>
         /// <param name="t">Time in seconds at which to destroy the object, if applicable.</param>

Assets/MRTK/Core/Providers/Hands/ArticulatedHandDefinition.cs

@@ -52,7 +52,7 @@ public float EnterPinchDistance
                 }
                 else
                 {
-                    Debug.LogError("EnterPinchDistance must be be between 0.015 and 0.1, please change Enter Pinch Distance in the Leap Motion Device Manager Profile");
+                    Debug.LogError("EnterPinchDistance must be between 0.015 and 0.1, please change Enter Pinch Distance in the Leap Motion Device Manager Profile");
                 }   
             }
         }
@@ -75,7 +75,7 @@ public float ExitPinchDistance
                 }
                 else
                 {
-                    Debug.LogError("ExitPinchDistance must be be between 0.015 and 0.1, please change Exit Pinch Distance in the Leap Motion Device Manager Profile");
+                    Debug.LogError("ExitPinchDistance must be between 0.015 and 0.1, please change Exit Pinch Distance in the Leap Motion Device Manager Profile");
                 }
             }
         }

Assets/MRTK/Core/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs

@@ -56,7 +56,7 @@ public static string BuildConfig
         }
 
         /// <summary>
-        /// Gets the build configuraition type as a WSABuildType enum
+        /// Gets the build configuration type as a WSABuildType enum
         /// </summary>
         public static WSABuildType BuildConfigType
         {

Assets/MRTK/Core/Utilities/Editor/SpatializerUtilities.cs

@@ -58,7 +58,7 @@ public static bool CheckSettings()
                 return false;
             }
 
-            // A spatializer is correctly confiugured.
+            // A spatializer is correctly configured.
             return true;
         }
 

Assets/MRTK/Core/Utilities/Gltf/Serialization/GltfUtility.cs

@@ -415,7 +415,7 @@ private static Dictionary<string, int> StringIntDictionaryFromJson(string json)
         /// <summary>
         /// Takes a json object string with key value pairs, and returns a json string
         /// in the format of `{"items": [{"key": $key_name, "value": $value}]}`.
-        /// This format can be handled by JsonUtility and support an aribtrary number
+        /// This format can be handled by JsonUtility and support an arbitrary number
         /// of key/value pairs
         /// </summary>
         /// <param name="json">JSON string in the format `{"key": $value}`</param>

Assets/MRTK/Core/Utilities/Lines/DataProviders/BaseMixedRealityLineDataProvider.cs

@@ -214,11 +214,11 @@ public DistortionMode DistortionMode
         }
 
         [SerializeField]
-        [Tooltip("Curve that defines distoration strength over distance, only used when DistortionMode = NormalizedLength")]
+        [Tooltip("Curve that defines distortion strength over distance, only used when DistortionMode = NormalizedLength")]
         private AnimationCurve distortionStrength = AnimationCurve.Linear(0f, 1f, 1f, 1f);
 
         /// <summary>
-        /// Curve that defines distoration strength over distance, only used when DistortionMode = NormalizedLength
+        /// Curve that defines distortion strength over distance, only used when DistortionMode = NormalizedLength
         /// </summary>
         public AnimationCurve DistortionStrength
         {
@@ -227,12 +227,12 @@ public AnimationCurve DistortionStrength
         }
 
         [Range(0f, 1f)]
-        [Tooltip("Float value that defines distoration strength uniformly over distance, only used when DistortionMode = Uniform")]
+        [Tooltip("Float value that defines distortion strength uniformly over distance, only used when DistortionMode = Uniform")]
         [SerializeField]
         private float uniformDistortionStrength = 1f;
 
         /// <summary>
-        /// Float value that defines distoration strength uniformly over distance, only used when DistortionMode = Uniform
+        /// Float value that defines distortion strength uniformly over distance, only used when DistortionMode = Uniform
         /// </summary>
         public float UniformDistortionStrength
         {

Assets/MRTK/Examples/Demos/UX/Collections/Scripts/GridObjectLayoutControl.cs

@@ -56,7 +56,7 @@ public void PreviousLayout()
         /// Use this to run mock tests in grid object collection tests
         /// and print the resulting positions of child objects to a file.
         /// Used to get expected values for GridObjectCollectionTests.
-        /// When you run the comand, look in the Debug log for where the file is output,
+        /// When you run the command, look in the Debug log for where the file is output,
         /// it will be of form "printgrid-yyMMdd-HHmmss.txt"
         /// </summary>
         public void RunTest()

Assets/MRTK/Extensions/HandPhysicsService/HandPhysicsService.cs

@@ -239,7 +239,7 @@ private static bool TryCreateJointKinematicBody(GameObject rigidBodyPrefab, int
 
             if (currentGameObject.GetComponent<Collider>() == null)
             {
-                Debug.LogError("The HandPhysicsService assumes the FingerTipKinematicBodyPrefab has a Collder component.");
+                Debug.LogError("The HandPhysicsService assumes the FingerTipKinematicBodyPrefab has a Collider component.");
                 UnityEngine.Object.Destroy(currentGameObject);
                 return false;
             }

Assets/MRTK/Providers/LeapMotion/LeapMotionArticulatedHand.cs

@@ -39,7 +39,7 @@ public LeapMotionArticulatedHand(TrackingState trackingState, Handedness control
 
         internal ArticulatedHandDefinition handDefinition;
 
-        // Set the interations for each hand to the Default interactions of the hand definition
+        // Set the interactions for each hand to the Default interactions of the hand definition
         public override MixedRealityInteractionMapping[] DefaultInteractions => handDefinition?.DefaultInteractions;
 
         private static readonly ProfilerMarker UpdateStatePerfMarker = new ProfilerMarker("[MRTK] LeapMotionArticulatedHand.UpdateState");

Assets/MRTK/Providers/LeapMotion/LeapMotionDeviceManagerProfile.cs

@@ -26,9 +26,9 @@ public class LeapMotionDeviceManagerProfile : BaseMixedRealityProfile
         public LeapControllerOrientation LeapControllerOrientation => leapControllerOrientation;
 
         [SerializeField]
-        [Tooltip("Adds an offset to the game object with LeapServiceProvider attached.  This offset is only applied if the leapControllerOrientation" +
+        [Tooltip("Adds an offset to the game object with LeapServiceProvider attached.  This offset is only applied if the leapControllerOrientation " +
         "is LeapControllerOrientation.Desk and is necessary for the hand to appear in front of the main camera. If the leap controller is on the " +
-        "desk, the LeapServiceProvider is added to the scene instead of the LeapXRServiceProvider. The anchor point for the hands is the position of the" + 
+        "desk, the LeapServiceProvider is added to the scene instead of the LeapXRServiceProvider. The anchor point for the hands is the position of the " + 
         "game object with the LeapServiceProvider attached.")]
         private Vector3 leapControllerOffset = new Vector3(0, -0.2f, 0.2f);
 
@@ -61,12 +61,12 @@ public float EnterPinchDistance
 
         [SerializeField]
         [Tooltip("The minimum distance between the index finger tip and the thumb tip required to exit the pinch/air tap gesture to deselect.  The distance between the thumb and  " +
-            "the index tip must be greater than than the ExitPinchDistance to raise the OnInputUp event")]
+            "the index tip must be greater than the ExitPinchDistance to raise the OnInputUp event")]
         private float exitPinchDistance = 0.05f;
 
         /// <summary>
         /// The minimum distance between the index finger tip and the thumb tip required to exit the pinch/air tap gesture to deselect.  The distance between the thumb and 
-        /// the index tip must be greater than than the ExitPinchDistance to raise the OnInputUp event
+        /// the index tip must be greater than the ExitPinchDistance to raise the OnInputUp event
         /// </summary>
         public float ExitPinchDistance
         {