Skip to content

Commit 49a37a9

Browse files
authored
Merge branch 'main' into added-handletype-translation2d
2 parents 9ed906e + 0ab1671 commit 49a37a9

File tree

146 files changed

+2081
-915
lines changed

Some content is hidden

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

146 files changed

+2081
-915
lines changed

.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-

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ This project welcomes contributions, suggestions, and feedback. All contribution
66

77
Contributors must abide by the Mixed Reality Toolkit Organization's [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), and observe the following procedures:
88

9+
* [Project Tenets](contributions/project-tenets.md)
910
* [Code Contributions](contributions/code-contributions.md)
1011
* [Opening and Assessing Issues](contributions/opening-and-assessing-issues.md)
1112
* [Approving Pull Requests](contributions/merging-pull-requests.md)
-10.1 MB
Binary file not shown.
-49.8 KB
Binary file not shown.
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.

0 commit comments

Comments
 (0)