David Rowe
404deba78d
Adjust avatar thumb root joint angle to look better
2015-12-05 16:26:21 +13:00
David Rowe
560b9f012f
Get hand positioning and orientation working again
2015-12-05 16:25:28 +13:00
Clément Brisset
2ace061893
Merge pull request #6564 from sethalves/fix-line-overlays
...
fix 3d line overlays
2015-12-04 17:38:15 -08:00
Clément Brisset
3c83f1be8b
Merge pull request #6566 from sethalves/fix-avatar-mixer-parents-crash
...
fix avatar-mixer parents-related crash
2015-12-04 17:03:15 -08:00
Seth Alves
f9d8793bab
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-04 16:46:05 -08:00
Seth Alves
7448d9f262
Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters
...
Make Avatar::getJointRotation and getJointTranslation thread-safe
2015-12-04 16:45:56 -08:00
Seth Alves
62b4eac875
fix avatar-mixer parents-related crash
2015-12-04 16:41:56 -08:00
Seth Alves
3828a72dc0
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-04 16:17:49 -08:00
Anthony J. Thibault
7abfc93ff9
Avatar::getJointRotation and getJointTranslation is thread-safe
...
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
2015-12-04 16:16:17 -08:00
Seth Alves
817f0307a0
fix 3d line overlays
2015-12-04 15:51:19 -08:00
Brad Hefta-Gaub
5bbff7534d
Merge pull request #6560 from birarda/log-handler-crash
...
don't stop a non-started timer, debug cleanup
2015-12-04 15:46:51 -08:00
Brad Hefta-Gaub
2c2813e06e
Merge pull request #6563 from howard-stearns/fix-present-rate
...
Fix present rate stats display
2015-12-04 15:27:45 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
1eb5b21e48
fix warning
2015-12-04 15:17:16 -08:00
Anthony J. Thibault
ba001ef4b0
Rig: split Poses into internal and external sets.
...
In preparation for making some accessors thread safe.
2015-12-04 15:15:18 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Brad Hefta-Gaub
2a243ccd17
Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux
2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
be4bc7b2ca
going a different way, same packet version, but always send feature requests to old servers
2015-12-04 14:55:16 -08:00
Philip Rosedale
06c8235b19
Merge pull request #6544 from sethalves/distance-grab-adjustment
...
distance-hold adjustment
2015-12-04 14:34:10 -08:00
Brad Hefta-Gaub
7faf9c2f22
bump protocol version
2015-12-04 14:33:45 -08:00
Brad Hefta-Gaub
46946212cf
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
2015-12-04 14:24:31 -08:00
Stephen Birarda
ad4f818b21
only attempt to stop QTimer if active
2015-12-04 14:12:41 -08:00
Seth Alves
f940a5c1c5
Merge branch 'distance-grab-adjustment' of github.com:sethalves/hifi into parents
2015-12-04 14:11:58 -08:00
Brad Hefta-Gaub
f44a9daa21
remove WANT_DELTA from OctreeQuery
2015-12-04 14:04:57 -08:00
Stephen Birarda
d2fdf6a04b
Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash
2015-12-04 13:55:57 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Hefta-Gaub
0d9d5375c7
remove optional WANT_COMPRESSION from OctreeQuery
2015-12-04 13:29:18 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Ryan Downe Karpf
950d020d77
Merge pull request #6553 from ericrius1/noBlockCollisions
...
Blocks dont collide when held
2015-12-04 11:59:39 -08:00
Stephen Birarda
165db97cb2
cleanup double reset debug on assignment-client restart
2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1
Merge pull request #6559 from birarda/log-handler-crash
...
reset the NodeList on its own thread
2015-12-04 11:44:06 -08:00
ericrius1
3bb1dedaf9
fixed syntax error
2015-12-04 11:41:23 -08:00
Brad Hefta-Gaub
79d60f74ba
Merge pull request #6558 from sethalves/parents
...
fix an AC race/crash
2015-12-04 11:40:21 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Anthony Thibault
3118634df0
Merge pull request #6547 from howard-stearns/fix-anim-graph-preference-change
...
Fix anim graph preference change
2015-12-04 11:25:50 -08:00
Brad Hefta-Gaub
0ad4efeeb9
Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item
...
Remove unimplemented collision menu items
2015-12-04 11:25:08 -08:00
Brad Hefta-Gaub
15c4dbfb11
Merge pull request #6554 from Atlante45/warnings
...
Last of the OpenGL warnings on OS X
2015-12-04 11:24:28 -08:00
Stephen Birarda
d5f79b84fc
make the NodeList reset a blocking queued connection
2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f
make sure the NodeList is reset on its own thread
2015-12-04 11:18:46 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Seth Alves
ea65ef964f
fix an AC race/crash
2015-12-04 11:13:36 -08:00
Brad Hefta-Gaub
4452f03cfa
Merge pull request #6557 from birarda/parents-crash
...
Fix crash in QTimer::stop for node keepalive timer
2015-12-04 11:12:45 -08:00
Howard Stearns
a0a4f7d177
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-anim-graph-preference-change
2015-12-04 11:08:44 -08:00
Stephen Birarda
ca84fcd7f4
parent the keepalive timer to the NL thread
2015-12-04 11:01:18 -08:00
Howard Stearns
cb67f05103
Remove unimplemented menu items Developer->Avatar->Show Skeleton/Head Collision Shapes.
2015-12-04 10:47:27 -08:00
Seth Alves
4246672813
enable head-moving of distance grabbing
2015-12-04 10:38:24 -08:00
Atlante45
528a17422d
Last of the OpenGL warnings on OS X
2015-12-04 10:33:10 -08:00
Brad Davis
90ef7c6bf7
Disabling 0.5 Oculus plugin (Mac / Linux) for now
2015-12-04 10:28:20 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
