Skip to content

Commit 895c408

Browse files
Merge pull request #4130 from Microsoft/prerelease/2.0.0.rc1.refresh_stabilization
Bring the RC1 Refresh payload into mrtk_release
2 parents 4506767 + 6a2bffb commit 895c408

File tree

533 files changed

+23055
-4557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+23055
-4557
lines changed

.github/pull_request_template.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1-
Overview
2-
---
1+
## Overview
32

43

5-
Changes
6-
---
4+
## Changes
75
- Fixes: # .
6+
7+
8+
## Verification
9+
> This optional section is a place where you can detail the specific type of verification
10+
> you want from reviewers. For example, if you want reviewers to checkout the PR locally
11+
> and validate the functionality of specific scenarios, provide instructions
12+
> on the specific scenarios and what you want verified.
13+
>
14+
> If there are specific areas of concern or question feel free to highlight them here so
15+
> that reviewers can watch out for those issues.
16+
>
17+
> As a reviewer, it is possible to check out this change locally by using the following
18+
> commands (substituting {PR_ID} with the ID of this pull request):
19+
>
20+
> git fetch origin pull/{PR_ID}/head:name_of_local_branch
21+
>
22+
> git checkout name_of_local_branch

Assets/MixedRealityToolkit.Examples/Demos/Audio/Scripts/LoFiFilterSelection.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ public void OnPointerClicked(MixedRealityPointerEventData eventData)
8484
public void OnPointerDown(MixedRealityPointerEventData eventData)
8585
{ }
8686

87+
/// <summary>
88+
/// This script does not handle pointer dragged events.
89+
/// </summary>
90+
public void OnPointerDragged(MixedRealityPointerEventData eventData) { }
91+
8792
/// <summary>
8893
/// This script does not handle pointer up events.
8994
/// </summary>

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_BasicSetup/Scripts/ColorTap.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData even
5353
}
5454
}
5555

56+
void IMixedRealityPointerHandler.OnPointerDragged(MixedRealityPointerEventData eventData) { }
57+
5658
void IMixedRealityPointerHandler.OnPointerClicked(MixedRealityPointerEventData eventData) { }
5759
}
5860
}

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/BaseClasses/PanZoomBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
54
using Microsoft.MixedReality.Toolkit.Input;
65
using Microsoft.MixedReality.Toolkit.Utilities;
76
using System.Collections;
@@ -548,6 +547,8 @@ void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData even
548547
isZooming = true;
549548
}
550549

550+
void IMixedRealityPointerHandler.OnPointerDragged(MixedRealityPointerEventData eventData) { }
551+
551552
void IMixedRealityPointerHandler.OnPointerClicked(MixedRealityPointerEventData eventData) { }
552553

553554
void IMixedRealityFocusHandler.OnFocusEnter(FocusEventData eventData)

0 commit comments

Comments
 (0)