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

Dev/shuffle #73

Merged
merged 52 commits into from
Apr 27, 2020
Merged

Dev/shuffle #73

merged 52 commits into from
Apr 27, 2020

Conversation

StephenHodgson
Copy link
Contributor

@StephenHodgson StephenHodgson commented Apr 26, 2020

StephenHodgson and others added 30 commits April 6, 2020 13:35
# Conflicts:
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityController.cs
fixed naming for controller definition
StephenHodgson and others added 20 commits April 14, 2020 10:47
* Update indent levels for WMR settings

* Cache GUIContent
# Conflicts:
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityController.cs
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityController.cs.meta
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityMotionController.cs
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityMotionController.cs.meta
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/Providers/SpatialAwarenessSystem/SpatialObservers/WindowsMixedRealityControllerDataProviderProfileInspector.cs
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Profiles/WindowsMixedRealityControllerDataProviderProfile.cs
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/InputSystem/Controllers/WindowsMixedRealityMotionController.cs
#	XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/InputSystem/Controllers/WindowsMixedRealityMotionController.cs.meta
@StephenHodgson StephenHodgson added the Ready for review PR finished primary development, open for review label Apr 27, 2020
@StephenHodgson StephenHodgson merged commit a754b10 into development Apr 27, 2020
@StephenHodgson StephenHodgson deleted the dev/shuffle branch April 27, 2020 06:38
XRTK-Build-Bot pushed a commit that referenced this pull request Dec 25, 2020
* updated wmr controller data provider

* removed commented out class

* added controller data provider reference to the controller

* updated references

* fixed references

* Added default controller definitions

* updated the controller data provider inspector

fixed naming for controller definition

* updated hand data provider profile inspector

* removed redundant inspector

* cleaned up the controller interaction mappings a bit

* updated references

* updated controller instance creation

* added default constructor

* updated TryRenderController method

* removed asset menu

* fixed compiler error

* Remove obsolete SetupDefaultIntreactions (#65)

* updated reference

* added WMR Camera Data Provider

* updated WMR Camera Data Provider

* updated camera rig reference

* updated icon

* moved WMR Camera data provider into correct file location

* updated data provider constructors

* added service parent reference

* Change requests for controller provider inspectors (#67)

* Update indent levels for WMR settings

* Cache GUIContent

* Added rig reset override

* reverted changes

* removed unused reference

* added camera profile

* Updated windows controller type name to get the controller textures to show up correctly based on the type name

* fixed reference to renamed controller class

* fixed more type references

* Shuffled stuff to conform to package manager layout

* updated editor namespaces

* moved platform asemdef

Co-authored-by: Dino Fejzagic <dino.f@live.de>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Ready for review PR finished primary development, open for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants