Commit graph

3504 commits

Author SHA1 Message Date
Simon Walton
236c61dae5 Add ModelCache singleton & other requirements for resource handling
Cherry-pick of 6b5598bdc5e562119c55 from 79-HERO.
2019-03-07 17:39:41 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
cca36e4a89 Merge commit '135c7b667eb126bcc4ebab948fa7450327209ae8' 2019-03-05 15:09:56 -08:00
Roxanne Skelly
d0ecc6d792 Merge commit '16eb3444c11c6513ff0d8a1d73a50c9856bf432b' 2019-03-05 15:09:20 -08:00
Roxanne Skelly
38981a5f25 Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36' 2019-03-05 15:08:39 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Simon Walton
743d1a58e2 Style tweaks from review 2019-03-05 09:34:29 -08:00
Simon Walton
122b62a5b8 Remove some debug output 2019-03-04 17:32:18 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero)
Also tweaks from original reviewer comments.
2019-03-01 17:25:46 -08:00
Simon Walton
3cc932db96 More debugging for hero issues 2019-03-01 12:43:39 -08:00
Clement
135c7b667e Reduce size of _nodeMutex critical sections 2019-03-01 11:23:46 -08:00
Simon Walton
d391d4af38 Debugging + tweaks 2019-03-01 10:08:22 -08:00
Simon Walton
64a2025bcd Renaming in main loop to make source/destination clear
Also comment clean-up, etc
2019-02-28 18:40:53 -08:00
Clement
991bcfe2b2 Remove dead code 2019-02-28 18:00:21 -08:00
Simon Walton
5a8ecdffab EntityStats can have embedded EntityData 2019-02-28 17:37:56 -08:00
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
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
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