Brad Hefta-Gaub
1a28732b64
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
...
Conflicts:
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
Anthony J. Thibault
55c062098a
Adjustment to position and visibility of grab sphere.
...
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99
Adjust size and offset of grab balls to better align with hand controllers.
...
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -07:00
Brad Hefta-Gaub
c082c74cc0
use head pose for controller in case there are no hand controllers available
2016-10-18 10:01:00 -07:00
howard-stearns
140caf84d8
never interact with hud elements while holding something
2016-10-14 18:30:52 -07:00
Brad Hefta-Gaub
93d9cf7917
adjust grab indicators
2016-10-11 12:42:26 -07:00
Seth Alves
9e99cc1f78
fix mod.js
2016-09-08 07:35:52 -07:00
Seth Alves
746d0cd91c
get various hand lasers to all line up with grab-point sphere
2016-09-07 16:10:37 -07:00
