Skip to content

Commit e98b81e

Browse files
author
Jesse McCulloch
authored
Merge pull request #2952 from samharper94/master
Fix typos in Common readme file
2 parents cf44b29 + 846674b commit e98b81e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Assets/HoloToolkit/Common/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Classes that are needed by most feature areas are in this folder.
33

44
### [Scripts](Scripts)
55
---
6-
Utilitiy Scripts.
6+
Utility Scripts.
77

88
#### [Editor](Scripts/Editor)
99
---
@@ -19,7 +19,7 @@ Base class for auto configuration build windows.
1919
Renders the UI and handles update logic for MixedRealityToolkit/Configure/Apply HoloLens Capability Settings.
2020

2121
##### EditorGUIExtensions.cs
22-
Extensions for the UnityEnditor.EditorGUI class.
22+
Extensions for the UnityEditor.EditorGUI class.
2323

2424
##### EditorGUILayoutExtensions.cs
2525
Extensions for the UnityEditor.EditorGUILayout class.
@@ -48,7 +48,7 @@ A custom shader inspector for the "MixedRealityToolkit/Standard" shader.
4848
Extensions for the action class. These methods encapsulate the null check before raising an event for an Action.
4949

5050
##### ComponentExtensions.cs
51-
Extensions methods for the Unity Component class. This also includes some component-related extensions for the GameObjet class.
51+
Extensions methods for the Unity Component class. This also includes some component-related extensions for the GameObject class.
5252

5353
##### Extensions.cs
5454
A class with general purpose extensions methods.
@@ -92,7 +92,7 @@ TODO: Remove if redundant to InterpolatedVector3.cs
9292
---
9393

9494
#### ApplicationViewManager.cs
95-
Switches app to a XAML page view, and waits for a return value from it.
95+
Switches app to a XAML page view and waits for a return value from it.
9696

9797
#### Billboard.cs
9898
Rotates a hologram so it is always facing towards the camera.
@@ -126,7 +126,7 @@ Causes a hologram to maintain a fixed angular size, which is to say it occupies
126126
Simple Behaviour which calculates the average frames per second over a number of frames and shows the FPS in a referenced Text control.
127127

128128
#### HeadsUpDirectionIndicator.cs
129-
Spawns a user specified "pointer" object and startup and alligns it to aim at a target object which keeping the pointer in view at all times.
129+
Spawns a user specified "pointer" object and startup and aligns it to aim at a target object which keeping the pointer in view at all times.
130130

131131
#### InterpolationUtilities.cs
132132
Static class containing interpolation-related utility functions.
@@ -178,7 +178,7 @@ Miscellaneous utility methods.
178178
Vector Statistics used in gaze stabilization.
179179

180180
#### WorldAnchorManager.cs
181-
Wrapper around world anchor store to streamline some of the persistence api busy work.
181+
Wrapper around world anchor store to streamline some of the persistence API busy work.
182182

183183
#### HoverLight.cs
184184
Utility component to animate and visualize a hover light that can be used with the "MixedRealityToolkit/Standard" shader "_HoverLight" feature.
@@ -206,7 +206,7 @@ Tests related to the utilities features. To use the scene:
206206
5. Click 'Build' and create an App folder. When compile is done, open the solution and deploy to device.
207207

208208
#### HeadsUpDirectionIndicator.unity
209-
This scene shows 7 marker objects with 7 HeadsUpDirectionIndicators pointing to each. Each indicator has a label that matches its corresponding marker. 6 of the marker/indicator pairs are used to test the edge cases of axis aligned markers. The 7th is an arbitrary point off of the cartesean axes. From the starting position, the user should be able to follow the direction of each indicator and arrive at the marker with the corresponding axis label. At the start, the labels should be in the following screen locations.
209+
This scene shows 7 marker objects with 7 HeadsUpDirectionIndicators pointing to each. Each indicator has a label that matches its corresponding marker. 6 of the marker/indicator pairs are used to test the edge cases of axis aligned markers. The 7th is an arbitrary point off of the Cartesian axes. From the starting position, the user should be able to follow the direction of each indicator and arrive at the marker with the corresponding axis label. At the start, the labels should be in the following screen locations.
210210

211211
- \-X at the left
212212
- +X at the right
@@ -225,4 +225,4 @@ This scene demonstrates how to use WindowOcclusion.shader. It positions a virtu
225225

226226
---
227227
##### [Go back up to the table of contents.](../../../README.md)
228-
---
228+
---

Roadmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ As needed, patch and hot fix releases will be released between the scheduled cad
3030

3131
Starting with the May 2018 release, the MRTK version numbers are adopting [Semantic versioning](https://semver.org/) rather than aligning with a specific Unity release.
3232

33-
The MRTK will use the first two version fields (2017.4) to indicate the recommended version is the Unity 2017 LTS version. The third field will indicate the MRTK revision number (ex: 2017.4.2). The fourth will always be zero (2017.4.2.0).
33+
The MRTK will use the first version field to represent the product, and should coincide with the intended Unity release (2017, 2018 etc.) Product changes may or may not contain breaking changes, but should be evaluated as high risk to update across. The second number will represent a release, which may add new features or contain breaking changes from the prior release; this should be considered a medium risk update. The third number will be revision, which should contain only bug fixes or minor changes for a release and be safe to upgrade to. The fourth will always be zero (2017.4.2.0). Be sure to always check the release notes for what has changed.
3434

3535
### Development branches
3636

0 commit comments

Comments
 (0)