Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 19:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86676 commits 6 branches 1 tag 1.1 GiB
Commit graph

3795 commits

Author SHA1 Message Date
Simon Walton
e4f6f2cb14 Fetch avatars' fst files 2019-04-03 17:43:22 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request from howard-stearns/ddv-all 
DDV all, including domainUnlimited
 2019-04-03 11:03:16 -07:00
Ken Cooke
85368e6836 Replace inline audio mixing with functions that do gain interpolation 2019-04-01 12:24:37 -07:00
Olivier Prat
4e39a063f7 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2019-04-01 11:08:41 +02:00
Shannon Romano
c4925ddfa0
Merge pull request 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 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 from kencooke/audio-server-echo-fix 
Case 21947: Fix the audio level of server echo
 2019-03-29 10:12:37 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01: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
Howard Stearns
3da66dacc9 Merge branch 'master' of github.com:highfidelity/hifi into ddv-all 2019-03-27 15:08:03 -07:00
Ken Cooke
abb0a166b1
Merge pull request 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
Howard Stearns
91a165b4c3 separate out the certified entity map stuff (no-op refactor) 2019-03-26 11:49:08 -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
Howard Stearns
02129e0543 no-op refactor in prep for multiple entities per cert 2019-03-25 16:14:48 -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
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
Clément Brisset
56ac34f9d1
Merge pull request from Atlante45/fix/misc-agent 
Fix various AC bugs
 2018-12-03 14:18:12 -08:00
Clément Brisset
62f21822ce
Merge pull request from Atlante45/fix/agent-shutdown-crash 
Fix Agent crash on shutdown
 2018-12-03 14:17:35 -08:00
Clement
c53c52c7a0 Fix various Agent bugs 2018-11-29 17:42:04 -08:00
Clement
181f2b4263 Fix Agent crash on shutdown 2018-11-28 18:40:52 -08:00
Clement
c29f6346d8 Clear mixing structures when we stop mixing for node 2018-11-28 16:09:04 -08:00
Simon Walton
2bd66924ef Clear deleted avatar-entity list in mixer 2018-11-26 18:27:13 -08:00
John Conklin II
378742f896
Merge pull request from Atlante45/fix/throttle 
Turn off throttling behavior when not throttling
 2018-11-19 14:48:05 -08:00
Clement
359a841f69 Turn off throttling behavior when not throttling 2018-11-19 12:28:04 -08:00
birarda
a0a87e7170 consider avatar traits bytes in budget and omit if over 2018-11-19 10:55:05 -08:00
birarda
6daac008ff sanitize throttle start and backoff values from DS settings 2018-11-16 12:00:18 -08:00
birarda
bb0f046a72 add throttle start and backoff to DS settings 2018-11-15 17:28:34 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
John Conklin II
ec4f2f781d
Merge pull request from Atlante45/feat/solo-source 
[master] Add audio soloing feature
 2018-11-12 14:07:30 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request from jherico/feature/vcpkg 
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
 2018-11-12 09:52:02 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Roxanne Skelly
0dc8a798a1 Merge branch 'master' of https://github.com/highfidelity/hifi into Case19373 2018-11-08 10:51:21 -08:00
Clement
ef54a63de6 Use uint8_t instead of bool on the wire 2018-11-07 17:54:49 -08:00
Clement
8f763dfd50 Fix bug and crash in solo logic 2018-11-07 17:46:18 -08:00
Clement
b8cb433fa1 Spelling 2018-11-06 13:39:36 -08:00
Clement
beb575a88d Don't attenuate soloed nodes. 2018-11-06 13:39:24 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
Clement
37c69ebe62 Add audio soloing feature 2018-11-05 19:02:26 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
Roxanne Skelly
9ca862ad6b Case 19373 - Lowering volume on another user in PAL mutes them 2018-11-01 17:25:41 -07: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 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 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 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 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
Simon Walton
328ed8d976 Remove unused variable 2018-09-20 09:31:01 -07:00
Simon Walton
f1b7097edb Priority experiment 2018-09-19 15:32:56 -07:00
Simon Walton
04c47943ba Handle small packet space correctly 2018-09-19 13:45:08 -07:00
Simon Walton
c88a713ef8 Use Local ID for last time & sequence # 
Also try to fix size_t warnings on gcc
 2018-09-19 12:05:06 -07:00
Simon Walton
5d91396e91 Fixes for client & other clean-up 
Handle grab-joints better; fix packet size calc;
remove dead code; other improvements.
 2018-09-18 17:49:23 -07:00
Simon Walton
0c7dee730c Pack partial avatar data in bulk packets using space available 
Keep a single packet in-hand and send when full rather than
a packet list.
 2018-09-18 10:25:59 -07:00
Simon Walton
ca300db410 Send only avatar data that will fit in packet (WIP) 2018-09-14 18:24:08 -07:00
Simon Walton
6a1c76d14d Only sort an estimated number of avatars 2018-09-14 12:19:55 -07:00
John Conklin II
b675e6cc6b
Merge pull request from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
Simon Walton
9628615c44 Fix bandwidth quota calculation now we're dropping excess 2018-09-10 17:16:16 -07:00
Anthony Thibault
1570ae6424 Merge branch 'master' into bug-fix/recorded-blendshapes-2x 2018-09-10 12:58:53 -07:00
John Conklin II
3b0f37c6f7
Merge pull request from birarda/bug/recording-scripting-stuck 
fix Agent teardown of recording and ScriptEngine(s)
 2018-09-10 10:51:52 -07:00
Simon Walton
6bb143da42 Make maxAvatarBytesPerFrame int rather than float; other clean-up 2018-09-07 18:14:39 -07:00
Simon Walton
c2fe2b60b3 Use std::vector for ignored avatars since the list will be small 2018-09-07 15:49:47 -07:00
John Conklin II
01cace694f
Merge pull request from birarda/bug/ignore-freeze-master 
send ignoring avatar removal to ignored avatar
 2018-09-07 15:40:32 -07:00
Anthony Thibault
949efff439 Fix blendshapes playing back in recordings at 2x their proper values 2018-09-07 13:21:17 -07:00
Simon Walton
22cfad2483 Squelch (false) warning from gcc 2018-09-06 18:32:37 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
Simon Walton
f6fd27a76b
Merge pull request from AndrewMeadows/avatar-mixer-scaling-2 
tweak avatar sort coefficients and fix bad avatar bounding box calculations
 2018-09-06 16:39:20 -07:00
Andrew Meadows
92210f28b5 cleanup and use correct avatar bounding box 2018-09-06 16:33:30 -07:00
Simon Walton
f59168e1c8 make sure ignoredNode is available before sending packet 2018-09-06 16:31:31 -07:00
Simon Walton
9e0c21065e Stop sending avatars when over bandwidth quota 2018-09-06 16:20:46 -07:00
Stephen Birarda
a908c1554f make sure ignoredNode is available before sending packet 2018-09-06 16:04:54 -07:00
Andrew Meadows
229e9624e6 remove bad bounding box calculations in avatar-mixer 2018-09-06 15:34:28 -07:00
Simon Walton
e1aba52c23 Revert to statics for priority sort weights; update defaults from Andrew 2018-09-06 12:09:44 -07:00
Simon Walton
d2650f7ede Modified priority function from Andrew 2018-09-05 17:22:07 -07:00
Simon Walton
f7e84995b4 Only build the sortable vector once, now we're using vectors for the priority sort 2018-09-05 10:58:37 -07:00
Simon Walton
0738bcaebc Unused variable from merge 2018-09-04 18:08:34 -07:00
Simon Walton
262dbaf5ed Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling 2018-09-04 15:27:41 -07:00
Simon Walton
6ae2ca1576 Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling 
Merge of Samuel's change to use simple sort instead of priority queue
 2018-09-04 15:26:26 -07:00
SamGondelman
ade58a52cc reserve priority sort util vectors 2018-09-04 11:21:43 -07:00
Stephen Birarda
07b24b4768 send kill packet to ignored node for ignorer 2018-08-30 17:32:09 -07:00
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -07:00
Simon Walton
c2ac2b9ab0 Various tweaks; fix clang warning 2018-08-30 10:59:55 -07:00
Simon Walton
7b7f369c39 Further reductions in shared pointers, getWorldPosition(). 2018-08-29 18:25:10 -07:00
Simon Walton
4b7f6a346f Use AvatarData::getClientGlobalPosition() for position in priority queue 
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
 2018-08-28 16:21:47 -07:00
Simon Walton
027d117364 Remove deadlock caused by trying readlock on NodeList 
Also just use refs to other SharedNodes as the NodeList
is locked.
 2018-08-28 09:41:09 -07:00
Stephen Birarda
a76b50ce33 fix teardown of recording and ScriptEngine(s) 2018-08-27 15:07:19 -07:00
Simon Walton
44f253c482 Reduce use of shared pointers and maps 2018-08-27 14:54:37 -07:00
Simon Walton
402ed4fb76 More shared pointer tweaks 2018-08-27 10:35:17 -07:00
Simon Walton
ab810f4505 Try reducing use of shared pointers in O(n2) code 2018-08-24 17:33:06 -07:00
Stephen Birarda
e1879bf26a add assignment dynamic factory to ESS 2018-08-23 13:55:17 -07:00
Stephen Birarda
09065cf19a provide assignment dynamic factory to agent 2018-08-23 13:31:18 -07:00
Stephen Birarda
36784b0039 reset sent trait data when re-send required 2018-08-23 13:31:18 -07:00
John Conklin II
5dd64645eb
Merge pull request from SimonWalton-HiFi/safe-landing-fixes 
Fix safe-landing protocol for sparse domains
 2018-08-23 10:17:08 -07:00
Simon Walton
dd098f05c2 Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number 2018-08-22 14:54:07 -07:00
Stephen Birarda
01e8fd66a3 fix script engine(s) cleanup from ESS 2018-08-22 13:52:37 -07:00
Stephen Birarda
3b5ba71163 fix a crash in ESS from missing dependency 2018-08-22 12:23:24 -07:00
Stephen Birarda
3e2d4dc696 fixes and improvments addressing CR comments 2018-08-21 10:53:52 -07:00
Stephen Birarda
7e127749f7 move AssignmentDynamicFactory to entity-server only 2018-08-21 10:32:05 -07:00
Stephen Birarda
f0ba61ff05 add missing local ID, reset client processed trait versions 2018-08-21 10:32:05 -07:00
Stephen Birarda
6c204b682d include trait bytes written in over budget calculation 2018-08-21 10:32:05 -07:00
Stephen Birarda
fc5b72e9b9 cleanup sent trait versions for removed avatars on mixer 2018-08-21 10:31:15 -07:00
Stephen Birarda
f9230eca7f don't send override avatar URL if override matches 2018-08-21 10:31:15 -07:00
Stephen Birarda
a56e9b0860 allow agent to create and get avatar entities from script 2018-08-21 10:31:15 -07:00
Stephen Birarda
e6b419d283 add instanced traits and migrate avatar entities 2018-08-21 10:31:15 -07:00
Stephen Birarda
ea7c0e923a make client traits handler a unique ptr in AvatarData 2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f move skeleton model URL emit to AvatarData 2018-08-21 10:31:14 -07:00
Stephen Birarda
be7eb57205 handle whitelist avatar URL override via traits 2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a remove skeleton from identity, handle in clients 2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314 send traits in bulk to avatar mixer client 2018-08-21 10:31:14 -07:00
Stephen Birarda
f23a036f4a add node local ID retreivable from NodeData 2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7 add skeleton trait sending to Agent, queuing in AvatarMixer 2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a initial trait packet sending on skeleton URL change 2018-08-21 10:31:14 -07:00
John Conklin II
7f3bbaf3f8
Merge pull request from SimonWalton-HiFi/script-agent-destroy-engine 
Fix for ScriptEngines not being released upon AC shutdown
 2018-08-16 13:16:04 -07:00
John Conklin II
bbf6162361
Merge pull request from Atlante45/fix/udt-rtt 
Fix potential reliable connection lockup.
 2018-08-16 13:15:23 -07:00
John Conklin II
1edf1b4337
Merge pull request from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
Stephen Birarda
91365aeff4 make avatar kill packets from mixer reliable 2018-08-10 11:31:17 -07:00
John Conklin II
19ad9c52da
Merge pull request from birarda/bug/last-broadcast-guard 
check for null node data pointers in handleIgnoreRequestPacket
 2018-08-09 14:53:53 -07:00
Stephen Birarda
e686df6fb9
Merge pull request from Atlante45/feat/test-tool 
Stack tester changes
 2018-08-08 13:40:05 -04:00
Simon Walton
df9c65e410 Move back RecordingScriptingInterface destruction 2018-08-07 12:08:10 -07:00
Stephen Birarda
c7ce8e5ce0 check node data pointers in handleNodeIgnoreRequestPacket 2018-08-07 11:00:24 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
Simon Walton
59271881ba Create & destroy ScriptEngines on AC thread but move to main after creation 2018-08-03 17:45:06 -07:00
John Conklin II
243bd5ea69
Merge pull request from SimonWalton-HiFi/script-engine-thread-agent 
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
 2018-08-03 13:32:11 -07:00
Brad Davis
3c7f1a0c4b Merge remote-tracking branch 'upstream/master' into destroy 2018-08-02 15:34:19 -07:00