Skip to content

Commit ed6929b

Browse files
author
David Kline
authored
Merge pull request #7985 from microsoft/releases/2.4.0
Merging final 2.4 doc change using admin override based on previous approvals
2 parents 5bb9d3a + 72ea542 commit ed6929b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Documentation/Authors.md

+1
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,4 @@ The Microsoft Mixed Reality Toolkit is a collaborative project containing contri
8787
- witian
8888
- wiwei
8989
- Yoyozilla
90+
- Zee2

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ MRTK-Unity is a Microsoft-driven project that provides a set of components and f
5656
| [![Progress Indicator](Documentation/Images/ProgressIndicator/MRTK_ProgressIndicator_Main.png)](Documentation/README_ProgressIndicator.md) [Progress Indicator](Documentation/README_ProgressIndicator.md) | [![Dialog](Documentation/Images/Dialog/MRTK_UX_Dialog_Main.png)](Assets/MRTK/SDK/Experimental/Dialog/README_Dialog.md) [Dialog [Experimental]](Assets/MRTK/SDK/Experimental/Dialog/README_Dialog.md) | [![Hand Coach](Documentation/Images/HandCoach/MRTK_UX_HandCoach_Main.jpg)](Assets/MRTK/SDK/Experimental/HandCoach/README_HandCoach.md) [Hand Coach [Experimental]](Assets/MRTK/SDK/Experimental/HandCoach/README_HandCoach.md) |
5757
| Visual indicator for communicating data process or operation | UI for asking for user's confirmation or acknowledgement | Component that helps guide the user when the gesture has not been taught |
5858
| [![Hand Physics Service](Documentation/Images/HandPhysics/MRTK_UX_HandPhysics_Main.jpg)](Assets/MRTK/Extensions/HandPhysicsService/README.md) [Hand Physics Service [Experimental]](Assets/MRTK/Extensions/HandPhysicsService/README.md) | [![Scrolling Collection](Documentation/Images/ScrollingCollection/MRTK_UX_ScrollingCollection_Main.jpg)](Assets/MRTK/SDK/Experimental/ScrollingObjectCollection/README.md) [Scrolling Collection [Experimental]](Assets/MRTK/SDK/Experimental/ScrollingObjectCollection/README.md) | [![Dock](Documentation/Images/Dock/MRTK_UX_Dock_Main.png)](Assets/MRTK/SDK/Experimental/Dock/README_Dock.md) [Dock [Experimental]](Assets/MRTK/SDK/Experimental/Dock/README_Dock.md) |
59-
| Visual indicator for communicating data process or operation | UI for asking for user's confirmation or acknowledgement | Component that helps guide the user when the gesture has not been taught |
59+
| The hand physics service enables rigid body collision events and interactions with articulated hands | An Object Collection that natively scrolls 3D objects | The Dock allows objects to be moved in and out of predetermined positions |
6060
| [![Eye Tracking: Target Selection](Documentation/Images/EyeTracking/mrtk_et_targetselect.png)](Documentation/EyeTracking/EyeTracking_TargetSelection.md) [Eye Tracking: Target Selection](Documentation/EyeTracking/EyeTracking_TargetSelection.md) | [![Eye Tracking: Navigation](Documentation/Images/EyeTracking/mrtk_et_navigation.png)](Documentation/EyeTracking/EyeTracking_Navigation.md) [Eye Tracking: Navigation](Documentation/EyeTracking/EyeTracking_Navigation.md) | [![Eye Tracking: Heat Map](Documentation/Images/EyeTracking/mrtk_et_heatmaps.png)](Documentation/EyeTracking/EyeTracking_ExamplesOverview.md#visualization-of-visual-attention) [Eye Tracking: Heat Map](Documentation/EyeTracking/EyeTracking_ExamplesOverview.md#visualization-of-visual-attention) |
6161
| Combine eyes, voice and hand input to quickly and effortlessly select holograms across your scene | Learn how to auto-scroll text or fluently zoom into focused content based on what you are looking at | Examples for logging, loading and visualizing what users have been looking at in your app |
6262

0 commit comments

Comments
 (0)