Skip to content

Commit 1c461d4

Browse files
keveleighkeveleigh
authored
Merge branch 'main' into feature/translation-593
Signed-off-by: Kurtis <3580640+keveleigh@users.noreply.github.com>
2 parents 7214335 + 0ab1671 commit 1c461d4

125 files changed

Lines changed: 1935 additions & 844 deletions

File tree

Some content is hidden

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

‎.github/workflows/issue_labeler.yaml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.github/workflows/pr_labeler.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ jobs:
1414
- uses: actions/github-script@v6
1515
with:
1616
script: |
17-
if (context.payload.pull_request.base.ref == 'mrtk3')
17+
if (context.payload.pull_request.base.ref == 'feature/XRI3')
1818
{
1919
github.rest.issues.addLabels({
2020
issue_number: context.issue.number,
2121
owner: context.repo.owner,
2222
repo: context.repo.repo,
23-
labels: ['MRTK3']
23+
labels: ['Branch: feature/XRI3']
2424
})
2525
}
2626
27-
// When we switch the repo to MRTK3, we'll have to edit this.
27+
// When we switch the repo to XRI3, we'll have to edit this.
2828
if (context.payload.pull_request.base.ref == 'main')
2929
{
3030
github.rest.issues.addLabels({
3131
issue_number: context.issue.number,
3232
owner: context.repo.owner,
3333
repo: context.repo.repo,
34-
labels: ['MRTK2']
34+
labels: ['Branch: main']
3535
})
36-
}
36+
}

‎.github/workflows/validation_mrtk3.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
name: Code Validation (MRTK3)
1+
name: Code Validation
22

33
on:
44
push:
5-
branches: ["mrtk3"]
5+
branches:
6+
- main
7+
- 'feature/*'
68
pull_request:
7-
branches: ["mrtk3"]
89

910
jobs:
1011
validation:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ doc/
5858
# Other files #
5959
# =========== #
6060
.DS_Store
61+
.utmp/
6162

6263
# ================================#
6364
# MRTK2 for branch switching ease #

‎CODEOWNERS‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,29 @@
2323
* @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
2424

2525
# Build / CI Pipeline
26-
/Pipelines/ @shaynie @amollis @keveleigh
26+
/Pipelines/ @keveleigh
2727

2828
# Tooling
29-
/Tooling/ @shaynie @amollis @keveleigh @david-c-kline
29+
/Tooling/ @keveleigh
3030

3131
# Feature packages
32-
/org.mixedrealitytoolkit.accessibility/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
33-
/org.mixedrealitytoolkit.audio/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
34-
/org.mixedrealitytoolkit.core/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
35-
/org.mixedrealitytoolkit.data/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
36-
/org.mixedrealitytoolkit.diagnostics/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
37-
/org.mixedrealitytoolkit.input/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
38-
/org.mixedrealitytoolkit.spatialmanipulation/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
39-
/org.mixedrealitytoolkit.tools/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
40-
/org.mixedrealitytoolkit.uxcomponents/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
41-
/org.mixedrealitytoolkit.uxcore/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
42-
/org.mixedrealitytoolkit.windowsspeech/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
32+
/org.mixedrealitytoolkit.accessibility/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
33+
/org.mixedrealitytoolkit.audio/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
34+
/org.mixedrealitytoolkit.core/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
35+
/org.mixedrealitytoolkit.data/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
36+
/org.mixedrealitytoolkit.diagnostics/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
37+
/org.mixedrealitytoolkit.input/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
38+
/org.mixedrealitytoolkit.spatialmanipulation/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
39+
/org.mixedrealitytoolkit.tools/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
40+
/org.mixedrealitytoolkit.uxcomponents/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
41+
/org.mixedrealitytoolkit.uxcore/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
42+
/org.mixedrealitytoolkit.windowsspeech/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
4343

4444
# Examples and templates
45-
/UnityProjects/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
45+
/UnityProjects/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
4646

4747
# Goverance documents (Must include Maintainers)
4848
CODEOWNERS @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
4949
CONTRIBUTING.md @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
5050
MAINTAINERS.md @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
5151
GOVERNANCE.md @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
52-

‎ExternalDependencies/com.microsoft.mixedreality.openxr-1.10.0.tgz‎

-10.1 MB
Binary file not shown.

‎ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.4.tgz‎

-49.8 KB
Binary file not shown.

‎ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.55.tgz‎

-79.3 MB
Binary file not shown.

‎GOVERNANCE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
This document provides the governance policy for the Mixed Reality Toolkit for Unity Project. Maintainers agree to this policy and to abide by all Project polices, including the [code of conduct](../org-docs/CODE-OF-CONDUCT.md), [trademark policy](../org-docs/TRADEMARKS.md), and [antitrust policy](../org-docs/ANTITRUST.md) by adding their name to the [MAINTAINERS.md](./MAINTAINERS.md) file.
44

5+
All projects under the Mixed Reality Toolkit organization are governed by the Steering Committee. The Steering Committee is responsible for all technical oversight, project approval and oversight, policy oversight, and trademark management for the Organization. To learn more about the Steering Committee, visit this link: https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/CHARTER.md
6+
57
## 1. Roles
68

79
This project may include the following roles. Additional roles may be adopted and documented by the Project.

‎MAINTAINERS.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
This document lists the Maintainers of the Mixed Reality Toolkit for Unity Project. Maintainers may be added once approved by the existing maintainers as described in the [Governance document](./GOVERNANCE.md). By adding your name to this list you are agreeing to abide by the Project governance documents and to abide by all of the Organization's polices, including the [code of conduct](https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/CODE-OF-CONDUCT.md), [trademark policy](https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/TRADEMARKS.md), [antitrust policy](https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/ANTITRUST.md), and the project's [contributing guidelines](./CONTRIBUTING.md). If you are participating because of your affiliation with another organization (designated below), you represent that you have the authority to bind that organization to these policies.
44

5-
| Name | Alias | Affiliated Organization |
6-
|-------------------|---------------|---------------------------------|
7-
| Adam Mollis | AMollis | Microsoft |
8-
| Scott Haynie | SHaynie | Microsoft |
9-
| Griff Hazen | GHazen-ML | Magic Leap |
10-
| Wyck Hebert | whebertML | Magic Leap |
11-
| Dave Kline | david-c-kline | Qualcomm |
12-
| Kurtis Eveleigh | keveleigh | Qualcomm |
13-
| Max Palmer | MaxPalmer-UH | Ultraleap |
14-
| Rob Blenkinsopp | rblenkinsopp | Ultraleap |
5+
| Name | Alias | Affiliated Organization |
6+
|-------------------|-----------------|---------------------------------|
7+
| Jackie Curley | jackiecurley | Microsoft |
8+
| Chris Oje | whitetigerhelix | Microsoft |
9+
| Griff Hazen | GHazen-ML | Magic Leap |
10+
| Wyck Hebert | whebertML | Magic Leap |
11+
| Kurtis Eveleigh | keveleigh | Qualcomm |
12+
| Max Palmer | MaxPalmer-UH | Ultraleap |
13+
| Rob Blenkinsopp | rblenkinsopp | Ultraleap |
1514

1615
---
1716
Part of MVG-0.1-beta.

0 commit comments

Comments
 (0)