Commit graph

3371 commits

Author SHA1 Message Date
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Simon Walton
e22e0ecb04
Merge branch 'master' into avatar-mixer-improvements 2018-10-24 10:39:23 -09:00
Simon Walton
0a78eeaf1a Merge branch 'master' into avatar-mixer-improvements 2018-10-23 15:56:56 -07:00
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
Stephen Birarda
b789fa96f8
Merge pull request #14192 from Atlante45/fix/traits-race
Prevent race on internal client traits members
2018-10-23 14:53:11 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
Ken Cooke
f68a8d7379
Merge pull request #14037 from birarda/bug/agent-flush-encoder
fix agent audio packet send when encoder is flushed
2018-10-19 20:53:52 -07:00
Brad Hefta-Gaub
3fab542009
Merge pull request #14170 from Atlante45/fix/invisible-agents
Fix non-avatar agents appearing as avatars
2018-10-19 16:36:51 -07:00
Kerry Ivan Kurian
77b6389671 Correct location of dependency 2018-10-18 12:38:18 -07:00
Kerry Ivan Kurian
8b922ad7cc Add missing dependency 2018-10-18 11:07:45 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Simon Walton
0b77eb5e9c Control UUID inclusion in avatar data with new param
Increase estimate of avatars to be sent; remove start/end segment
in avatar identity writes.
2018-10-16 14:25:38 -07:00
Clement
1bcbda7ad6 Prevent race on internal client traits members 2018-10-11 16:16:24 -07:00
Zach Fox
7de784ce27 First steps (definitely not working) 2018-10-10 12:32:55 -07:00
Seth Alves
de8ae9156c fix build on clang 7 2018-10-09 12:25:01 -07:00
Clement
8e625e9a89 Don't have the mixer treat non-avatar agent as avatars 2018-10-08 17:35:37 -07:00
Clement
9011a9da36 Don't send trait data if agent is not an avatar 2018-10-08 17:35:37 -07:00
Simon Walton
6f659db3b5 Merge branch 'master' into avatar-mixer-improvements 2018-10-08 15:18:29 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Clement
1997191e77 Fix MSVC warnings 2018-10-01 10:49:04 -07:00
Simon Walton
756d1a6fc4 Fix another bind-to-temporary 2018-09-29 21:15:10 -07:00
Simon Walton
18c1371321 Process multiple avatars in an AvatarIdentity message 2018-09-28 17:53:06 -07:00
Clement
585c278400 streamline mix operation 2018-09-28 15:45:56 -07:00
Stephen Birarda
b18d8e2254 pull out removal and adding of streams to sep functions 2018-09-28 15:00:52 -07:00
Stephen Birarda
7e4cfd3c78 fix for injected audio going to unreachable 2018-09-28 14:54:50 -07:00
Stephen Birarda
b7c6fa003d guard against incorrectly sized AudioStreamStats from packet 2018-09-28 14:54:50 -07:00
Stephen Birarda
2ac1445683 remove double scoping of the frame check timer 2018-09-28 14:54:50 -07:00
Stephen Birarda
aea9775e4d get back to ideal frame time when slow 2018-09-28 14:54:50 -07:00
Stephen Birarda
925c39cbd3 split sleep timing from check time timing 2018-09-28 14:54:50 -07:00
Stephen Birarda
996e033dee add stats for skipped streams 2018-09-28 14:54:50 -07:00
Stephen Birarda
6750d4a370 move buffer popping to packet processing 2018-09-28 14:54:50 -07:00
Stephen Birarda
7d8b15ed75 move valid position check to packet processing 2018-09-28 14:54:50 -07:00
Stephen Birarda
371de312cc enumerate a vector of mixable streams for each listener 2018-09-28 14:54:50 -07:00
Stephen Birarda
c992150c10 change stream HRTF map to use a vector 2018-09-28 14:54:50 -07:00
Stephen Birarda
bcba2a1cf1 use local ID for stream hash 2018-09-28 14:54:50 -07:00
Clement
d15ef295cf Replace AudioZones lookup with vectors and indexes 2018-09-28 14:54:50 -07:00
Stephen Birarda
09cfe4dbc1 use a vector for audio streams 2018-09-28 14:54:50 -07:00
Stephen Birarda
aed79b3b17 use a vector for ignored node IDs 2018-09-28 14:54:49 -07:00
Simon Walton
7a0043c010 Send AvatarIdentity in NLPacketList; be more selective 2018-09-28 11:01:41 -07:00
Simon Walton
13890f1d16 Use local ID in place of UUID in a couple more cases 2018-09-26 09:47:26 -07:00
Simon Walton
f95ab1b040 Clean-up & other small changes 2018-09-25 12:07:59 -07:00
Simon Walton
07bdaeede7 Split avatar joint-data across multiple packets if necessary 2018-09-24 18:23:49 -07:00
Simon Walton
f2e69d5c81 Make default bubble-box AvatarData property for efficiency
Also a use of getClientGlobalPosition(), etc
2018-09-20 17:37:39 -07:00
Stephen Birarda
5c4f6c741c fix agent audio packet send when encoder is flushed 2018-09-20 11:55:55 -07:00