Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-16 13:21:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 25 branches 0 tags 1.1 GiB
Commit graph

3002 commits

Author SHA1 Message Date
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945 Merge pull request #10261 from Atlante45/feat/progressive-load-ktx 
Add progressive load for KTX textures
 2017-04-26 18:36:01 -07:00
ZappoMan
1f9e07b828 more logging 2017-04-26 16:40:13 -07:00
ZappoMan
3de92121e0 more logging 2017-04-26 15:28:10 -07:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
ZappoMan
7154a11192 add some more logging 2017-04-26 14:03:36 -07:00
Andrew Meadows
75c2776836 remove keep-alive packet from avatar-mixer 2017-04-26 12:47:27 -07:00
ZappoMan
7840377109 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 12:39:30 -07:00
Andrew Meadows
ac6d4969d6 Merge pull request #10270 from Atlante45/fix/unload 
Fix entity script unloads
 2017-04-26 11:42:14 -07:00
Atlante45
043c587395 Fix byte range for file resource requests 2017-04-26 10:49:23 -07:00
Stephen Birarda
3928e11611 fix valid byte range check and send asset from 0 2017-04-26 10:48:57 -07:00
Stephen Birarda
814970c4e2 cleanup invalid byte range handling 2017-04-26 10:48:57 -07:00
Stephen Birarda
7a3219d8f9 force a negative to in ATP byte range to be invalid 2017-04-26 10:48:57 -07:00
Stephen Birarda
06ce63f421 fix byte range set check in SendAssetTask 2017-04-26 10:48:57 -07:00
Stephen Birarda
8145e416f9 check both sides of range for invalid byte range 2017-04-26 10:48:57 -07:00
Stephen Birarda
397a29039e add support for byte range requests to ATP 2017-04-26 10:48:57 -07:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
ZappoMan
8dc41ca8b9 add support for ignore radius from agent scripts 2017-04-25 15:28:26 -07:00
David Rowe
4c30c0d722 Make UserActivityLogger available to AC scripts 2017-04-25 13:42:12 +12:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
Atlante45
d292451f91 Remove unnecessary const 2017-04-24 15:43:36 -07:00
Atlante45
41cd0d79b2 Set max packet per second on the agent 2017-04-24 10:56:57 -07:00
ZappoMan
088cdae320 CR feedback 2017-04-21 11:14:47 -07:00
ZappoMan
125b3d5f4e ignore old identity packets 2017-04-21 07:51:17 -07:00
Seth Alves
21ca767b7c remove setPosition and setRotation for actions because they were never finished and never used. 2017-04-18 11:59:16 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Andrew Meadows
5bdecfbfa0 send keep-alive packets but don't resend identity 2017-04-13 16:00:11 -07:00
Andrew Meadows
14b60165ef don't keep stale avatars alive 2017-04-13 14:55:08 -07:00
Andrew Meadows
63ea16f24b avatar-mixer to send identity packets as 'reliable' 2017-04-13 13:37:18 -07:00
Andrew Meadows
e364b8d33e avatar-mixer resends to avoid stale avatar 2017-04-13 13:35:59 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Andrew Meadows
d25c0ace44 AvatarMixer sends min updates for out-of-view avatars 2017-04-11 15:02:27 -07:00
Stephen Birarda
84a5807ff1 return ScriptAvatarData raw pointer from getAvatar 2017-04-10 22:15:45 -07:00
Stephen Birarda
6c49db0f1b add missing include for qScriptRegisterMetaType in Agent 2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts 2017-04-10 22:15:45 -07:00
Stephen Birarda
602d65a71a Merge pull request #10001 from birarda/cleanup-ebp 
cleanup EncodeBitstreamParams to use nodeData when possible
 2017-04-10 15:54:30 -07:00
Howard Stearns
54888f85be strip more 2017-04-10 08:41:50 -07:00
Howard Stearns
c32879d807 fix multi-line sessionDisplayName 2017-04-08 15:41:11 -07:00
Stephen Birarda
c7a28a527a cleanup Agent recording handling, make loadRecording async 2017-04-04 10:56:25 -07:00
Stephen Birarda
6ed4295b8b make sure HeadData is present before processing recording frames 2017-04-03 13:55:11 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Howard Stearns
0c07003768 Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars 
Avoid invisible avatars
 2017-03-31 13:48:41 -07:00
David Kelly
e66c075f8e Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-30 10:14:29 -07:00
Andrew Meadows
c5eb2e0642 restore spelling in comment 2017-03-28 21:11:32 -07:00
Andrew Meadows
2777ad0397 fix comments 2017-03-28 21:02:49 -07:00
Anthony Thibault
069ebaedf0 Merge pull request #10021 from huffman/fix/agent-animation-cache 
Add AnimationCache to agent scripts
 2017-03-28 20:15:21 -07:00
Anthony J. Thibault
e100e3d19b made UNIT_SCALE const 2017-03-28 17:34:15 -07:00
Anthony J. Thibault
ecc31802b8 Added translation support to AC avatar animations. 2017-03-28 17:23:36 -07:00
Ryan Huffman
aa8d231e82 Remove extra setting of AnimationCache in Agent 2017-03-28 09:35:15 -07:00
Ryan Huffman
d84e2fb048 Add AnimationCache to agent scripts 2017-03-27 12:05:25 -07:00
Zach Fox
e1a880a5d4 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-27 09:10:12 -07:00
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Stephen Birarda
53e6a77fcc cleanup EncodeBitstreamParams to use nodeData when possible 2017-03-24 13:41:36 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub
20bc32fc89 Merge pull request #9980 from birarda/bug/ac-agent-audio 
make sure the AC agent has an AudioScriptingInterface
 2017-03-23 15:13:24 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Stephen Birarda
b53cb5934b make sure the AC agent has an AudioScriptingInterface 2017-03-22 23:35:29 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Zach Fox
78f1acfd62 Don't crash when ignoring not-present node 2017-03-21 10:46:15 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Stephen Birarda
96cf6b8c04 fix clear check for missing other entity servers 2017-03-20 13:40:15 -07:00
Stephen Birarda
0a118bd268 add a guard for trading entity servers by checking node count 2017-03-20 13:40:15 -07:00
Stephen Birarda
a4d72c4e67 make AudioScriptingInterface a Dependency 2017-03-20 13:40:15 -07:00
Stephen Birarda
20022ebdc8 use deleteLater for ESS script engine on nodeKilled 2017-03-20 13:38:59 -07:00
Stephen Birarda
a69cf76d06 Merge pull request #9879 from birarda/bug/no-unload 
make sure deleted entities are unloaded first
 2017-03-16 13:29:36 -07:00
Zach Pomerantz
3b8c82491a add AudioNoiseGate to Agent 2017-03-16 18:47:58 +00:00
Stephen Birarda
0c657a1d55 add parameter to unload to remove entityID from map 2017-03-15 10:57:12 -07:00
Zach Pomerantz
e6fbdf8f06 add isNoiseGateEnabled to Agent 2017-03-15 00:15:49 +00:00
Brad Davis
eab91d061d Merge pull request #9868 from zzmp/ktx/local-not-roaming 
Use Local for WIN32 FileCache
 2017-03-13 15:52:11 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
Brad Hefta-Gaub
aa65f03509 fix mac warning and remove accidentally added whitespace 2017-03-10 18:14:00 -08:00
Zach Pomerantz
7e2f1a6455 check for silent samples befor limiting 2017-03-09 14:31:54 -05:00
Zach Pomerantz
e69d6d8b5f track silent listeners in audio-mixer 2017-03-09 14:31:41 -05:00
Ryan Huffman
a744e0d11c Merge pull request #9685 from humbletim/21114-part2 
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
 2017-03-07 13:25:25 -08:00
Zach Fox
0000b8fb21 OMG I think it's actually fully working 2017-03-06 10:03:42 -08:00
Zach Fox
685bd95105 I think I'm done. Not straightforward! 2017-03-06 10:03:42 -08:00
Zach Fox
5418a7c230 Important addition before rebase 2017-03-06 10:03:42 -08:00
Zach Fox
5fa5e6e0a7 First pass at implementing Brad's simplification ideas 2017-03-06 10:03:42 -08:00
Zach Fox
fda87b3a53 Quick cleanup 2017-03-06 10:03:42 -08:00
Zach Fox
8bdbbd4b25 CR feedback 1 2017-03-06 10:03:41 -08:00
Zach Fox
718ecea404 Potential non-spammy solution using pseudo-state 2017-03-06 10:03:41 -08:00
Zach Fox
9969d422d6 Cleanup 2017-03-06 10:03:41 -08:00
Zach Fox
4025601c2b Force send ID even when 'overBudget' 2017-03-06 10:03:41 -08:00
Zach Fox
81ce5cffcd Force-send ID packets when PAL is open 2017-03-06 10:03:41 -08:00
Zach Fox
c9c07c4269 Basically rebase and squash 2017-03-06 10:03:41 -08:00
David Kelly
29f263a296 oh man, this was hard to find 2017-03-02 12:43:41 -07:00
David Kelly
81451191c1 no need to get the ScriptableAvatar from DependencyManager every time 2017-03-01 18:06:03 -07:00
David Kelly
e8b48eb3aa Merge branch 'master' of https://github.com/highfidelity/hifi into dk/agentAvatarDataUpdates 2017-03-01 13:51:28 -07:00
David Kelly
2635657456 zappoman's feedback, plus added const corrrectness to computeLoudness 2017-02-28 13:24:25 -07:00
Andrew Meadows
c6730f7c58 Merge pull request #9745 from AndrewMeadows/faster-avatar-updates 
Faster avatar updates
 2017-02-28 10:55:21 -08:00
David Kelly
0b8624aa6f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/agentAvatarDataUpdates 2017-02-28 09:46:01 -07:00
Stephen Birarda
f213b32167 clear the entity viewer before restarting ESS script engine 2017-02-26 09:38:51 -08:00
Brad Hefta-Gaub
60fd4afc4d don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing 2017-02-23 18:52:10 -08:00
Andrew Meadows
92a32b4651 remove unused variable 2017-02-23 17:36:45 -08:00
Andrew Meadows
e54812430e avoid unnecessary copy of priority_queue 2017-02-23 17:36:45 -08:00
Brad Hefta-Gaub
1e91f74ce7 clean up some uneedded nullptr checks, make them asserts 2017-02-23 13:32:35 -08:00
Brad Hefta-Gaub
8cb8d686ec more cleanup and some CR feedback fixes 2017-02-23 13:09:39 -08:00
Brad Hefta-Gaub
f61e16fccf more aggressive out of view data culling 2017-02-23 11:01:55 -08:00
Brad Hefta-Gaub
dde9640c66 remove old full rate distance code 2017-02-23 10:29:17 -08:00
Brad Hefta-Gaub
d4adee8b38 add over bandwidth exit to sorted avatar loop 2017-02-23 00:15:07 -08:00
Brad Hefta-Gaub
40037bee55 added some stats for the random drops 2017-02-22 23:28:40 -08:00
Brad Hefta-Gaub
06f0087459 wire up radius properly 2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub
edf7c016a1 more cleanup 2017-02-22 22:06:28 -08:00
Brad Hefta-Gaub
4c4506b1f7 some cleanup 2017-02-22 21:47:40 -08:00
Brad Hefta-Gaub
05995163cf add support for tuning sorting 2017-02-22 09:49:47 -08:00
David Kelly
397eb89c14 compiler warning - odd 2017-02-22 08:38:49 -08:00
Brad Hefta-Gaub
4c42e95607 add some debugging 2017-02-22 08:13:37 -08:00
David Kelly
6d7fab4053 Agent Avatars sending loudness in AvatarData 2017-02-21 16:59:08 -08:00
Brad Hefta-Gaub
8cc0b383c4 wire up bandwidth buget to sorting 2017-02-21 16:22:22 -08:00
Brad Hefta-Gaub
a58ddad3aa Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub
2017ea4491 hacking on using sorted avatars for bandwidth budget 2017-02-21 14:18:00 -08:00
Stephen Birarda
10828d7534 Merge pull request #9692 from birarda/feat/es-get-children-parents 
Give implicit access to family tree of server scripted entities in ESS
 2017-02-21 13:17:46 -08:00
Brad Hefta-Gaub
942c5689fc more comment cleanup 2017-02-18 14:09:47 -08:00
Brad Hefta-Gaub
73d64120df removed dead comment 2017-02-18 14:08:03 -08:00
Brad Hefta-Gaub
bc858f82fc fixed a FIXME comment 2017-02-18 14:07:20 -08:00
Brad Hefta-Gaub
2b79602220 debug cleanup 2017-02-18 13:14:14 -08:00
Brad Hefta-Gaub
e95e7f663c more cleanup 2017-02-18 13:04:00 -08:00
Brad Hefta-Gaub
66a6666b52 more cleanup, improved stats, port throttling 2017-02-18 12:29:01 -08:00
Brad Hefta-Gaub
71af81851e migrate to new style throttling 2017-02-17 22:20:32 -08:00
Brad Hefta-Gaub
d233430809 fix warnings 2017-02-17 21:58:35 -08:00
Brad Hefta-Gaub
4570b3439d some cleanup 2017-02-17 21:38:30 -08:00
Brad Hefta-Gaub
c2c843d841 fix mac warnings 2017-02-17 21:05:02 -08:00
Brad Hefta-Gaub
291b823cfa const cleanup and fix crash 2017-02-17 18:28:07 -08:00
Brad Hefta-Gaub
92ca7de0bf some tweaks to support too large avatar data 2017-02-17 10:12:35 -08:00
Brad Hefta-Gaub
78147c27ad log too large byteArray instead of crashing 2017-02-17 08:33:27 -08:00
Brad Hefta-Gaub
3a0c63cbc7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.cpp
 2017-02-16 18:14:52 -08:00
Howard Stearns
7afd13d2cb Merge pull request #9693 from howard-stearns/fix-requestsDomainListData 
fix rquestsDomainListData
 2017-02-16 17:06:29 -08:00
Brad Hefta-Gaub
be12a8ffa4 stats cleanup 2017-02-16 16:58:06 -08:00
Stephen Birarda
9f9fc03751 call EntityTree update when ScriptEngine update occurs 2017-02-16 16:46:09 -08:00
Stephen Birarda
4ece56b673 spacing cleanup in EntityTreeSendThread 2017-02-16 16:46:09 -08:00
Stephen Birarda
fe11a945ef remove debug from EntityTreeSendThread 2017-02-16 16:46:09 -08:00
Stephen Birarda
9d336a84ab force a full scene send for new ancestors/descendants 2017-02-16 16:46:09 -08:00
Stephen Birarda
a3883a746c add the basic structure for inclusion of ancestors/descendants in ESS queries 2017-02-16 16:46:09 -08:00
Ryan Huffman
0da81efd93 Add includeDescendants and includeParents to ESS entity query 2017-02-16 16:46:09 -08:00
howard-stearns
04712e3744 fix rquestsDomainListData 2017-02-16 16:43:16 -08:00
Brad Hefta-Gaub
ece32a3c68 cleanup 2017-02-16 16:19:40 -08:00
Brad Hefta-Gaub
df54762da9 add some more stats 2017-02-16 15:56:02 -08:00
Brad Hefta-Gaub
d49c83cac3 fix build buster, some tweaks 2017-02-16 14:19:14 -08:00
Zach Pomerantz
07e97a0cab unqueue from front for audio packets 2017-02-16 21:40:53 +00:00
Brad Hefta-Gaub
d532b3a4b8 more work on multi-core 2017-02-16 13:25:51 -08:00
Brad Hefta-Gaub
0a48ea75a7 fix unix build error 2017-02-16 10:45:58 -08:00
Brad Hefta-Gaub
755c690030 some cleanup, better sleep management 2017-02-16 10:07:49 -08:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub
23790b93e3 first cut at slaves doing broadcast 2017-02-16 01:07:21 -08:00
Brad Hefta-Gaub
2d300a6643 checkpoint with eachNode() changed to nestedEach() 2017-02-15 22:14:26 -08:00
Brad Hefta-Gaub
d22f4c1dd7 partial const migration work so mixer will not side-effect AvatarData 2017-02-15 21:29:03 -08:00
Brad Hefta-Gaub
bd72216574 add support for multiple jobs types on the slave pool 2017-02-15 20:49:45 -08:00
Brad Hefta-Gaub
faa8e629a0 checkpoint 2017-02-15 20:28:32 -08:00
Brad Hefta-Gaub
5d90b7b1b7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-15 16:15:57 -08:00
Zach Pomerantz
a976d191ad Merge pull request #9679 from zzmp/fix/audio-assert-ignore-memoization 
Loosen audio memoization precondition
 2017-02-15 17:50:33 -05:00
Brad Hefta-Gaub
babeabede5 more cleanup and stats rework 2017-02-15 13:49:16 -08:00
Brad Hefta-Gaub
00086fcc06 wire up thread count to settings, tweak stats 2017-02-15 13:00:30 -08:00
Brad Hefta-Gaub
cddb72bbd7 clean up stats, add slave stats 2017-02-15 12:11:17 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Zach Pomerantz
2e9217fb47 loosen audio memoization precondition 2017-02-15 13:36:03 -05:00
Brad Hefta-Gaub
4f655bba3f more hacking 2017-02-15 09:29:45 -08:00
Brad Hefta-Gaub
67e6d654d9 introducing AvatarMixerSlavePool concept 2017-02-14 15:32:32 -08:00
Brad Hefta-Gaub
9699c3b714 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-14 14:12:28 -08:00
Brad Hefta-Gaub
3d874f6ad2 more hacking 2017-02-14 14:12:22 -08:00
Zach Pomerantz
09cc4bf48d time events with packets 2017-02-14 21:48:36 +00:00
Zach Pomerantz
41a4ec4200 mv codec init to ctor from negotiateCodecs 2017-02-14 21:26:35 +00:00
Zach Pomerantz
06c8fba35d mv Node out of packet queue 2017-02-14 21:10:30 +00:00
Zach Pomerantz
a7386392a1 fix codec parsing 2017-02-14 20:46:27 +00:00
Zach Pomerantz
b102c2d1d0 generalize audio thread pool to processPackets 2017-02-14 20:46:27 +00:00
Zach Pomerantz
7d8a947e6d add node-isolated packet parsing to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
da5a89f582 move codec negotiation to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
481cd0ca6a move audio packets to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
2f457ae891 add packet queue to AudioMixerClientData 2017-02-14 20:46:27 +00:00
David Kelly
342584b2a8 Filter failure mode updated 
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.

Also - zone filters don't apply to the zone itself.  Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
 2017-02-14 13:05:12 -07:00
Seth Alves
2e2a3c60d0 Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-14 06:26:20 -08:00
Ken Cooke
bf077e6fdb Merge pull request #9623 from zzmp/audio/should-ignore 
Optimize ignore zone checks for audio mixer
 2017-02-14 06:18:54 -08:00
Brad Hefta-Gaub
e642f6f96a add some various debug and stats code to avatarMixer 2017-02-13 18:29:45 -08:00
Brad Hefta-Gaub
b48ff6f24f add some various debug and stats code to avatarMixer 2017-02-13 18:17:01 -08:00
Seth Alves
3d7633a11f Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-13 13:44:05 -08:00
Brad Hefta-Gaub
ced6f43923 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-13 13:09:54 -08:00
Brad Hefta-Gaub
d24ed62116 Merge pull request #9660 from zzmp/audio/silent-stats 
Add silent_packets stat to audio mixer
 2017-02-13 13:07:07 -08:00
Zach Pomerantz
e1cf04e0f0 add silent_packets stat to audio mixer 2017-02-13 20:18:16 +00:00
David Kelly
590cf6d798 whitespace 2017-02-13 12:20:47 -07:00
David Kelly
92ee823ef3 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-13 10:22:42 -07:00
Seth Alves
1164a1b3bf some fixes for when an avatar is a child of something else 2017-02-12 08:27:39 -08:00
Brad Hefta-Gaub
8ed69f62fa adjust stats so avatar list is at bottom 2017-02-10 18:22:02 -08:00
Brad Hefta-Gaub
e6142d9719 Merge pull request #9645 from ZappoMan/binaryDataOverMessages 
implement support for binary data over messages
 2017-02-10 15:12:56 -08:00
David Kelly
2996298e79 First bit of cleanup 
consolidate to one map, some minor other cleaning.  More coming.
 2017-02-10 14:57:09 -07:00
David Kelly
cf780b3b73 fixed persist issue, working much better 2017-02-10 11:42:56 -07:00
Ken Cooke
542a668723 Merge pull request #9641 from zzmp/load/test 
log AVX2 support in audio-mixer
 2017-02-10 08:13:20 -08:00
Brad Hefta-Gaub
6a4f66677e Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4 implement support for binary data over messages 2017-02-09 20:41:34 -08:00
David Kelly
5ca80803c0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-09 20:01:43 -07:00
David Kelly
8d666854c7 working it seems 
But, AABox for zones isn't very helpful (box is _small).  Time to use
the shape of the zone.
 2017-02-09 15:39:38 -07:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
0f39356e94 Only users with perm rez can see the log 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10 First draft for entity script server log streaming 2017-02-09 13:04:43 -08:00
Zach Pomerantz
9d830d7ea9 log AVX2 support in audio-mixer 2017-02-09 18:56:49 +00:00
Ryan Huffman
026c68c7de Merge pull request #9625 from huffman/fix/server-script-entity-updates 
Fix Server Entity Script w/ high update rate causing issues
 2017-02-09 10:07:32 -08:00
Brad Hefta-Gaub
b399420190 CR 2017-02-08 15:42:59 -08:00
David Kelly
ff7c9d3546 Working like before 
Single entity script running properly.  Now, need to add the zone
filters and execute them.
 2017-02-08 15:36:16 -07:00
Brad Hefta-Gaub
07cf87749f Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots 2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
9d3c674271 fix warning 2017-02-08 13:41:09 -08:00
Ryan Huffman
f75eceda65 Add entity PPS per script configuration 2017-02-08 13:11:18 -08:00
Brad Hefta-Gaub
eedfc4fd38 fix various bot related bugs 2017-02-08 12:35:00 -08:00
Zach Pomerantz
553fffd8ae time mix instead of throttle with HIFI_AUDIO_MIXER_DEBUG 2017-02-07 21:49:23 +00:00
Zach Pomerantz
ee699d3fa6 Revert 'use tbb::atomic for cp' 2017-02-07 20:40:06 +00:00
Zach Pomerantz
5e9fb17949 use tbb::atomic for cp 2017-02-07 15:01:23 -05:00
Zach Pomerantz
ad7c01e86e modularize audio ignore zone computations 2017-02-07 15:01:22 -05:00
Zach Pomerantz
308e3cab71 fix memoized ignoreZone assertion for initialization 2017-02-07 15:01:22 -05:00
Zach Pomerantz
d42b6a64c4 use threadsafe map for audio node ignore cache 2017-02-07 15:01:22 -05:00
Zach Pomerantz
4bcc9d3072 bail audio mix if node is not initialized 2017-02-07 15:01:22 -05:00
Zach Pomerantz
093f748d7d make auto stream explicit 2017-02-07 15:01:22 -05:00
Zach Pomerantz
e7cf84324b abstract audio ignore caching 2017-02-07 15:01:22 -05:00
Zach Pomerantz
207d2e78f0 fix should ignore opts 2017-02-07 15:01:21 -05:00
Zach Pomerantz
310c8b18ee add caching over symmetric nodes for audio shouldIgnore 2017-02-07 15:01:21 -05:00
Zach Pomerantz
8a42755e8f mv shouldIgnore from AudioMixerSlave to ClientData 2017-02-07 15:01:21 -05:00
Zach Pomerantz
3c1cf504d0 rename getIgnoreBox to getIgnoreZone to prevent confusion 2017-02-07 15:01:21 -05:00
Zach Pomerantz
9bcc5c95b4 reduce stream lock usage in AudioMixerClientData::getIgnoreBox 2017-02-07 15:01:21 -05:00
Zach Pomerantz
569ae113a0 memoize audio ignore box in AudioMixerClientData 2017-02-07 15:01:21 -05:00
Zach Pomerantz
ff56eb24c8 Merge pull request #9537 from zzmp/audio/throttle-filter 
Add injector/avatar attenuation to audio-mixer throttling
 2017-02-07 20:57:43 +01:00
Ryan Huffman
534d3c581c Update EntityEditSender PPS to be 3000 in ESS 2017-02-07 11:50:44 -08:00
Zach Pomerantz
9b0190f1cf add ns/throttle to audio mixer debug stats 2017-02-06 20:31:19 +00:00
howard-stearns
8b44e83d9e Add new EntityPhysics packet type. 2017-02-06 11:11:18 -08:00
Zach Fox
4af5118654 First pass 2017-02-01 17:04:21 -08:00
Zach Pomerantz
1f56814714 Merge branch 'master' of https://github.com/highfidelity/hifi into audio/throttle-filter 2017-01-31 19:35:27 +00:00
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Zach Pomerantz
eb00c7ba11 group constants in audio mixer gain computation 2017-01-30 17:48:03 +00:00
Ken Cooke
ae8d0d1948 Merge pull request #9527 from thoys/fix-ac-playback-audio 
Fix AC recording playback audio encoding
 2017-01-28 17:43:28 -08:00
howard-stearns
673ac5680f add debug logging to entity server startup in the case of having a filter 2017-01-27 15:40:17 -08:00
Zach Pomerantz
e7e550d78c add injector attenuation to audio gain appx 2017-01-27 16:18:10 -05:00
Zach Pomerantz
2da4dce8be rm statics from audio-mixer mixing 2017-01-27 15:46:25 -05:00
Zach Pomerantz
fe1847f965 clean up audio-mixer computeGain helper 2017-01-27 15:46:12 -05:00
Zach Pomerantz
ca727b7920 inline audio mix helpers 2017-01-27 15:28:43 -05:00
Zach Pomerantz
c4190ad4c4 add hrtf adjustment to throttle gain appx 2017-01-27 15:26:49 -05:00
Zach Pomerantz
7bcf136dc9 modularize audio throttle gain appx 2017-01-27 15:26:32 -05:00
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
Zach Pomerantz
d82c8b251a use sleep_for to avoid WIN32 sleep_until bug 2017-01-27 13:22:50 -05:00
Chris Collins
5ed376afc9 Merge pull request #9257 from ZappoMan/tuneAvatarInfo 
avatar mixer bandwidth optimization
 2017-01-26 17:33:57 -08:00
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding 
- spelling fix
 2017-01-27 01:19:11 +01:00
Howard Stearns
866f9debcd Merge pull request #9526 from highfidelity/edit-entity-filter 
Edit entity filter (from branch)
 2017-01-26 16:00:48 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Chris Collins
c0ee091946 Merge pull request #9502 from zzmp/audio/throttle 
Throttle audio with PI controller, by node
 2017-01-26 14:25:44 -08:00
howard-stearns
f9f0a4ea2d fix startup-failure case 2017-01-26 14:05:16 -08:00
Brad Hefta-Gaub
0582aca598 Merge pull request #9511 from kunalgosar/master 
change server to default to not auto-muting
 2017-01-26 10:59:50 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
howard-stearns
9cbc4fd1b9 Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource 2017-01-25 16:23:52 -08:00
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08:00
howard-stearns
34e9c5debc initial script error checking 2017-01-25 14:56:06 -08:00
howard-stearns
df91ef5f5f blocking fetch of http scripts 2017-01-25 14:22:42 -08:00
Zach Pomerantz
fb31254f57 add proportional term to audio-mixer throttling controller 2017-01-25 21:18:03 +00:00
Zach Pomerantz
46afa7e764 DRY audio-mixer all-stream mixes 2017-01-25 21:18:03 +00:00
Zach Pomerantz
1153c1900f reorder AudioMixerSlave::prepareMix to be sequential 2017-01-25 21:18:03 +00:00
Zach Pomerantz
66c82f3193 clean AudioMixerSlave::addStreamToMix 2017-01-25 21:18:03 +00:00
Zach Pomerantz
6cfaa624a5 mv helpers from AudioMixerSlave 2017-01-25 21:18:03 +00:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
kunalgosar
7b896f961b change server to default to not auto-muting 2017-01-25 13:00:57 -08:00
Zach Pomerantz
9bdea98d21 clean AudioMixerSlave::mix 2017-01-25 19:24:12 +00:00
Zach Pomerantz
275e337a80 rm unused LOUDNESS_TO_DISTANCE_RATIO 2017-01-25 18:55:54 +00:00
Atlante45
9cacde2416 Fix wrong status when removing script 2017-01-24 18:36:27 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Zach Pomerantz
4ac0df8f8d throttle audio by node, not stream 2017-01-25 00:19:38 +00:00
Zach Pomerantz
b7148b338d change audio-mixer backoff threshold 2017-01-25 00:19:28 +00:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get 
the filter program from file
 2017-01-24 16:14:41 -08:00
ZappoMan
8c2c05719a fix warning 2017-01-24 14:21:47 -08:00
Ryan Huffman
f6a037339f Fix bad ctor call causing build failure 2017-01-24 14:00:55 -08:00
Zach Pomerantz
997c015b7f start audio-mix timestamp now 2017-01-24 21:30:07 +00:00
Zach Pomerantz
2bc725e2be change audio-mixer throttling to integral-based linear throttle/backoff 2017-01-24 21:30:05 +00:00
Zach Pomerantz
b028d84aab fix audio-mixer sleep 2017-01-24 21:29:20 +00:00
Zach Pomerantz
09f41bff00 improve audio-mixer timings 2017-01-24 21:29:20 +00:00
ZappoMan
1309af6d7a CR feedback 2017-01-24 12:47:47 -08:00
Stephen Birarda
9282f5555a Merge pull request #34 from Atlante45/ess-pr 
Temporarily remove AvatarList from EntityScriptServer
 2017-01-24 11:53:13 -08:00
Atlante45
e54e35fbbe Temporarily remove AvatarList from EntityScriptServer 2017-01-24 11:49:54 -08:00
Ryan Huffman
fcaca8930a Fix enum name in EntityScriptServer 2017-01-24 08:31:58 -08:00
Zach Pomerantz
39acba5455 throttle audio streams by count using PI controller 2017-01-23 21:30:41 -05:00
ZappoMan
0655b47dd7 fix warnings 2017-01-23 16:44:55 -08:00
ZappoMan
81b5a3c585 more cleanup 2017-01-23 15:12:54 -08:00
ZappoMan
e0bad95257 some cleanup 2017-01-23 13:18:55 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59 checkpoint - got first cut at distance based rotation tolerance working 2017-01-23 13:06:29 -08:00
Zach Pomerantz
3c9c78ae14 add threadcount to audio-mixer stats 2017-01-23 15:50:54 -05:00
howard-stearns
3358d58d01 Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-23 12:21:32 -08:00
Ryan Huffman
95024d2b80 Add ENTITY_SERVER_SCRIPT context to ac server 2017-01-23 09:30:30 -08:00
Ryan Huffman
9b1cd52fb4 Add the ability to get the context that a script is running in 2017-01-23 08:58:01 -08:00
Clément Brisset
6da188b6ae Merge pull request #33 from huffman/feat/entity-server-script-property 
Fix compilation error and move MessageID to CilentServerUtils
 2017-01-20 17:37:01 -08:00
Ryan Huffman
e9c6e9dd5c Move MessageID to ClientServerUtils 2017-01-20 16:43:11 -08:00
Stephen Birarda
73248c3562 Merge pull request #25 from huffman/feat/entity-server-script-property 
Fixes
 2017-01-20 11:45:07 -08:00
Ryan Huffman
8a691e8340 Remove AvatarHashMap from EntityServer 2017-01-20 11:44:32 -08:00
Ryan Huffman
2ca50153b3 Allow all node types to receive messages from Messages server 2017-01-20 11:17:41 -08:00
Ryan Huffman
89e6e10c1d Add AvatarHashMap to EntityScriptServer 2017-01-20 11:17:10 -08:00
Stephen Birarda
9c485dc610 don't restart script engine on shutting down with nodeKilled 2017-01-20 10:59:55 -08:00
Clément Brisset
4914ad9014 Merge pull request #22 from birarda/entity-script-server 
fix for RecordingScriptingInterface, default scripts, local audio injector
 2017-01-20 10:49:13 -08:00
Stephen Birarda
25bd6fa2c1 move recording interface to Agent/Application only 2017-01-20 10:27:08 -08:00
Zach Pomerantz
eba96c45d7 fix warnings for signed comp in AudioMixerSlavePool 2017-01-20 12:25:22 -05:00
Atlante45
f807dee51e Clear the tree when losing entity server 2017-01-19 17:29:10 -08:00
Stephen Birarda
88ea6fa589 call script engine shutdown when assignment stopping 2017-01-19 17:01:35 -08:00
Stephen Birarda
a40c25ddbf fix repeated send of matching entities 2017-01-19 16:42:14 -08:00
Stephen Birarda
b00435074e stop script engine when entity server goes away 2017-01-19 16:42:14 -08:00
Atlante45
07da0c5e9c Fix script loading bug 2017-01-19 15:58:55 -08:00
Atlante45
3203e8c7c2 Use Huffman's version of getEntityScriptDetails 2017-01-19 15:49:40 -08:00
Atlante45
20a82df9a0 Fix scripts not reloading in certain edge cases 2017-01-19 15:48:44 -08:00
Ryan Huffman
9e17f63b8f Add comment to clarify rez/reztmp check in EntityScriptServer 2017-01-19 15:10:26 -08:00
Ryan Huffman
7ba14a5f09 Fix AssignmentParentFinder.h include 2017-01-19 15:08:47 -08:00
Ryan Huffman
3ac44e3a1c Add guard against unpermitted requests to the entity script server 2017-01-19 14:34:44 -08:00
Ryan Huffman
7fc946f598 Fix duplicate UUID length constant 2017-01-19 13:31:24 -08:00
Ryan Huffman
cbb55a06a0 Update ScriptEngine to store full running status off entity scripts 2017-01-19 13:27:44 -08:00
Clément Brisset
89d1242925 Merge pull request #10 from huffman/feat/entity-server-script-property 
Entity script status + reload
 2017-01-19 11:19:40 -08:00
Stephen Birarda
746327dc11 whitespace cleanup in OST 2017-01-19 10:43:36 -08:00
Stephen Birarda
33cde412b1 make getJSONParameters thread-safe 2017-01-18 17:49:54 -08:00
Stephen Birarda
916a7325bc remove debug in EntityScriptServer 2017-01-18 17:49:54 -08:00
Stephen Birarda
a86be14b8c remove debug in OctreeSendThread 2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66 pass usesFrustum down to EntityTreeElement 2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95 fix for unpack of OctreeQuery 2017-01-18 17:49:54 -08:00
Atlante45
6b0b19d36d Unload all scripts on entity server loss 2017-01-18 17:47:19 -08:00
Atlante45
e94cccf08d Fix server script preload funcitons 2017-01-18 16:12:41 -08:00
Atlante45
e15bf6bfb4 Automatically query octree 2017-01-18 15:15:29 -08:00
Stephen Birarda
112b119f17 send entities that just stopped matching filter 2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034 leverage JSON filter changes to OctreeQuery in EntityServer 2017-01-18 14:58:36 -08:00
Stephen Birarda
f9f958aef1 provide direct access to OctreeQuery from OHV 2017-01-18 14:58:36 -08:00
Stephen Birarda
6e6f2c50b8 leverage OctreeQuery enhancements in EntityScriptServer/OHV 2017-01-18 14:58:36 -08:00
Ryan Huffman
8137c59ef7 Add support for sending requests to entity script server 2017-01-18 11:15:29 -08:00
howard-stearns
d9182cd38d Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-18 10:02:27 -08:00
Brad Davis
a593a2116a Removing magic numbers 2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab Consume fewer resources in AssetServer when interface is running locally 2017-01-17 18:15:39 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
Atlante45
97e9bfff36 Remove Viewer API for entity server scripts 2017-01-17 15:40:05 -08:00
Atlante45
ff3f175fb7 Fix typos 2017-01-17 15:39:54 -08:00
Atlante45
1212fefa61 Check for avatar collision in assignment as well 2017-01-17 13:47:45 -08:00
Atlante45
5db37fff95 More entity script server work 2017-01-17 13:47:45 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Zach Fox
246f5fb7f5 Add log; fix whitespace 2017-01-17 11:51:09 -08:00
ZappoMan
6e5e9d3492 more work 2017-01-16 18:28:01 -08:00
Zach Fox
e72c25736e Cleanup 2017-01-16 15:21:18 -08:00
Zach Fox
e98a40c30e Does this work? 2017-01-16 14:43:30 -08:00
ZappoMan
c9c311e275 checkpoint for distance joints 2017-01-15 11:47:48 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
dcff873cd4 Modify slider function 2017-01-13 12:57:35 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
ZappoMan
8bbfb51419 some cleanup 2017-01-10 08:37:01 -08:00
ZappoMan
636ade9eb7 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 11:29:54 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene 
More low level optimizations
 2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Zach Fox
afa6d54ac4 Actually fix the behavior... 2017-01-06 14:20:25 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Brad Hefta-Gaub
251495978c more work on delta sending 2017-01-05 19:46:19 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5242375215 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-05 08:57:10 -08:00
Ken Cooke
719c89e800 Shared implementation of fastLog2f() and fastExp2f() moved to AudioHelpers.h 2017-01-04 20:06:46 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2017-01-04 18:07:22 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Zach Fox
4a21eaa33f Cleanup before PR 2016-12-30 15:18:01 -08:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115 I'm about to refactor this. 2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424 Getting very close. 2016-12-29 11:35:20 -08:00
Zach Fox
af1c67a252 Progress! 2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283 First steps, holding off til Howard finishes 2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20 Remove HRS logging 2016-12-28 14:37:19 -08:00
Zach Fox
d3c2ba5199 Fix throttling extra data 2016-12-28 13:39:53 -08:00
Brad Davis
7b90d71205 Fix build 2016-12-28 13:23:05 -08:00
Brad Hefta-Gaub
73bfc069da more work on only sending changes 2016-12-27 17:19:55 -08:00
David Kelly
4fdc093cfa Throttle extra avatar data 
When PAL is open, we send AvatarData for avatars out of view, or
those who have ignored us (if we are an admin).  For those out of
view, we really don't need their info at 45hz, so this is a super
simple way to get it less often.  Chose 1/10th (4.5 hz) randomly
and could be much lower.  Just wanted to push this and get the
conversation going on how best to do it.
 2016-12-27 10:17:40 -08:00
David Kelly
38a3ee4104 Some code review feedback 
more to come
 2016-12-27 10:17:39 -08:00
howard-stearns
a9e781f565 naming consistentcy. No functional changes. 2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc fixes 2016-12-27 10:14:28 -08:00
Howard Stearns
344272f24a unignore checkpoint (untested) 2016-12-27 10:14:24 -08:00
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub
82dd9412ab tweaks, using packed scalar for audio loudness 2016-12-21 17:21:28 -08:00
Brad Hefta-Gaub
2ba4fee44b CR feedback 2016-12-21 08:26:20 -08:00
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
howard-stearns
a45e4da75f Initialize AvatarMixerClientData with the proper node id (should not be 
zeros for everyone). Then, in interface, check identity packets for self
and make sure they're handled.
 2016-12-19 15:22:42 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Brad Hefta-Gaub
6d7d3551d9 added some stats to the mixer fixed debug logging, improved timer precision 2016-12-15 18:32:11 -08:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
Brad Hefta-Gaub
ed19b4b592 remove compression at the per avatar data buffer for now, since it gave no benefit 2016-12-15 14:13:38 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub
439434b300 fixes 2016-12-14 20:24:52 -08:00
Brad Hefta-Gaub
c8fb467579 send minimum data for out of view avatars 2016-12-14 18:17:11 -08:00
Brad Hefta-Gaub
7189f766a2 more hacking 2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub
a7750501c6 first cut at adding view frustum support to avatar mixer 2016-12-13 18:58:11 -08:00
Brad Hefta-Gaub
92632e72b6 make default avatar mixer send bandwidth 5mbps 2016-12-13 17:04:25 -08:00
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Zach Pomerantz
5969c1eb06 ensure all accesses of audio pool num are guarded 2016-12-08 14:12:16 -05:00
Zach Pomerantz
eafbeb6d44 Revert "avoid pessimizing audio slave lock contention" 
This reverts commit 3508e71753.
 2016-12-08 14:10:00 -05:00
Zach Pomerantz
3508e71753 avoid pessimizing audio slave lock contention 2016-12-08 01:53:25 +00:00
Zach Pomerantz
6e0ad5a7ed initialize audio threads 2016-12-08 01:52:58 +00:00
Zach Pomerantz
ce9346f524 fix thread cleanup of audio pool 2016-12-07 18:43:02 -05:00
Zach Pomerantz
d2ed3caf02 respect audio thread pool size setting 2016-12-07 13:40:22 -05:00
Zach Pomerantz
c4e435a166 simplify locks in AudioMixerSlavePool 2016-12-07 01:17:34 +00:00
Zach Pomerantz
b2f995d3df algorithm->nestedEach in LimitedNodeList 2016-12-07 00:03:30 +00:00
Zach Pomerantz
28960681d9 limit audio pool to sane thread count 2016-12-06 23:57:38 +00:00
Zach Pomerantz
259775e163 clarify lock requirement in audio slave pool 2016-12-06 23:56:11 +00:00
Zach Pomerantz
2fc904b990 fix typos 2016-12-06 23:54:13 +00:00
Zach Pomerantz
557ab43f0f add a timeout for errant audio slave threads 2016-12-06 23:53:16 +00:00
Zach Pomerantz
132e9bd644 add timings to AudioMixer 2016-12-06 23:51:06 +00:00
Zach Pomerantz
2a6e46aa0c rm static buffer from AudioMixerSlave 2016-12-06 20:15:39 +00:00
Zach Pomerantz
d899391a1a fix audio hist array initializer for WIN32 2016-12-02 04:12:44 +00:00
Zach Pomerantz
800744a139 fix audio pool shutdown and add single threading 2016-12-01 23:03:37 +00:00
Zach Pomerantz
78bc5cf502 fix audio pool resizing 2016-12-01 21:25:56 +00:00
Zach Pomerantz
2c42bb0aa8 time audio mixing frames 2016-11-30 18:18:36 -05:00
Zach Pomerantz
8a6dcdeb68 mix audio with single node list read lock 2016-11-30 16:37:34 -05:00
Zach Pomerantz
b4638105e3 expose audio mixer threads to gui 2016-11-29 13:32:10 -05:00
Zach Pomerantz
7a440def87 add AudioMixerSlavePool 2016-11-28 17:59:29 -05:00
Zach Pomerantz
41ef105456 clean up AudioMixerSlave 2016-11-28 17:07:24 -05:00
Zach Pomerantz
bf137cd589 break AudioMixer slave/stats into own files 2016-11-28 16:50:47 -05:00
Zach Pomerantz
2e619b230d add AudioMixerStats 2016-11-28 16:50:42 -05:00
Zach Pomerantz
192f4791d5 move mixing into AudioMixerSlave 2016-11-28 16:50:26 -05:00
Zach Pomerantz
891084e9db modularize audio mixing code 2016-11-28 16:48:53 -05:00
Zach Pomerantz
028ac5264f consolidate AudioMixer slots 2016-11-28 16:26:53 -05:00
Zach Pomerantz
0170379d3c rm unused vars 2016-11-27 18:09:05 -05:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Stephen Birarda
dadcaa9959 don't send audio/avatar data for ignoree to ignored node 2016-11-14 10:12:36 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
David Kelly
6063a63f44 cr feedback 2016-11-11 14:23:59 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
David Kelly
80d4033767 oops forgot one thing... 2016-11-10 17:13:50 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -08:00
Stephen Birarda
64d9fa0f39 clamp avatar scale to domain limit in avatar mixer 2016-11-10 14:19:32 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Hefta-Gaub
af2f6e831a Merge pull request #9044 from birarda/higher-mute-permissions 
elevate permissions required for mute environment to kick
 2016-11-10 10:18:06 -08:00
Stephen Birarda
f56a5d1d98 elevate permissions required for mute environment 2016-11-10 09:23:01 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
c8a654a915 Merge pull request #9006 from Atlante45/logging 
Logging improvements
 2016-11-07 13:35:13 -08:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
David Kelly
21d1f40f59 Seems we were not deleting the right hrtfs when a node is killed 
Simple fix, just make sure we delete the hrtfs associated with the
killedNode.  The test is to delete some nodes (agents) and make sure
nothing bad happens to audio mixer, or the audio itself.
 2016-11-04 13:15:02 -07:00
David Kelly
920cd90afa CR feedback 2016-11-03 13:23:05 -07:00
David Kelly
ec0382daf7 PR feedback 
Completely deleting hrtfs incorrectly.  This seems to be better, we
only want to delete HRTF for the QUuid() stream for the killed node in each
node's list of HRTFs.
 2016-11-01 18:29:31 -07:00
David Kelly
c1feac971b CR feedback 2016-11-01 15:17:07 -07:00
David Kelly
0b80610e65 Needed to properly remove hrtfs for avatar audio 2016-11-01 15:09:14 -07:00
David Kelly
404c08b0c7 Un-do of previous commit 
Seems to add an artifact when using our test scripts.  Will work on that
as a separate issue, as it would be an existing issue in any case.
 2016-11-01 10:46:22 -07:00
David Kelly
fb2968a419 Reset bytes sent counter when setting avatar sound 
It could be past the end of the buffer if you changed sounds, and the
new one is shorter.  Won't happen with our current tests, but that could
change, and in general no reason it couldn't happen.
 2016-11-01 09:12:35 -07:00
David Kelly
5714063eff Make more reliable 
Need to be sure we don't change the _isAvatar or
_isListeningToAudioStream from one thread while processing audio in
another.  Also, fixed issue sending NLPacketList.
 2016-10-31 16:38:01 -07:00
David Kelly
e63e9bc017 Remove HRTFs for Avatar too 
Turns out there was already a function for that, if you just call
removeHRTFForStream without a 2nd param, it appears to just delete
the audio with uuid of QUuid() which is the avatar's mic.  That is
what we want, so cool.
 2016-10-31 13:25:22 -07:00