David Rowe cddb054066 Merge branch 'master' into vr-edit-h ... # Conflicts: # libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp # scripts/system/controllers/handControllerGrab.js		2017-08-20 18:41:29 +12:00
..
controllerDisplay.js	Cleanup variable naming in touch controller config	2016-12-20 07:45:35 -08:00
controllerDisplayManager.js	Cleanup implementation of touch controller config	2016-12-20 07:45:35 -08:00
controllerScripts.js	Load controller scripts in their own script engine	2017-03-15 14:31:13 +13:00
godView.js	restore old camera state	2017-07-06 10:41:46 -07:00
grab.js	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
handControllerGrab.js	Merge branch 'master' into vr-edit-h	2017-08-20 18:41:29 +12:00
handControllerPointer.js	script fixes	2017-08-09 11:56:25 -07:00
squeezeHands.js	Finger now points when near tablet + deadspot added when touching the tablet	2017-03-08 19:03:56 -08:00
teleport.js	merge from master	2017-08-04 12:17:54 -07:00
toggleAdvancedMovementForHandControllers.js	use the correct property name for useAdvancedMovementControls	2017-03-15 10:34:43 -07:00
touchControllerConfiguration.js	Fix right touch controller tip labels not showing up	2016-12-20 18:01:53 -08:00
viveControllerConfiguration.js	Update controller display to support non-string hardware resolution	2016-12-20 07:45:35 -08:00