Commit graph

3448 commits

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