Commit graph

3474 commits

Author SHA1 Message Date
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
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