Commit graph

3545 commits

Author SHA1 Message Date
Atlante45
9fe7a3350c Fix windows compile error 2019-02-28 15:06:26 -08:00
Roxanne Skelly
1e1437aab7 Merge branch 'v0.79.HERO-rc' of https://github.com/highfidelity/hifi into 79-hero-avmixer-stress 2019-02-28 12:13:17 -08:00
Clement
717c12fe16 Add new connection rate limitting
Limit rate of connection for new Agents
2019-02-27 18:22:49 -08:00
Simon Walton
041a561dbc Handcraft the JSON filter-object rather than parse a string 2019-02-27 17:27:25 -08:00
Simon Walton
17c0e40347 Add ability to filter on zone-type with JSON filter 2019-02-27 16:42:36 -08:00
Simon Walton
fede8d0525 Minor clean-up 2019-02-27 15:37:11 -08:00
Roxanne Skelly
6df28da0a5 Fix Avatar Mixer divide by zero error in stats reporting
Under load, the frame count may not be updated between
stats reports, causing the diff between frame counts to
be zero, resulting in divide by zero errors.
2019-02-27 14:13:18 -08:00
Simon Walton
13cda8d212 Use separate priority-queues for hero & other avatars 2019-02-27 13:14:08 -08:00
Simon Walton
167ddbecff Use session display-name for debugging 2019-02-26 18:35:01 -08:00
Simon Walton
08d6a2ce7f Avatar Hero debugging & logging 2019-02-26 16:40:16 -08:00
David Rowe
e79594ef53 Fill in and tidy Avatar JSDoc 2019-02-27 09:53:11 +13:00
David Rowe
0c59f983da Agent JSDoc tidying 2019-02-27 09:34:05 +13:00
Simon Walton
0b080471ff Filter on scriptValue to reduce EntityItem load; bump ping timeouts for testing 2019-02-26 10:57:35 -08:00
Simon Walton
a8dd7b7e1f Fix gcc error about defining templates outside their namespace
Also warning about hiding virtual function.
2019-02-25 17:14:22 -08:00
Simon Walton
e5091e7f59 Fixes for EntityItem contains test, add MixerAvatar class and use in sort 2019-02-25 15:44:52 -08:00
Simon Walton
16bc667b95 Looks like serialization order must be same a flag enum order!?
Also resuscitate EntityItem debug dumps.
2019-02-22 18:17:30 -08:00
David Rowe
7f1ae63439 Revise current Avatar API JSDoc 2019-02-21 14:30:38 +13:00
David Rowe
01119a5b5d Fill in Agent API JSDoc 2019-02-21 11:19:29 +13:00
David Rowe
f58a5db0b0 Reorganize JSDoc inheritance for MyAvatar and Avatar 2019-02-19 09:47:51 +13:00
David Rowe
50a1e07ed2 Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc 2019-02-18 18:32:49 +13:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Andrew Meadows
b94655260d don't traverse for fullUpdate on changed view 2019-02-14 14:54:10 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
2019-02-13 17:26:57 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
Howard Stearns
175fbecdc6
Merge pull request #14837 from SimonWalton-HiFi/display-name-suffixes
Assign lowest available suffix when display-names collide
2019-02-08 14:54:43 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Clement
5945823606 Honor full scene resends 2019-02-05 17:03:19 -08:00
Simon Walton
322030fccd Remove unused variable; fix use of qCDebug 2019-01-31 16:07:26 -08:00
Simon Walton
d0fb09a3bd Assign lowest available suffix when display-names collide 2019-01-31 14:58:58 -08:00
Clement
283dabc622 Fix reload mechanic for entity server scripts 2019-01-30 17:29:28 -08:00
Clement
b09a939066 Fix reload mechanic for entity server scripts 2019-01-30 17:28:47 -08:00
Antonina Savinova
5d49a3f6df
Merge pull request #14732 from kencooke/audio-distattn-improvements
Bug fixes and improvements to audio distance attenuation
2019-01-29 14:02:29 -08:00
Simon Walton
74748b15fd Add a filter functor to the plugin manager and use it in AudioMixer 2019-01-23 17:28:18 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Clement
74b83d9961 Add ESS to the Agent's node interest set 2019-01-17 15:23:40 -08:00
Ken Cooke
3ffaced0f3 Experimental attenuation curve: linear falloff, with prescribed propagation limit.
A positive coefficient sets logarithmic falloff, as before.
A negative coefficient sets linear falloff, where abs(coefficient) is the distance limit in meters.
2019-01-17 13:59:33 -08:00
Ken Cooke
7cade1e354 Clamp attenuation zone coefficients to a more reasonable limit of -60dB per doubling of distance 2019-01-16 12:16:20 -08:00
Clement
8480624797 Limit upstream data to avatar mixer 2019-01-15 14:18:53 -08:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
Roxanne Skelly
69af0ea0ee CR Fix 2019-01-11 17:52:47 -08:00
Roxanne Skelly
fca15c1362 CR Fix 2019-01-11 17:13:32 -08:00
Roxanne Skelly
cd6495286d More code review changes 2019-01-11 16:49:04 -08:00
Roxanne Skelly
d3528ba289 Code review changes 2019-01-11 16:33:23 -08:00
Roxanne Skelly
2566f633f3 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-11 14:56:05 -08:00
Roxanne Skelly
4ed5f642ed Case20615 - Changing Avatars doesn't update to everyone intermittently
There were two problems:
1) If an update to a trait (simple or instance) was not sent because
there was an outstanding (unacked) message, it would not be resent
until a new trait was updated.  Expected - it should be sent when the
ack for the outstanding packet is received.

2) Trait versions were improperly being set to zero (the default)
when an ack is received.
2019-01-11 14:51:44 -08:00
Seth Alves
2ef47304ba
Merge pull request #14558 from AndrewMeadows/faster-avatar-entities
case 20020: faster avatar entities
2019-01-11 14:13:05 -08:00
Roxanne Skelly
df97ca57b4 Bulk Avatar Traits related ack data was not reset when avatars were
ignored, etc.
2019-01-10 12:04:48 -08:00
Andrew Meadows
9ea6968e35 fix bug where attached AvatarEntities do not update in timely fashion 2019-01-09 17:40:18 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
a4be4fb6c0 MyAvatar.setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
9f404ef006 Agent bots can manipulate AvatarEntities again 2019-01-09 17:28:00 -08:00
Simon Walton
1245abbb53
Merge branch 'master' into avatar-mixer-entities-stats 2019-01-09 16:07:26 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377
Trait-level flow control
2019-01-09 15:57:13 -08:00
Simon Walton
5bcdf143b9 Add per-destination-avatar traits-rate stats 2019-01-09 13:45:07 -08:00
John Conklin II
100c88e800
Merge pull request #14669 from kencooke/audio-mixer-mastergain-solo-fix
Apply master volume to audio streams when solo is active
2019-01-09 12:03:02 -08:00
Simon Walton
cb6b86a236 Tweak web display 2019-01-09 09:36:17 -08:00
Simon Walton
73d688610f Track stats for total AvatarData bytes, traits bytes and identity bytes 2019-01-08 18:33:00 -08:00
Roxanne Skelly
910c359443 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-08 10:50:45 -08:00
Roxanne Skelly
0297d337d5 Add some comments as per CR request 2019-01-08 10:50:16 -08:00
Ken Cooke
963269f3f6 Apply master volume to audio streams when solo is active 2019-01-08 10:50:11 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones
Case 15518: shaped zones
2019-01-08 09:06:45 -08:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
Roxanne Skelly
9e887585fa Bad write length calculation was causing faults. 2019-01-05 13:49:33 -08:00
Clement
cfbb4e29d1 Only keep aggregated thread stats 2019-01-04 14:51:58 -08:00
Roxanne Skelly
4f9cce1ea9 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-04 13:46:45 -08:00
Andrew Meadows
3303bb7017 EntityServer now depends on ModelFormatRegistry 2019-01-04 12:38:32 -08:00
Andrew Meadows
a8325b5c00 add ZoneEntityItem::contains() and support for shapes 2019-01-04 12:37:23 -08:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats
Fix network stats to use low-level values
2019-01-03 16:54:03 -08:00
Ken Cooke
4c502cdbc9 Revert to simpler approximation for stream sorting 2019-01-03 15:17:41 -08:00
Ken Cooke
53dece5451 Clamp near-field distance attenuation to max gain 2019-01-03 14:50:44 -08:00
Ken Cooke
5148b60c73 Parameterize distance attenuation by reference distance (where gain = unity) 2019-01-03 14:43:15 -08:00
Roxanne Skelly
2b1547b9fa Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-03 13:39:19 -08:00
Roxanne Skelly
443b54d931 comment and naming cleanup 2019-01-03 11:25:39 -08:00
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Clement
c5b60594b6 Record more detailed stats on Retransmit/duplicate 2019-01-03 10:04:38 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Roxanne Skelly
3d8a323fae Remove unused variable 2019-01-02 14:17:06 -08:00
Jeff Clinton
d5ef7ba175
Merge pull request #14610 from roxanneskelly/Case20106
Case 20106-AC agents spawned with -n don't come back
2019-01-02 11:07:40 -08:00
Roxanne Skelly
2e457e2212 Checkpoint trait flow control 2019-01-01 20:50:46 -08:00
Roxanne Skelly
c9e6d2711d Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2018-12-28 10:33:12 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics
(case 20297) Move graphics preparation from Serializers to runtime preparation step
2018-12-27 15:46:21 -08:00
Roxanne Skelly
da70271acf Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits 2018-12-26 13:46:08 -08:00
Roxanne Skelly
3a282045ff Checkpoint trait-level flow control 2018-12-21 15:48:58 -08:00
Roxanne Skelly
eaeb111bf1 Fix Typo 2018-12-18 16:50:30 -08:00
Roxanne Skelly
4c1ba8b1aa Case 20106-AC agents spawned with -n don't come back
with the expected amount after a domain restart

They were being incorrectly marked as 'unassigned' in the
assignment client monitor.
2018-12-18 16:33:13 -08:00
Zach Fox
f31d685323
Fix spacing 2018-12-18 14:33:41 -08:00
Zach Fox
fce4c252e7 Merge branch 'master' of github.com:highfidelity/hifi into MS20089_interruptRecording 2018-12-18 10:31:32 -08:00
Zach Fox
2964a05bd3 Keep playing the recording visually 2018-12-18 10:30:20 -08:00
Zach Fox
240917e8ae Fix MS20089: Enable interrupting of avatar recordings with sounds 2018-12-17 15:46:08 -08:00
David Kelly
2b21ceb17a Agent needs to be sure audio is ready before trying to use it 2018-12-13 17:41:12 -08:00
sabrina-shanman
7c0f921eed Add shaders to assignment-client makefile to fix linker error 2018-12-13 11:16:03 -08:00
Zach Fox
4e7b7346dc Fix a bug introduced in PR14566, actually fixing MS17811 2018-12-13 10:06:46 -08:00
Zach Fox
d46b8d6471 Fix MS17811: Prevent frozen avatars in certain ignore cases 2018-12-11 14:52:11 -08:00
Howard Stearns
42799817a1
Merge pull request #14552 from SimonWalton-HiFi/agent-large-avatar-packets
Pass on dropFaceTracking flag in ScriptableAvatar::toByteArrayStateful()
2018-12-10 10:37:15 -08:00
Simon Walton
0d419d4dcf Pass on dropFaceTracking flag in ScriptableAvatar::toByteArrayStateful() 2018-12-06 17:16:15 -08:00
Simon Walton
e03104cad5 Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
2018-12-05 17:58:38 -08:00
Simon Walton
16144b6630 Move the previously deleted FST reader down to the ScriptableAvatar class 2018-12-05 17:14:40 -08:00
Antonina Savinova
2dcfea5f7c
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak
Fix minor avatar-mixer memory leaks
2018-12-05 10:29:29 -08:00
Simon Walton
eb097af796 Remove all .fst downloads from AvatarData and its derived classes 2018-12-03 17:42:39 -08:00