Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

updated usage of thisProfile to ThisProfile #52

Merged
merged 4 commits into from
Mar 28, 2020
Merged

updated usage of thisProfile to ThisProfile #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f179956
updated usage of thisProfile to ThisProfile
StephenHodgson Feb 18, 2020
f72697b
Merge branch 'development' into feature/configuration
StephenHodgson Mar 27, 2020
cd5e4ff
updated core package dependency
StephenHodgson Mar 27, 2020
04bf3b7
updated package info
StephenHodgson Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ality/Packages/com.xrtk.wmr/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ public override void OnInspectorGUI()
{
MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();

if (thisProfile.ParentProfile != null &&
if (ThisProfile.ParentProfile != null &&
GUILayout.Button("Back to Controller Data Providers"))
{
Selection.activeObject = thisProfile.ParentProfile;
Selection.activeObject = ThisProfile.ParentProfile;
}

EditorGUILayout.Space();
EditorGUILayout.LabelField("Windows Mixed Reality Controller Data Provider Settings", EditorStyles.boldLabel);
EditorGUILayout.HelpBox("This profile aids in configuring additional platform settings for the registered controller data provider. This can be anything from additional gestures or platform specific settings.", MessageType.Info);

thisProfile.CheckProfileLock();
ThisProfile.CheckProfileLock();

serializedObject.Update();
EditorGUILayout.Space();
Expand Down
6 changes: 3 additions & 3 deletions XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"mixed",
"reality"
],
"version": "0.1.10",
"version": "0.1.11",
"unity": "2019.1",
"license": "MIT",
"author": "XRTK Team (https://github.com/XRTK)",
"dependencies": {
"com.xrtk.core": "0.1.27",
"com.unity.xr.windowsmr.metro": "1.0.15"
"com.xrtk.core": "0.1.31",
"com.unity.xr.windowsmr.metro": "1.0.19"
}
}
6 changes: 3 additions & 3 deletions XRTK.WindowsMixedReality/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"dependencies": {
"com.unity.package-manager-ui": "2.1.2",
"com.unity.textmeshpro": "2.0.1",
"com.unity.xr.legacyinputhelpers": "2.0.6",
"com.unity.xr.legacyinputhelpers": "2.0.8",
"com.unity.xr.openvr.standalone": "1.0.5",
"com.unity.xr.windowsmr.metro": "1.0.15",
"com.xrtk.core": "0.1.27",
"com.unity.xr.windowsmr.metro": "1.0.19",
"com.xrtk.core": "0.1.31",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
Expand Down