Commit graph

24015 commits

Author SHA1 Message Date
Seth Alves
7220a6998a remove unneeded bind-by-ref thing from lambdas 2017-08-28 17:08:59 -07:00
Seth Alves
b9c68f9156 give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup 2017-08-28 17:01:01 -07:00
Chris Collins
d675ee9427 Merge pull request #11250 from jherico/thread_safety
Additional locking in model entities
2017-08-28 09:22:30 -07:00
Brad Davis
3ad32af975 Additional locking in model entities 2017-08-25 11:49:45 -07:00
Sam Gondelman
4e7818180b Merge branch 'master' into tabletLayer2 2017-08-24 17:56:44 -07:00
Sam Gateau
c5fbd5a2a5 Merge pull request #11131 from jherico/threaded_render_entities
Threaded rendering of Entities
2017-08-24 17:34:49 -07:00
Chris Collins
c0afda859f Merge pull request #11240 from kencooke/audio-gate-threshold
More aggressive noise gate threshold
2017-08-24 14:49:18 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Ken Cooke
684b7fee5a DC filter cutoff at 0.5Hz 2017-08-24 11:20:22 -07:00
Ken Cooke
4a253023ee float constants 2017-08-24 10:15:54 -07:00
Ken Cooke
c3ff505b73 More aggressive noise gate threshold 2017-08-24 10:06:41 -07:00
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers
EntityTreeRender uses RayPick API with precision picking
2017-08-24 08:10:21 -07:00
Chris Collins
93457c0e42 Merge pull request #11237 from birarda/feat/ip-check
add sender sock addr check to DS packet filter operator
2017-08-24 07:51:23 -07:00
Chris Collins
751440388a Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix
Bug fix for deadlock between EntitySimulation and EntityItem locks.
2017-08-23 20:50:41 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
Brad Hefta-Gaub
afce8b547a Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda
Rig: Use a registry to prevent use after free crashes/corruption
2017-08-23 15:09:28 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
Stephen Birarda
1eb7fb5b3d always write rank ID to variant when present 2017-08-21 17:15:44 -07:00
Anthony J. Thibault
da20eac995 Bug fix for deadlock between EntitySimulation and EntityItem locks.
This is a classic deadlock between the main thread and the OctreeProcessor network thread.
On the main thread, the EntitySimulation lock is taken before the EntityItem read lock is taken.
On the network thread, the EntityItem write lock is taken before the EntitySimulation lock is taken.

To work around this issue the network thread no longer takes the EntitySimulation lock when calling
PhysicalEntitySimulation::addDynamic().  Instead, a fine grained lock around the EntitySimulation's dynamic lists
is used instead.
2017-08-21 17:14:49 -07:00
Chris Collins
72bb52c7ed Merge pull request #11046 from rickdaniels/21448
Address bug #21448 "Correctly Size Bounding Boxes for Polylines"
2017-08-21 15:32:22 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2
Asynchronous Ledger Interactions with Server
2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks
Adding Blocks Tablet App to Marketplace
2017-08-18 15:06:18 -07:00
Chris Collins
2456126bcc Merge pull request #11157 from SamGondelman/tabletLayer
Render non-AA overlays correctly
2017-08-18 14:59:20 -07:00
howard-stearns
bd37679b65 working 2017-08-18 14:03:40 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks
Reduce laser pointer lag
2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
762f1a9c5c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-18 10:49:51 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
Sam Gateau
5ac65e8f35 Merge pull request #11184 from Zvork/fadeinvertfix
Fade edition bug fix
2017-08-17 15:10:50 -07:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
SamGondelman
ee74f6404e put back FilterLayeredItems to make samcake happy 2017-08-16 16:08:38 -07:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
Brad Hefta-Gaub
714027d2e2 Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
Olivier Prat
9691c957e4 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix 2017-08-16 09:41:49 +02:00
Anthony J. Thibault
aef19c6f97 Rig: Use a registry to prevent use after free crashes/corruption
Create a global registry to hold all the currently active Rig instances.
Use this registry and it's mutex to prevent accessing the rig after it has already been destroyed,
or is in the process of being destroyed on the main thread.
2017-08-15 18:28:51 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
Anthony J. Thibault
e9b8e5431d Fix for incorrectly scaled bounding volumes when switching avatars
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().

This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
2017-08-15 17:26:51 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Anthony J. Thibault
f46198c2fd Simplified/Improved avatar capsule calculation
IK is no longer performed during capsule calculation, This fixes an issue with the mannequin avatar in the marketplace.
Specifically, it was causing the hips to rise during IK which would result in an incorrectly sized and offset capsule.
2017-08-15 13:48:10 -07:00
Anthony Thibault
342f8acff5 Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision
Improve avatar hand vs body collision
2017-08-15 13:43:21 -07:00
Anthony J. Thibault
04006a9f76 code review feedback 2017-08-15 11:19:41 -07:00
Elisa Lupin-Jimenez
072f3dfb03 removed commented out code, removed blocks from default scripts 2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Sam Gateau
d624413c14 Merge pull request #11189 from SamGondelman/line3DFix
Fix drawInFront overlays only rendering in left eye
2017-08-15 09:26:18 -07:00
SamGondelman
194b7d6655 warning 2017-08-14 16:08:07 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Anthony Thibault
9af6f2683a Merge pull request #11083 from Menithal/experimental-face-expressions
Opened up setForceFaceTrackerConnected
2017-08-14 14:19:08 -07:00