merged latest mrtk_development, resolved toc.yml conflict

Author: radicalad

.gitignore

@@ -67,6 +67,7 @@ Assets/TextMesh Pro/
 Assets/StreamingAssets/GltfModels/
 Assets/StreamingAssets/GltfModels.meta
 Assets/StreamingAssets.meta
+Assets/MixedRealityToolkit.Generated/*
 
 /mrtk_log_mostRecentET.csv
 

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Profiles/EyeTrackingDemoCameraProfile.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   isCustomProfile: 1
   targetExperienceScale: 4
   enableCameraSystem: 1
-  cameraProfile: {fileID: 11400000, guid: de38e71178510674fae830377a72888a, type: 2}
+  cameraProfile: {fileID: 11400000, guid: 0447581e7bd59f64fbb28151c65a3dc4, type: 2}
   cameraSystemType:
     reference: Microsoft.MixedReality.Toolkit.CameraSystem.MixedRealityCameraSystem,
       Microsoft.MixedReality.Toolkit.Services.CameraSystem
@@ -48,3 +48,4 @@ MonoBehaviour:
   registeredServiceProvidersProfile: {fileID: 11400000, guid: ac2fb1c077158d74dba65bebd28ce63f,
     type: 2}
   useServiceInspectors: 0
+  renderDepthBuffer: 0

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Profiles/EyeTrackingDemoConfigurationProfile.asset

@@ -1307,7 +1307,7 @@ MonoBehaviour:
     > Display Settings > Visible Material.
 
 
-    MRTK_ArticulatedHandMesh.mat should be assigned in the ArticulatedHandMesh.prefab
+    MRTK_ArticulatedHandMeshPulse.mat should be assigned in the ArticulatedHandMesh.prefab
     under Input > Hand Tracking > Hand Mesh Prefab
 
 
@@ -1359,7 +1359,7 @@ MonoBehaviour:
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
-  m_firstOverflowCharacterIndex: 169
+  m_firstOverflowCharacterIndex: 174
   m_linkedTextComponent: {fileID: 0}
   m_isLinkedTextComponent: 0
   m_isTextTruncated: 0
@@ -1383,7 +1383,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: -40.90899, w: -7.350438}
   m_textInfo:
     textComponent: {fileID: 1336990317}
-    characterCount: 246
+    characterCount: 251
     spriteCount: 0
     spaceCount: 33
     wordCount: 30

Assets/MixedRealityToolkit.Examples/Experimental/PulseShader/Scenes/PulseShaderExamples.unity

@@ -0,0 +1,18 @@
+{
+    "name": "Microsoft.MixedReality.Toolkit.Extensions.Tracking.Editor",
+    "references": [
+        "Microsoft.MixedReality.Toolkit",
+        "Microsoft.MixedReality.Toolkit.Editor.ServiceInspectors",
+        "Microsoft.MixedReality.Toolkit.Extensions.Tracking"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}