Skip to content

Commit c47eefd

Browse files
authored
Merge pull request #104 from De-Panther/controllers_fixes
Bug fixes
2 parents 5beeca6 + cd8005c commit c47eefd

File tree

13 files changed

+64
-129
lines changed

13 files changed

+64
-129
lines changed

MainProject/ProjectSettings/XRSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
],
66
"m_SettingValues": [
77
"True",
8-
"False"
8+
"True"
99
]
1010
}

Packages/webxr-interactions/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Fixed
9+
- Material references in prefabs and sample scene.
810

911
## [0.5.0] - 2020-12-19
1012
### Added

Packages/webxr-interactions/Runtime/Materials.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.

Packages/webxr-interactions/Samples~/Desert/Materials/White.mat.meta renamed to Packages/webxr-interactions/Runtime/Materials/White.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/webxr-interactions/Runtime/Prefabs/Cube.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ MeshRenderer:
5959
m_RenderingLayerMask: 1
6060
m_RendererPriority: 0
6161
m_Materials:
62-
- {fileID: 2100000, guid: cf55eb157040bca49b365493c72ed650, type: 2}
62+
- {fileID: 2100000, guid: b7268161509fb9b41adb91ff589d9274, type: 2}
6363
m_StaticBatchInfo:
6464
firstSubMesh: 0
6565
subMeshCount: 0

Packages/webxr-interactions/Samples~/Desert/Materials/Material.mat

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

Packages/webxr-interactions/Samples~/Desert/Materials/Material.mat.meta

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

Packages/webxr-interactions/Samples~/Desert/Scenes/Desert.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3212,7 +3212,7 @@ MeshRenderer:
32123212
m_RenderingLayerMask: 1
32133213
m_RendererPriority: 0
32143214
m_Materials:
3215-
- {fileID: 2100000, guid: cf55eb157040bca49b365493c72ed650, type: 2}
3215+
- {fileID: 2100000, guid: b7268161509fb9b41adb91ff589d9274, type: 2}
32163216
m_StaticBatchInfo:
32173217
firstSubMesh: 0
32183218
subMeshCount: 0

Packages/webxr/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Fixed
9+
- WebXRController Button Up/Down state.
10+
- Protect compilation on other platforms.
811

912
## [0.5.0] - 2020-12-19
1013
### Added

0 commit comments

Comments
 (0)