Merge branch 'mrtk_development' into vNEXT-ControllerProxyVisualizationProfile

StephenHodgson · StephenHodgson · commit 600c71576d2f · 2018-09-26T14:21:04.000-07:00
# Conflicts:
#	Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityControllerMappingProfile.asset
#	Assets/MixedRealityToolkit/_Core/Definitions/Devices/MixedRealityControllerMappingProfile.cs
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityBoundaryVisualizationProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityBoundaryVisualizationProfile.asset
@@ -11,6 +11,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9fd6338e77774badb73a2b1320b41caf, type: 3}
   m_Name: DefaultMixedRealityBoundaryVisualizationProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
+  boundaryHeight: 3
   showFloor: 1
   floorMaterial: {fileID: 2100000, guid: 47f3c5e1cb6142ba9697cd4c86d74321, type: 2}
   floorScale: {x: 10, y: 10}
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityCameraProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityCameraProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a4a1c93114e9437cb75d8b3ee4e0e1ba, type: 3}
   m_Name: DefaultMixedRealityCameraProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   isCameraPersistent: 0
   nearClipPlaneOpaqueDisplay: 0.1
   cameraClearFlagsOpaqueDisplay: 1
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7612acbc1a4a4ed0afa5f4ccbe42bee4, type: 3}
   m_Name: DefaultMixedRealityConfigurationProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   initialManagerTypes:
   - reference: Microsoft.MixedReality.Toolkit.SDK.Teleportation.MixedRealityTeleportManager,
       Microsoft.MixedReality.Toolkit.SDK
@@ -36,6 +37,5 @@ MonoBehaviour:
   teleportSystemType:
     reference: Microsoft.MixedReality.Toolkit.SDK.Teleportation.MixedRealityTeleportManager,
       Microsoft.MixedReality.Toolkit.SDK
-  teleportDuration: 0.25
   registeredComponentsProfile: {fileID: 11400000, guid: efbaf6ea540c69f4fb75415a5d145a53,
     type: 2}
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityControllerMappingProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityControllerMappingProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1a1cf5fd47e548e6a23bdd3ddcc00cf6, type: 3}
   m_Name: DefaultMixedRealityControllerMappingProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   mixedRealityControllerMappingProfiles:
   - description: MouseController
     controllerType:
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityControllerVisualizationProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityControllerVisualizationProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 514da61389c049c0bdaf31b7f6970d33, type: 3}
   m_Name: DefaultMixedRealityControllerVisualizationProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   renderMotionControllers: 1
   controllerVisualizationType:
     reference: Microsoft.MixedReality.Toolkit.SDK.UX.Controllers.MixedRealityControllerVisualizer,
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityGesturesProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityGesturesProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7554812f08ec49e694a8d9d4ee235a9c, type: 3}
   m_Name: DefaultMixedRealityGesturesProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   manipulationGestures: 12
   navigationGestures: 112
   useRailsNavigation: 0
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputActionsProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputActionsProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d1a15d870c8b4e52acc4643bd258ed6e, type: 3}
   m_Name: DefaultMixedRealityInputActionsProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   inputActions:
   - id: 1
     description: Select
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputPointerProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputPointerProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: db393d206eab4604ab74278cb6cda355, type: 3}
   m_Name: DefaultMixedRealityInputPointerProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   pointerOptions:
   - controllerType:
       reference: 
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputSystemProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputSystemProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b71cb900fa9dec5488df2deb180db58f, type: 3}
   m_Name: DefaultMixedRealityInputSystemProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   inputActionsProfile: {fileID: 11400000, guid: 723eb97b02944311b92861f473eee53e,
     type: 2}
   gesturesProfile: {fileID: 11400000, guid: bd7829a9b29409045a745b5a18299291, type: 2}
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityRegisteredComponentsProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityRegisteredComponentsProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eebbca41bb0b40d298ef201735d08616, type: 3}
   m_Name: DefaultMixedRealityRegisteredComponentsProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   configurations:
   - componentType:
       reference: Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput.UnityJoystickManager,
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealitySpeechCommandsProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealitySpeechCommandsProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1f18fec9b55c4f818e284af454161962, type: 3}
   m_Name: DefaultMixedRealitySpeechCommandsProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   startBehavior: 0
   recognitionConfidenceLevel: 1
   speechCommands:
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/BaseMixedRealityProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/BaseMixedRealityProfile.cs
@@ -0,0 +1,15 @@
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Core.Definitions
+{
+    public abstract class BaseMixedRealityProfile : ScriptableObject
+    {
+        [SerializeField]
+        private bool isCustomProfile = true;
+
+        internal bool IsCustomProfile => isCustomProfile;
+    }
+}
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/BaseMixedRealityProfile.cs.meta b/Assets/MixedRealityToolkit/_Core/Definitions/BaseMixedRealityProfile.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/BoundarySystem/MixedRealityBoundaryVisualizationProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/BoundarySystem/MixedRealityBoundaryVisualizationProfile.cs
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem
     /// Configuration profile settings for setting up boundary visualizations.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Boundary Visualization Profile", fileName = "MixedRealityBoundaryVisualizationProfile", order = (int)CreateProfileMenuItemIndices.BoundaryVisualization)]
-    public class MixedRealityBoundaryVisualizationProfile : ScriptableObject
+    public class MixedRealityBoundaryVisualizationProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("The approximate height of the play space, in meters.")]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/Devices/MixedRealityControllerMappingProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/Devices/MixedRealityControllerMappingProfile.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions.Devices
 {
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Mapping Profile", fileName = "MixedRealityControllerMappingProfile", order = (int)CreateProfileMenuItemIndices.ControllerMapping)]
-    public class MixedRealityControllerMappingProfile : ScriptableObject
+    public class MixedRealityControllerMappingProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("The list of controller templates your application can use.")]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/Devices/MixedRealityControllerVisualizationProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/Devices/MixedRealityControllerVisualizationProfile.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions.Devices
 {
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Visualization Profile", fileName = "MixedRealityControllerVisualizationProfile", order = (int)CreateProfileMenuItemIndices.ControllerVisualization)]
-    public class MixedRealityControllerVisualizationProfile : ScriptableObject
+    public class MixedRealityControllerVisualizationProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("Enable and configure the controller rendering of the Motion Controllers on Startup.")]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityGesturesProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityGesturesProfile.cs
@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
     /// Configuration profile settings for setting up and consuming Input Actions.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Gestures Profile", fileName = "MixedRealityGesturesProfile", order = (int)CreateProfileMenuItemIndices.Gestures)]
-    public class MixedRealityGesturesProfile : ScriptableObject
+    public class MixedRealityGesturesProfile : BaseMixedRealityProfile
     {
         [EnumFlags]
         [SerializeField]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputActionsProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputActionsProfile.cs
@@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
     /// Configuration profile settings for setting up and consuming Input Actions.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Input Actions Profile", fileName = "MixedRealityInputActionsProfile", order = (int)CreateProfileMenuItemIndices.InputActions)]
-    public class MixedRealityInputActionsProfile : ScriptableObject
+    public class MixedRealityInputActionsProfile : BaseMixedRealityProfile
     {
         private readonly string[] defaultInputActions =
         {
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs
@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
     /// Configuration profile settings for setting up controller pointers.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Input System Profile", fileName = "MixedRealityInputSystemProfile", order = (int)CreateProfileMenuItemIndices.Input)]
-    public class MixedRealityInputSystemProfile : ScriptableObject
+    public class MixedRealityInputSystemProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("Input System Action Mapping profile for wiring up Controller input to Actions.")]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityPointerProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityPointerProfile.cs
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
     /// Configuration profile settings for setting up controller pointers.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Pointer Profile", fileName = "MixedRealityInputPointerProfile", order = (int)CreateProfileMenuItemIndices.Pointer)]
-    public class MixedRealityPointerProfile : ScriptableObject
+    public class MixedRealityPointerProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         private PointerOption[] pointerOptions = new PointerOption[0];
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealitySpeechCommandsProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealitySpeechCommandsProfile.cs
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
     /// Configuration profile settings for setting up and consuming Speech Commands.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Speech Commands Profile", fileName = "MixedRealitySpeechCommandsProfile", order = (int)CreateProfileMenuItemIndices.Speech)]
-    public class MixedRealitySpeechCommandsProfile : ScriptableObject
+    public class MixedRealitySpeechCommandsProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("Whether the recognizer should be activated on start.")]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityCameraProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityCameraProfile.cs
@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions
     /// Based on those values, you can customize your camera and quality settings.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Camera Profile", fileName = "MixedRealityCameraProfile", order = (int)CreateProfileMenuItemIndices.Camera)]
-    public class MixedRealityCameraProfile : ScriptableObject
+    public class MixedRealityCameraProfile : BaseMixedRealityProfile
     {
         private enum DisplayType
         {
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs
@@ -19,7 +19,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions
     /// Configuration profile settings for the Mixed Reality Toolkit.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Configuration Profile", fileName = "MixedRealityConfigurationProfile", order = (int)CreateProfileMenuItemIndices.Configuration)]
-    public class MixedRealityConfigurationProfile : ScriptableObject, ISerializationCallbackReceiver
+    public class MixedRealityConfigurationProfile : BaseMixedRealityProfile, ISerializationCallbackReceiver
     {
         #region Manager Registry properties
 
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityRegisteredComponentsProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityRegisteredComponentsProfile.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions
 {
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Registered Components Profile", fileName = "MixedRealityRegisteredComponentsProfile", order = (int)CreateProfileMenuItemIndices.RegisteredComponents)]
-    public class MixedRealityRegisteredComponentsProfile : ScriptableObject
+    public class MixedRealityRegisteredComponentsProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         private MixedRealityComponentConfiguration[] configurations = null;
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityPreferences.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityPreferences.cs
@@ -0,0 +1,59 @@
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Editor;
+using UnityEditor;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Core.Inspectors
+{
+    internal static class MixedRealityPreferences
+    {
+        private static readonly GUIContent LockContent = new GUIContent("Lock SDK Profiles", "Locks the SDK profiles from being edited.");
+
+        private static bool prefsLoaded;
+
+        private static bool lockProfiles = true;
+
+        /// <summary>
+        /// Should the default profile inspectors be disabled to prevent editing?
+        /// </summary>
+        public static bool LockProfiles
+        {
+            get
+            {
+                // Load the preferences
+                if (!prefsLoaded)
+                {
+                    lockProfiles = EditorPrefsUtility.GetEditorPref("_LockProfiles", true);
+                    prefsLoaded = true;
+                }
+
+                return lockProfiles;
+            }
+            private set
+            {
+                lockProfiles = value;
+            }
+        }
+
+        [PreferenceItem("Mixed Reality Toolkit")]
+        private static void Preferences()
+        {
+            // Preferences GUI
+            EditorGUI.BeginChangeCheck();
+            LockProfiles = EditorGUILayout.Toggle(LockContent, LockProfiles);
+
+            // Save the preferences
+            if (EditorGUI.EndChangeCheck())
+            {
+                EditorPrefs.SetBool("_LockProfiles", LockProfiles);
+            }
+
+            if (!LockProfiles)
+            {
+                EditorGUILayout.HelpBox("This is only to be used to update the default SDK profiles. If any edits are made, and not checked into the MRTK's Github, the changes may be lost next time you update your local copy.", MessageType.Warning);
+            }
+        }
+    }
+}
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityPreferences.cs.meta b/Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityPreferences.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBoundaryVisualizationProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBoundaryVisualizationProfileInspector.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.﻿
 
+using Microsoft.MixedReality.Toolkit.Core.Definitions;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
@@ -82,6 +83,12 @@ public override void OnInspectorGUI()
                 EditorGUILayout.HelpBox("Boundary visualization is only supported in Room scale experiences.", MessageType.Warning);
             }
             EditorGUILayout.Space();
+
+            if (MixedRealityPreferences.LockProfiles && !((BaseMixedRealityProfile)target).IsCustomProfile)
+            {
+                GUI.enabled = false;
+            }
+
             serializedObject.Update();
             EditorGUILayout.PropertyField(boundaryHeight);
             EditorGUILayout.Space();
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityCameraProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityCameraProfileInspector.cs
@@ -61,6 +61,12 @@ public override void OnInspectorGUI()
             EditorGUILayout.LabelField("Camera Profile", EditorStyles.boldLabel);
             EditorGUILayout.HelpBox("The Camera Profile helps tweak camera settings no matter what platform you're building for.", MessageType.Info);
 
+
+            if (MixedRealityPreferences.LockProfiles && !((BaseMixedRealityProfile)target).IsCustomProfile)
+            {
+                GUI.enabled = false;
+            }
+
             serializedObject.Update();
 
             EditorGUILayout.Space();
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityConfigurationProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityConfigurationProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs.meta b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityGesturesProfileInspector.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputActionsProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputActionsProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityPointerProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityPointerProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityRegisteredComponentsProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityRegisteredComponentsProfileInspector.cs
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityRegisteredComponentsProfileInspector.cs.meta b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityRegisteredComponentsProfileInspector.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealitySpeechCommandsProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealitySpeechCommandsProfileInspector.cs
diff --git a/CodingGuidelines.md b/CodingGuidelines.md
