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
Chris Collins
e599e13809
Merge pull request #9063 from sethalves/fix-some-crash-on-exits
...
Fix some crash on exits
2016-11-14 09:20:03 -08:00
Brad Hefta-Gaub
cc6d68ffdf
Merge pull request #8973 from humbletim/fix-batched-script-keys
...
Use matching hash keys for input/output when batch-loading scripts.
2016-11-14 08:13:32 -08:00
Brad Hefta-Gaub
dd23fcc0c9
Merge pull request #9008 from hyperlogic/feature/debug-draw-marker-color
...
Add color support to debug draw marker rendering
2016-11-14 08:12:57 -08:00
Brad Hefta-Gaub
b0fc17cbb9
Merge pull request #9060 from sethalves/fix-plugins-work-with-asan
...
fix Linux plugins when using address-sanitizer
2016-11-14 08:12:38 -08:00
Chris Collins
3d5a178a1d
Merge pull request #9064 from birarda/mod-overlay-cleanup
...
fix kick and mute overlay cleanup
2016-11-13 16:15:18 -08:00
Seth Alves
92e24e6ded
code review
2016-11-13 16:09:57 -08:00
Seth Alves
7a160ce5e8
try, try again
2016-11-13 13:39:31 -08:00
Seth Alves
645134e4b0
try, try again
2016-11-13 13:26:15 -08:00
Seth Alves
da83fd9fa4
try, try again
2016-11-13 12:56:16 -08:00
Stephen Birarda
212d518109
use for loop for kick and mute overlay cleanup
2016-11-13 12:17:12 -08:00
Seth Alves
946dc256f0
try, try again
2016-11-13 12:15:35 -08:00
Seth Alves
359f05426c
try, try again
2016-11-13 12:14:48 -08:00
Seth Alves
45bcf626aa
try, try again
2016-11-13 11:48:49 -08:00
Seth Alves
f8fb5b9709
avoid some more static/global QStrings in plugins
2016-11-13 11:29:19 -08:00
Seth Alves
9b4a8427e6
global/static QString
2016-11-13 11:09:27 -08:00
Seth Alves
9868ddd602
global/static QStrings in plugins appear to cause crashes during shutdown
2016-11-13 10:22:14 -08:00
Seth Alves
804f25740d
these qDebugs happen too late and cause a crash
2016-11-13 10:21:27 -08:00
Seth Alves
92836caf57
when creating plugins on Linux with memory-debugging enabled, use asan flags such that the shared libraries can be loaded
2016-11-12 10:01:29 -08:00
Chris Collins
0876dbc809
Merge pull request #9050 from sethalves/last-edited-by
...
lastEditedBy property for entities
2016-11-11 16:02:18 -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
Ryan Huffman
2203607044
Merge pull request #9056 from Atlante45/networking
...
Protect against empty packet lists
2016-11-11 15:28:46 -08:00
Clément Brisset
e38da75115
Merge pull request #9053 from huffman/feat/whitelist-ac-ip
...
Add AC ip address whitelist to domain server
2016-11-11 15:03:21 -08:00
Ryan Huffman
528b8e93f0
Remove extraneous logging in DomainServer for whitelist
2016-11-11 14:33:34 -08:00
Atlante45
a38846aeed
Protect against empty packet lists
2016-11-11 14:32:52 -08:00
Ryan Huffman
fc1a7255f6
Remove unneeded 'this->'
2016-11-11 14:24:28 -08:00
David Kelly
6063a63f44
cr feedback
2016-11-11 14:23:59 -08:00
Ryan Huffman
e177004d71
Fix ds not restarting when changing ac whitelist
2016-11-11 14:23:16 -08:00
Brad Hefta-Gaub
0dc7f0bf17
Merge pull request #9055 from jherico/fix_stats
...
Fix buffer count in stats display
2016-11-11 13:31:55 -08:00
Brad Davis
0aec9400c7
Fix buffer count in stats display
2016-11-11 12:54:19 -08:00
Chris Collins
b9b90cc646
Merge pull request #9047 from jherico/stutter
...
Add stutter tracking
2016-11-11 11:39:00 -08:00
Ryan Huffman
d522d03bd2
Add repeated message suppression to request assignment packets
2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4
whitespace
2016-11-11 11:24:06 -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
Ryan Huffman
969cbf4cb0
Update domain server subnet whitelist description
2016-11-11 10:46:40 -08:00
Ryan Huffman
bd1bcaf1a4
Clean up subnet whitelist implementation
2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302
Update naming for subnet whitelist in ds
2016-11-11 10:32:45 -08:00
Ryan Huffman
e1466c0d47
Fix NULL -> nullptr
2016-11-11 10:21:58 -08:00
Ryan Huffman
ca6a74d63d
Add whitelist filtering to assignment requests
2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca
Add ip address whitelist processing to domain server
2016-11-11 10:19:21 -08:00
Ryan Huffman
edb8d14507
Add ac address whitelist to domain server settings
2016-11-11 10:18:16 -08:00
Brad Davis
162f24decd
Add stutter tracking for Oculus
2016-11-11 10:12:41 -08:00
David Kelly
9c8f22e0e7
straight to audio mixer
...
since we can get the canKick there too. (doh)
2016-11-11 09:30:58 -08:00
Seth Alves
15c247fc5e
quiet warnings
2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10
Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by
2016-11-11 06:11:49 -08:00
Seth Alves
5629db9109
Merge pull request #9049 from birarda/max-min-av-scale
...
add a min/max avatar scale in domain-server settings
2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub
13b19171e7
Merge pull request #9046 from jherico/steam_i5_enable
...
Change minimum cores to 3 to enable OpenVR
2016-11-10 18:51:16 -08:00