2484 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	a526db1779	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-21 14:18:36 -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
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