Skip to content

Commit 1a87466

Browse files
Merge branch 'main' into feature/translation-593
Signed-off-by: David Kline <13281406+david-c-kline@users.noreply.github.com>
2 parents 16396ff + 2eb4ab3 commit 1a87466

25 files changed

Lines changed: 87 additions & 81 deletions

File tree

Images/MRTK_Unity_header.png

350 KB
Loading

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Mixed Reality Toolkit for Unity
22

3-
![Mixed Reality Toolkit](https://user-images.githubusercontent.com/13754172/122838732-89ea3400-d2ab-11eb-8c79-32dd84944989.png)
3+
![Mixed Reality Toolkit](./Images/MRTK_Unity_header.png)
44

55
![MRTK3 Banner](./Images/MRTK3_banner.png)
66

UnityProjects/MRTKDevTemplate/Assets/StreamingAssets.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityProjects/MRTKDevTemplate/Assets/StreamingAssets/Spaces.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
20.2 KB
Loading

UnityProjects/MRTKDevTemplate/Assets/StreamingAssets/Spaces/cover_image_small.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

org.mixedrealitytoolkit.core/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
1010

1111
### Fixed
1212

13+
* Fixed broken project validation help link, for item 'MRTK3 profile may need to be assigned for the Standalone build target' (Issue #882) [PR#886 (https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/886)]
14+
15+
## [3.2.2-development] - 2024-06-13
16+
17+
### Fixed
18+
1319
* Fixed UPM package validation so that it ignores errors caused when the test runner is not part of the MRTK publisher account. [PR #775](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/775/)
1420

1521
## [3.2.1] - 2024-04-24

org.mixedrealitytoolkit.core/Editor/EditorProjectUtilities.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,14 @@ static EditorProjectUtilities()
3838
public static void CheckMinimumEditorVersion()
3939
{
4040
#if !UNITY_2021_3_OR_NEWER
41-
DisplayIncorrectEditorVersionDialog();
42-
#endif
43-
}
44-
45-
/// <summary>
46-
/// Displays a message indicating that a project was loaded in an unsupported version of Unity and allows the user
47-
/// to continue or exit.
48-
/// </summary>
49-
private static void DisplayIncorrectEditorVersionDialog()
50-
{
5141
if (!EditorUtility.DisplayDialog(
5242
"Mixed Reality Toolkit",
5343
"The Mixed Reality Toolkit requires Unity 2021.3 or newer.\n\nUsing an older version of Unity may result in compile-time errors or incorrect behavior.",
5444
"Continue", "Close Editor"))
5545
{
5646
EditorApplication.Exit(0);
5747
}
48+
#endif
5849
}
5950
}
6051
}

org.mixedrealitytoolkit.core/Editor/MRTKProjectValidation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private static BuildValidationRule GenerateProfileRule(BuildTargetGroup buildTar
130130
AssetDatabase.LoadAssetAtPath<MRTKProfile>(AssetDatabase.GUIDToAssetPath(DefaultMRTKProfileGuid))),
131131
FixItMessage = $"Assign the default MRTK3 profile for the {buildTargetGroup} build target",
132132
Error = false,
133-
HelpLink = "https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/mrtk3-overview/setup#4-configure-mrtk-profile-after-import"
133+
HelpLink = "https://learn.microsoft.com/windows/mixed-reality/mrtk-unity/mrtk3-overview/getting-started/setting-up/setup-new-project#4-configure-mrtk-profile-after-import"
134134
};
135135
}
136136

org.mixedrealitytoolkit.core/Utilities/Extensions/TransformExtensions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ public static T FindAncestorComponent<T>(this Transform startTransform, bool inc
131131
{
132132
foreach (Transform transform in startTransform.EnumerateAncestors(includeSelf))
133133
{
134-
T component = transform.GetComponent<T>();
135-
if (component != null)
134+
if (transform.TryGetComponent(out T component))
136135
{
137136
return component;
138137
}

0 commit comments

Comments
 (0)