David Rowe
7a36e4eed8
Fix keyboard focus when switch highlight between overlays and entities
2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f
Fix Web overlay x, y coordinate calcs
2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced
First pass at controller interaction with 3D Web overlay
2016-12-20 07:42:21 -08:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Philip Rosedale
14c867fdbd
Can't resize if objects in both hands, avatar resize is seek + grips
2016-12-14 13:38:37 -08:00
Philip Rosedale
9370c8af6b
Added ability to rescale avatar
2016-12-12 15:26:53 -08:00
Philip Rosedale
a142c830fa
Merge branch 'master' of git://github.com/highfidelity/hifi into rescale
2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09
Both grip buttons enable rescale for a held object
2016-12-12 09:39:32 -08:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Ryan Huffman
996d3f5875
Merge pull request #9135 from druiz17/nearGrab
...
Fixed pressing the grip button causes a near grabbed object to drop
2016-12-05 11:07:15 -08:00
Dante Ruiz
08301d488d
clean up
2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f
better solution
2016-12-05 18:08:36 +00:00
Seth Alves
24e54f25bf
Merge pull request #9108 from PhilipRosedale/drifting
...
Grab.js weaker at a distance
2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5
Fix indents
2016-12-01 12:54:38 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Dante Ruiz
1b24d373d2
fixed near grab issue
2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083
grip button fix
2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86
Merge pull request #9054 from howard-stearns/third-person-lasers
...
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -08:00
Philip Rosedale
664b54c004
remove whitespace
2016-11-22 10:27:27 -08:00
Philip Rosedale
c1e044364f
Added distance attentuation of linear and angular rate
2016-11-22 10:24:02 -08:00
Anthony J. Thibault
270adfe692
removed debug prints
2016-11-17 11:40:05 -08:00
Anthony J. Thibault
38ac6fff03
Hand Controller rendering is camera relative
...
Basically, when using the third person camera in HMD mode. If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.
To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.
These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.
These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
2016-11-17 11:33:12 -08:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
Philip Rosedale
981f505a9c
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-14 14:26:45 -08:00
howard-stearns
e2fded846f
make hand-controller ui work in third person
2016-11-11 11:10:42 -08:00
Philip Rosedale
c0b1392685
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-10 13:41:13 -08:00
Dante Ruiz
e22c36b4b7
fixed menu pop up delay
2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
Dante Ruiz
1a83cc2c3e
fixed deleted comment
2016-11-02 00:12:23 +01:00
Dante Ruiz
d29b1c34b1
fixed coding standard conflicts
2016-11-02 00:07:58 +01:00
Dante Ruiz
e9d10b609d
removed bad commit
2016-11-02 00:05:38 +01:00
Dante Ruiz
86abd9120e
Fixed menu out of view with HMD and Xbox controller
2016-11-01 14:30:48 -07:00
Ryan Huffman
d933155c71
Fix trigger highlight configuration
2016-10-27 20:16:34 -07:00
Ryan Huffman
69e7dababc
Collapse multiline dict to one line in controllerDisplay
2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380
Remove annotation API from controller display
2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f
Update controller tips and trigger highlight in tutorial
2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5
Add more debug to tutorial, new firecrackers, and adjust fuse
2016-10-27 14:58:20 -07:00
Andrew Meadows
38e4ac0ae9
Merge master into out-of-body-experience
2016-10-26 16:59:31 -07:00
Ryan Downe Karpf
7a4302057a
Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip
...
Update vive controller display to not hide on equip
2016-10-25 13:16:31 -07:00
Ryan Huffman
af749605ea
Update vive controller display to not hide on equip
2016-10-25 08:27:20 -07:00
Brad Hefta-Gaub
ed4279783d
CR feedback
2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
76ca3aa546
fix residual head laser
2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub
779f326452
cleanup
2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e
gak
2016-10-24 14:47:10 -07:00
Andrew Meadows
ccc6f8eee2
fix teleport.js to work for out-of-body
2016-10-24 08:36:51 -07:00
Andrew Meadows
51a9a99381
Merge hifi/master into hifi/out-of-body-experience
2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub
0f8967970a
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 08:11:31 -07:00
