Stephen Birarda
4fcccb5455
check for release of equip in this.nearGrabbing
2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16
return after release, duh
2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf
always unequip on secondary release
2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc
add special equip for oculus style grab
2016-12-20 14:21:23 -08:00
Philip Rosedale
13e03b35cc
removed initial delay for seek beams
2016-12-20 14:11:52 -08:00
Philip Rosedale
250d071788
grip squeezes fingers too
2016-12-20 14:11:45 -08:00
Philip Rosedale
938734d3fc
Grip controllers can grab objects, slight delay on search beam
2016-12-20 14:11:33 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Ryan Huffman
9730d07f59
Cleanup tutorial scripts
2016-12-16 16:01:44 -08:00
Ryan Huffman
46d8130782
Cleanup variable naming in touch controller config
2016-12-16 16:01:26 -08:00
Ryan Huffman
009c982cdf
Cleanup implementation of touch controller config
2016-12-16 15:05:17 -08:00
Ryan Huffman
19a3fdcc01
Update Touch controller configuration
2016-12-16 15:05:17 -08:00
Ryan Huffman
f7ebda6931
Fix positioning of Oculus Touch controller visual
2016-12-16 15:05:17 -08:00
Ryan Huffman
b599ccea9e
Remove cache buster from touchControllerConfiguration
2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1
Fix oculus touch labels in tutorial
2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a
Update oculus touch labels to be emissive
2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8
Fix emissive channel on touch models
2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086
Fix right touch joystick
2016-12-16 15:05:17 -08:00
Ryan Huffman
2b88935812
Reenable disabling of hand controllers
2016-12-16 15:05:17 -08:00
Ryan Huffman
6fb39080e2
Update controller display to support non-string hardware resolution
2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5
Add touch controller support to ControllerDisplay
2016-12-16 15:05:17 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13: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
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13: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
David Rowe
e956608fa4
Fix keyboard focus when switch highlight between overlays and entities
2016-12-09 18:31:52 +13:00
David Rowe
7d8926c802
Fix Web overlay x, y coordinate calcs
2016-12-09 17:00:00 +13:00
David Rowe
4c236b293e
First pass at controller interaction with 3D Web overlay
2016-12-09 01:47:40 +13: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
