Commit graph

1107 commits

Author SHA1 Message Date
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
howard-stearns
47bef18bd4 show the hand controllers when in third-person+hmd, but currently, they're
at avatar hands instead of physical hand, which is not what we want!
2016-11-14 13:05:35 -08:00
howard-stearns
06a6da3931 Merge branch 'master' of https://github.com/highfidelity/hifi into third-person-lasers 2016-11-14 09:58:54 -08:00
Stephen Birarda
212d518109 use for loop for kick and mute overlay cleanup 2016-11-13 12:17:12 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226
Add ability to mute user
2016-11-11 16:02:08 -08:00
David Kelly
3d7e075897 Added mute to mod.js script 2016-11-11 11:18:24 -08:00
howard-stearns
e2fded846f make hand-controller ui work in third person 2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub
a90a0fe8ba Merge pull request #8976 from druiz17/FixMenuOutOfView
Fixed menu out of view with HMD and Xbox controller
2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub
f55b660820 Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser
Fix users.js maximize button unclickable with hand controllers
2016-11-10 17:53:17 -08:00
howard-stearns
8299e23cc3 diable some viewpoint menu options when in hmd. 2016-11-10 15:15:11 -08:00
humbletim
35f857ef9d inhibit user interactions when window is disabled 2016-11-09 13:21:24 -05:00
Ryan Huffman
5dab2ac2a7 Add margin to left and right side of users.js 2016-11-08 09:47:09 -08:00
Ryan Huffman
284b458148 Increase margin at bottom of users.js 2016-11-08 09:46:47 -08:00
Seth Alves
42d13f7e77 Merge pull request #9024 from huffman/fix/userdata-showing-old-data
Fix userData in edit.js sometimes showing wrong value when locked
2016-11-07 13:37:03 -08:00
Ryan Huffman
c4f35bf7bf Fix userData in edit.js sometimes showing wrong value when locked 2016-11-07 11:39:36 -08:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
David Rowe
852218815b Display "content loading" while there are pending GPU texture transfers 2016-11-07 13:40:49 +13:00
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar
centered toolbar
2016-11-03 14:18:32 -07:00
howard-stearns
8eb6699420 help script 2016-11-02 16:50:37 -07:00
Seth Alves
d0c0cdd82f polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again 2016-11-02 16:31:34 -07: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
David Kelly
a8832fafeb Merge pull request #8934 from howard-stearns/more-reliable-crowds
More reliable crowds
2016-10-28 16:17:35 -07:00
Brad Hefta-Gaub
dc836cbefc Merge pull request #8949 from ctrlaltdavid/21090
Fix comment typo
2016-10-28 13:29:47 -07:00
David Rowe
9a79345493 Fix comment typo 2016-10-29 09:04:50 +13:00
howard-stearns
a64a1e2ee0 update agent script reference 2016-10-28 10:20:29 -07:00
howard-stearns
3d8bf7f11c Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-28 10:18:46 -07:00
Ryan Huffman
b8cf4e9c0e Merge pull request #8943 from ctrlaltdavid/21090
QA READY: Revise loading progress bar
2016-10-28 08:24:40 -07:00
David Rowe
b548e6441c Animate progress bar without regard for amount of content left to load 2016-10-28 18:57:54 +13:00
David Rowe
610159fcbe Improve bar for 4K displays 2016-10-28 18:20:33 +13:00
David Rowe
73b2bc433d Improve bar positions 2016-10-28 18:03:13 +13:00
Stephen Birarda
c41af25776 Merge pull request #8939 from huffman/fix/tutorial-fixes
Tutorial fixes
2016-10-27 21:43:55 -07:00
Ryan Huffman
d933155c71 Fix trigger highlight configuration 2016-10-27 20:16:34 -07:00
David Rowe
edc9b1fa07 Update bar graph for desktop and HMD displays 2016-10-28 15:50:50 +13:00
David Rowe
c9e4fddeab Remove background image 2016-10-28 14:17:18 +13:00
David Rowe
0824142987 Add "loading" text 2016-10-28 14:12:24 +13:00
David Rowe
4befab1151 JSLint progress bar code 2016-10-28 11:34:00 +13: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
howard-stearns
59630f8eca Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-27 12:32:46 -07:00
howard-stearns
1efef36e03 spread out the start/stop of crowds, and allow control over how many are
listening
2016-10-27 12:31:36 -07:00
howard-stearns
237870d7c4 spread out the start and stop of crowds 2016-10-27 12:31:10 -07:00
howard-stearns
d69ea6b252 allow crowd-agent STOP command to take a delay time before it acts 2016-10-27 12:29:04 -07:00
Ryan Huffman
1782f97dbd Fix away.js not unsubscribing on shutdown 2016-10-27 11:12:46 -07:00
Ryan Huffman
a801832a55 Fix away.js allowing any user to disable away.js 2016-10-27 11:12:31 -07:00
Howard Stearns
047b02141f Merge pull request #8908 from howard-stearns/improve-domain-check
Improve domain check
2016-10-25 19:45:37 -07:00