Simon Walton
e4f6f2cb14
Fetch avatars' fst files
2019-04-03 17:43:22 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements
...
Avatar hero zone improvements
2019-03-29 10:49:06 -07:00
John Conklin II
56dde6e240
Merge pull request #15235 from Atlante45/fix/traits
...
Case 21108: Make traits easier to extend
2019-03-29 10:37:55 -07:00
Ken Cooke
201d115cb6
Merge pull request #15274 from kencooke/audio-server-echo-fix
...
Case 21947: Fix the audio level of server echo
2019-03-29 10:12:37 -07:00
Simon Walton
bc7fb10ab9
Fixes from review
2019-03-28 17:54:35 -07:00
Clement
3221e1dbd5
Simplify packing/unpacking for easier extension
2019-03-27 15:44:32 -07:00
Ken Cooke
abb0a166b1
Merge pull request #15260 from kencooke/audio-mixer-volume-control
...
Case 21902: System-wide independent volume controls
2019-03-27 13:19:30 -07:00
Simon Walton
e62270fccf
Fixes for inline jsdoc
2019-03-27 12:00:30 -07:00
Ken Cooke
dae69ea4cd
Ensure server echo always has unity gain
2019-03-27 10:58:52 -07:00
Simon Walton
6b21fc1af7
Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements
...
Fix jsdoc conflict, also minor clean-up.
2019-03-27 10:54:49 -07:00
Simon Walton
b8f79d3364
Guard against Node linked-data being null
2019-03-26 17:41:22 -07:00
Simon Walton
da6ca38282
Revert to using avatar's _globalPosition for zone membership
...
According to Tony this should be the hip position, i.e.
a joint pos in T-pose, not neccesarily OK root. Also
SpatiallyNestable::WorldPos may depend on parent entity
and so not known by mixer.
2019-03-26 10:48:59 -07:00
Simon Walton
c4fd58eb3e
Merge remote-tracking branch 'origin/avatar-hero-zone-improvements' into avatar-hero-zone-improvements
2019-03-25 15:43:06 -07:00
Simon Walton
46f897b693
Better estimate of avatar centre for zone membership
2019-03-25 15:42:30 -07:00
David Rowe
cf4370ed3a
Merge branch 'master' into M21222
2019-03-26 09:44:48 +13:00
David Rowe
b78ae80ae6
Address review comments and add further examples
2019-03-26 09:40:47 +13:00
Simon Walton
8872e9e4e7
Remove unused debugging variable
2019-03-23 20:05:26 -09:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control
2019-03-23 16:15:29 -07:00
Ken Cooke
e671a124c3
Cleanup
2019-03-22 17:58:17 -07:00
Simon Walton
137c25f907
Use a 1 m offset for position test; call-out nonavatars in stats web page
2019-03-22 15:40:13 -07:00
Simon Walton
a1660dad95
Follow dynamic updates to hero zones; make reserved fraction a domain setting
2019-03-22 12:30:49 -07:00
Simon Walton
775eddc265
Agent requires the ModelCache singleton for zone entities w/ meshes
2019-03-19 16:16:53 -07:00
Ken Cooke
a5a305f181
Handle InjectorGainSet packet at the audio-mixer
2019-03-15 12:05:51 -07:00
Ken Cooke
2794a134c1
Add master injector gain to audio-mixer
2019-03-15 10:44:59 -07:00
David Rowe
7445d73857
Merge branch 'master' into M21222
...
# Conflicts:
# libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
Sam Gateau
3464fe09c1
Applying the hero changes to master soon to be rc81
2019-03-08 18:13:20 -08:00
David Rowe
4779a6b156
Merge branch 'master' into M21222
2019-03-09 07:57:53 +13:00
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
David Rowe
eba89e8a80
Revise Avatar JSDoc as a result of MyAvatar JSDoc work
2019-03-08 13:50:03 +13: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