Commit graph

1311 commits

Author SHA1 Message Date
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Dante Ruiz
f6ba264de6 avatar recording fix 2017-06-28 16:22:28 +01:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
Stephen Birarda
ccbae07170 rename _sequenceNumber to _lastSequenceNumber 2017-06-22 11:23:58 -07:00
Stephen Birarda
42cceb02a4 push sequence number when managing identity data for agent 2017-06-22 11:10:43 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
Ryan Huffman
0e7ddfd29f Disable silence/ban buttons in PAL if avatar is replicated 2017-06-21 09:49:16 -07:00
Ryan Huffman
8ce1474d9a Add isReplicated to avatar identity data 2017-06-21 09:48:34 -07:00
Stephen Birarda
e6ef153148 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants 2017-06-15 15:43:13 -07:00
Stephen Birarda
8f154321a4 never process null avatar ID in avatar manager 2017-06-15 14:25:10 -07:00
Stephen Birarda
6cf4ff1daf remove debug and fix peek of session ID 2017-06-15 13:44:44 -07:00
Stephen Birarda
bfa5df778d remove avatar entity data debug 2017-06-14 14:59:49 -07:00
Stephen Birarda
e3c3831efa only output sequence number information if debug is requested 2017-06-14 14:56:15 -07:00
Stephen Birarda
5b45beaa39 cleanup some debug from identity packet changes 2017-06-14 14:51:28 -07:00
Stephen Birarda
f2a61fa59d change incoming/outgoing seq num handling 2017-06-14 14:41:25 -07:00
Stephen Birarda
ddb6db9f6a fix repeated pushing of avatar identity seq nums 2017-06-14 14:31:22 -07:00
Stephen Birarda
50b56ec761 don't unpack avatar identity that is old 2017-06-14 14:02:22 -07:00
howard-stearns
2deb26551f typos in comments/help-strings 2017-06-14 11:56:47 -07:00
howard-stearns
6271b8ee7c avatar whitelist 2017-06-13 16:56:18 -07:00
Seth Alves
9fcc1e15b8 remove some cruft 2017-06-05 15:52:47 -07:00
samcake
257813ec38 comment the code 2017-06-01 09:19:02 -07:00
Sam Cake
03fdc1396c Fixing the warnings 2017-05-31 23:20:10 -07:00
David Rowe
3aebe96afe Merge branch 'master' into 21359 2017-05-19 09:03:11 +12:00
David Rowe
f6c1fa4213 Merge branch 'master' into 21359 2017-05-18 16:40:20 +12:00
David Rowe
26e390fa89 Tidy code setting head orientation 2017-05-18 13:55:06 +12:00
David Rowe
223b1a858b Fix avatar eye look-at in recording playback 2017-05-18 12:27:31 +12:00
Howard Stearns
95111d24b2 Merge branch 'master' into dk/sequenceNumberForAvatarIdentity 2017-05-17 17:09:47 -07:00
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
2017-05-17 16:22:06 -07:00
David Kelly
057718bde3 remove clockSkew, reference new version for Avatar packets 2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad Switch from timestamp to sequence id for avatar identity 2017-05-17 14:22:36 -07:00
Zach Fox
d4752926b8 First pass - checking performance 2017-05-17 13:51:27 -07:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
Feature/snap turn smoothing 21270
2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
David Rowe
7897bf8aa8 Fix display name not getting cleared 2017-05-17 08:17:55 +12:00
David Rowe
733b0feabd Fix attachment data not getting cleared 2017-05-17 08:17:33 +12:00
Zach Fox
bc1e97032a Thanks to Andrew! 2017-05-15 17:39:19 -07:00
Zach Fox
64ae5119ae Merge pull request #10462 from zfox23/fixIdentityUpdatedAt
Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs
2017-05-15 15:44:26 -07:00
Zach Fox
e492ca9364 Improve the test - thanks Dave! 2017-05-15 14:55:05 -07:00
Zach Fox
a2a24b22a8 Force _identityUpdatedAt to stay above 0 2017-05-15 14:25:47 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
cleanup Head::simulate() code
2017-05-15 11:21:43 -07:00
Zach Fox
9289cd2022 Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder
Fix the PAL not showing user info for user who opened PAL
2017-05-11 15:16:05 -07:00
Andrew Meadows
04827c3a2a use const auto& where appropritate 2017-05-11 14:51:52 -07:00
Andrew Meadows
f4df223d23 cleanup Head::simulation() code 2017-05-11 14:46:00 -07:00
Zach Fox
15574f509e Clarifying comments 2017-05-11 11:45:07 -07:00
David Rowe
e426d70437 Improve variable name 2017-05-11 18:37:23 +12:00
David Rowe
98b943269b Sum of blendshapes is used sent through avatar mixer 2017-05-11 18:17:35 +12:00
David Rowe
21f9594f81 Sum of blendshapes is used for recording 2017-05-11 18:17:12 +12:00
David Rowe
3b06b03e01 Rename blendshapes variables in preparation for repurposing 2017-05-11 16:46:36 +12:00
Zach Fox
ae983658be Finally, the actual fix? 2017-05-10 15:59:19 -07:00