David Rowe 407ce745d5 Merge branch 'master' into M22075 ... # Conflicts: # libraries/controllers/src/controllers/Actions.cpp		2019-04-27 10:51:13 +12:00
..
OpenVrDisplayPlugin.cpp	wip redo stencil work	2019-04-11 13:22:51 -07:00
OpenVrDisplayPlugin.h	wip redo stencil work	2019-04-11 13:22:51 -07:00
OpenVrHelpers.cpp	cleaned up the button event code for the proximity sensor button	2018-12-19 14:21:14 -08:00
OpenVrHelpers.h	added auto switch to vive, checking for the proximity button on vive, to do: make sure ik is off for the head when in desktop mode.	2018-12-18 18:53:48 -08:00
OpenVrProvider.cpp	Additional plugin debugging, better plugin resource cleanup	2016-10-11 19:40:02 -07:00
plugin.json	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
ViveControllerManager.cpp	Controller JSDoc update	2019-04-10 08:51:14 +12:00
ViveControllerManager.h	Added DropAfterDelay strategy to Vive Tracker Calibration Dialog	2018-12-03 18:56:45 -08:00