2781 commits

Author	SHA1	Message	Date
Stephen Birarda	0ee0082052	handle new packet types in AudioMixerClientData::processPackets	2017-06-12 02:05:40 -07:00
Stephen Birarda	281793c4c0	update last heard timestamp for mirrored nodes	2017-06-12 01:46:12 -07:00
Stephen Birarda	f726c5bc3a	handle mirrored packets in AudioMixerClientData	2017-06-12 01:16:51 -07:00
Stephen Birarda	45bb323723	experimental support for mirrored audio packets to other mixers	2017-06-12 00:19:24 -07:00
Bradley Austin Davis	b4bbf98fe3	Suppress TBB warnings	2017-06-06 15:02:16 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
Ken Cooke	0fe404adbb	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noisegate-new	2017-05-23 17:31:03 -07:00
Ken Cooke	f3797798d3	Cleanup	2017-05-23 15:33:37 -07:00
Ken Cooke	c47d80574e	Replace the other noise gate, in Agent.cpp	2017-05-23 15:32:41 -07:00
Stephen Birarda	841f8cb86b	make sure AvatarData objects have the node session ID	2017-05-22 15:33:57 -07:00
Zach Fox	487319f7ef	Increment _identitySequenceId before sending ID packet for agents	2017-05-19 16:53:25 -07:00
Clément Brisset	55b5f08714	Merge pull request #10465 from Atlante45/fix/domain-settings ... Fix domain settings not getting cleared on re-assignment	2017-05-18 14:16:35 -07:00
Howard Stearns	95111d24b2	Merge branch 'master' into dk/sequenceNumberForAvatarIdentity	2017-05-17 17:09:47 -07:00
David Kelly	057718bde3	remove clockSkew, reference new version for Avatar packets	2017-05-17 15:14:56 -07:00
howard-stearns	0f0ad11344	Ensure avatar identity packet at mixer.	2017-05-17 13:47:24 -07:00
Seth Alves	8a88b30da7	Merge pull request #10468 from AndrewMeadows/cleanup-actions ... cleanup Actions and Constraints part-1	2017-05-17 11:33:53 -07:00
Brad Hefta-Gaub	ee6bed5c1c	Merge pull request #10189 from Atlante45/fix/memory-leak ... Set max packet per second on the agent	2017-05-16 21:03:05 -07:00
Atlante45	c799ddc927	CR	2017-05-16 14:53:54 -07:00
Andrew Meadows	9b3754c2ee	remove unused API from ObjectDynamic and friends	2017-05-15 22:13:03 -07:00
Atlante45	cde7d68570	Fix domain settings not getting cleared on re-assignment	2017-05-15 18:20:47 -07:00
Seth Alves	c6131916e1	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 09:46:21 -07:00
Zach Fox	ae983658be	Finally, the actual fix?	2017-05-10 15:59:19 -07:00
Zach Fox	d7e4f02291	This is a better method.	2017-05-09 15:33:33 -07:00
Seth Alves	fd238f5438	working on fixing action/constraint export/import	2017-05-08 11:02:35 -07:00
Seth Alves	cfe118e2c6	start on code to remap constraint IDs during import	2017-05-07 19:42:24 -07:00
Stephen Birarda	a21a34a4a4	add entities file replacement to DS and ES	2017-04-27 16:56:27 -07:00
ZappoMan	76902b15d3	remove one last debug log	2017-04-26 18:51:41 -07:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
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