Skip to content

Commit e62ad77

Browse files
authored
Merge branch 'main' into various-test-improvements
2 parents 53eb983 + 5b9fdef commit e62ad77

File tree

21 files changed

+73
-47
lines changed

21 files changed

+73
-47
lines changed

Pipelines/Scripts/update-versions.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ Get-ChildItem -Path $PackagesRoot -Filter "package.json" -Recurse | ForEach-Obje
158158

159159
# Update the CHANGELOG.md file with the new version and release date
160160
Write-Output "Patching CHANGELOG.md version to [$version$tag] - $year-$month-$day"
161+
$escapedVersion = [regex]::Escape($version)
161162
Get-ChildItem -Path $packagePath/CHANGELOG.md -Recurse | ForEach-Object {
162-
(Get-Content -Path $_ -Raw) -Replace "## \[$version(-[a-zA-Z0-9.]+)?\] - \b\d{4}\b-\b(0[1-9]|1[0-2])\b-\b(0[1-9]|[12][0-9]|3[01])\b", "## [$version$tag] - $year-$month-$day" | Set-Content -Path $_ -NoNewline
163+
(Get-Content -Path $_ -Raw) -Replace "## (\[$escapedVersion(-[a-zA-Z0-9.]+)?\] - \b\d{4}\b-\b(0[1-9]|1[0-2])\b-\b(0[1-9]|[12][0-9]|3[01])\b|Unreleased)", "## [$version$tag] - $year-$month-$day" | Set-Content -Path $_ -NoNewline
163164
}
164165
}
165166

org.mixedrealitytoolkit.audio/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5-
## Unreleased
5+
## [3.0.5] - 2025-11-12
66

77
### Fixed
88

org.mixedrealitytoolkit.core/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5-
## Unreleased
5+
## [3.3.0] - 2025-11-12
66

77
### Changed
88

org.mixedrealitytoolkit.diagnostics/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5-
## Unreleased
5+
## [3.0.3] - 2025-11-12
66

77
### Fixed
88

org.mixedrealitytoolkit.extendedassets/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5-
## Unreleased
5+
## [3.0.4] - 2025-11-12
66

77
### Fixed
88

org.mixedrealitytoolkit.input/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5-
## Unreleased
5+
## [3.3.0] - 2025-11-12
66

77
### Added
88

org.mixedrealitytoolkit.input/MRTK.Input.asmdef

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
"expression": "6.11",
4141
"define": "GLTFAST_6_11_OR_NEWER"
4242
},
43+
{
44+
"name": "com.unity.cloud.gltfast",
45+
"expression": "5",
46+
"define": "GLTFAST_5_0_OR_NEWER"
47+
},
4348
{
4449
"name": "com.atteneder.gltfast",
4550
"expression": "",

org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace MixedReality.Toolkit.SpatialManipulation
1212
/// A reticle used to visualize spatial manipulation capabilities when hovering over a bounding box handle.
1313
/// The reticle is oriented in relation to the bounding box, to indicate the direction for rotation or scaling.
1414
/// </summary>
15+
[AddComponentMenu("MRTK/Spatial Manipulation/Spatial Manipulation Reticle")]
1516
public class SpatialManipulationReticle : MonoBehaviour, IReticleVisual
1617
{
1718
/// <summary>
@@ -113,7 +114,7 @@ private void RotateReticle(Vector3 reticleNormal, Transform hitTargetTransform)
113114
}
114115
default: break;
115116
}
116-
117+
117118
// Cache the world rotation
118119
worldRotationCache = transform.rotation;
119120
}

org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5-
## Unreleased
5+
## [3.4.0] - 2025-11-12
66

77
### Added
88

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
1818
* Fixed issues with HandConstraint hand tracking events not being fired (OnFirstHandDetected/OnHandActivate/OnLastHandLost/OnHandDeactivate) when SolverHandler TrackedHand is set to Right or Left (not Both) [PR #956](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/956)
1919
* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054)
2020
* org.mixedrealitytoolkit.core 3.2.2
21+
* Fixed `Constraint Manager` not properly highlighting custom constraints via the "Go to component" button. [PR #1078](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1078)
2122

2223
## [3.3.0] - 2024-04-30
2324

org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedDistanceConstraint.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace MixedReality.Toolkit.SpatialManipulation
1313
/// MRTK's constraint system might be redesigned in the near future. When
1414
/// this occurs, the old constraint components will be deprecated.
1515
/// </remarks>
16+
[AddComponentMenu("MRTK/Spatial Manipulation/Fixed Distance Constraint")]
1617
public class FixedDistanceConstraint : TransformConstraint
1718
{
1819
#region Properties

0 commit comments

Comments
 (0)