1465 commits

Author	SHA1	Message	Date
Stephen Birarda	87d6c0085f	add a fallback if STUN to outside server isn't possible	2013-10-17 15:11:02 -07:00
Stephen Birarda	42de553e32	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-10-17 14:51:20 -07:00
Stephen Birarda	4bbb59be72	fix use of htonl in constant outside function	2013-10-17 14:45:38 -07:00
ZappoMan	a11b6858d3	fix small stats bug	2013-10-17 14:43:19 -07:00
Stephen Birarda	90e189b425	remove accidentally double saved NodeList.cpp	2013-10-17 14:42:07 -07:00
Stephen Birarda	73d3ecccf3	resolve conflicts on merge with upstream master	2013-10-17 14:37:58 -07:00
Stephen Birarda	8f1135feb7	more repairs to Agent and AvatarData for UUID transition	2013-10-17 14:35:42 -07:00
Stephen Birarda	d7d8d76b07	fix ping of VS from agent	2013-10-17 13:58:00 -07:00
ZappoMan	8d7874b01b	add guards to prevent runaway reaverageVoxels(), added stats to see if 4 children could be packed internally	2013-10-17 13:47:18 -07:00
Stephen Birarda	74e66dfd35	push various PACKET_TYPES, repairs to Agent for UUID setup	2013-10-17 13:35:53 -07:00
Stephen Birarda	0ae825d761	temporary activation of node public socket in VS	2013-10-17 13:01:03 -07:00
ZappoMan	d566026026	Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings	2013-10-17 12:31:31 -07:00
ZappoMan	6688b450c5	cleaned up some printf's to qDebug's	2013-10-17 12:31:18 -07:00
ZappoMan	8448e47df8	cleanup dead code	2013-10-17 12:27:23 -07:00
ZappoMan	515dc657fb	cleanup dead code	2013-10-17 12:26:01 -07:00
ZappoMan	fbf1a75d07	cleanup dead code	2013-10-17 12:24:53 -07:00
ZappoMan	095b716366	make population stats use public getters and private member variables	2013-10-17 12:16:03 -07:00
Stephen Birarda	628a3ba489	fixes to AvatarMixer for new UUID setup	2013-10-17 12:10:27 -07:00
Stephen Birarda	1c70e09178	repairs to audio exchange for new UUID setup	2013-10-17 11:58:52 -07:00
ZappoMan	c5deed36b0	added ifdefs for HAS_AUDIT_CHILDREN and added more memory tracking stats	2013-10-17 11:56:18 -07:00
Stephen Birarda	a5c837b197	fix domain-server check in from assigned clients	2013-10-17 11:51:42 -07:00
Stephen Birarda	fa146e302d	remove 16-bit node IDs and replace with UUIDs	2013-10-17 11:49:41 -07:00
ZappoMan	296f18a844	make offset bounds match 20 bit storage	2013-10-17 09:58:28 -07:00
Stephen Birarda	6805b0e2c6	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-10-17 09:23:25 -07:00
ZappoMan	d2bab77c88	implement support for three children encoding	2013-10-16 21:42:47 -07:00
Stephen Birarda	012fccc72e	send ping to AvM and VS for socket activation	2013-10-16 18:01:15 -07:00
Stephen Birarda	7de88898e1	activate appropriate socket after receiving ping reply	2013-10-16 17:51:32 -07:00
Stephen Birarda	849e5817ec	remove a couple of spaces	2013-10-16 17:27:16 -07:00
Stephen Birarda	330e78920a	use Qt to query interfaces for correct local address	2013-10-16 17:06:39 -07:00
Stephen Birarda	e40ab5d13f	add debug of Node's local address	2013-10-16 16:52:05 -07:00
Stephen Birarda	747175311f	handle stun response in assigned clients	2013-10-16 16:37:24 -07:00
Stephen Birarda	224b0d9671	domain server accepts custom public address from node	2013-10-16 16:27:13 -07:00
Stephen Birarda	f581d4d976	handle STUN request and response in NodeList	2013-10-16 16:01:23 -07:00
ZappoMan	1e5ce8a7e5	first cut at really getting _children UNION to work	2013-10-16 12:54:37 -07:00
Stephen Birarda	ef655f5e78	clear agent audio injector after send, don't send if empty	2013-10-16 11:50:19 -07:00
ZappoMan	afcf6dd3e0	type squish	2013-10-15 18:28:56 -07:00
Stephen Birarda	1ed2b3d8fe	add both fulfilled and queued assignments to DS json	2013-10-15 15:38:43 -07:00
ZappoMan	6fff53a2dc	next round of voxelnode size improvements	2013-10-15 14:43:51 -07:00
Stephen Birarda	2ec42a2a5d	revise linkage of civetweb for both DS and VS	2013-10-15 14:24:54 -07:00
ZappoMan	9800dc0fde	removed dead code	2013-10-15 13:40:55 -07:00
ZappoMan	05c9d4febc	added old style voxelnode for size comparison	2013-10-15 13:37:14 -07:00
ZappoMan	9d0ff1595a	make voxelnode population statistics static members instead of per node	2013-10-15 13:33:38 -07:00
ZappoMan	86ba5e3064	some size comparison debugging	2013-10-15 12:11:49 -07:00
ZappoMan	9ba39c3a84	removed center from AABox to further save memory	2013-10-15 12:05:54 -07:00
ZappoMan	c9b0edf345	first cut at reducing memory footprint of AABox	2013-10-15 11:29:04 -07:00
ZappoMan	924053f2ec	added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment	2013-10-14 15:10:56 -07:00
ZappoMan	f0fc973db1	move loading of voxel file to the persist thread so that assignment client will load voxel server faster	2013-10-14 12:42:15 -07:00
ZappoMan	1513003ecd	added more stats to voxel server status	2013-10-14 12:20:50 -07:00
ZappoMan	3425685119	first cut at added voxel node memory usage debugging to client and server	2013-10-14 12:09:44 -07:00
Stephen Birarda	5ca805693c	reset nodeTypesOfInterest on NodeList reset	2013-10-11 17:48:54 -07:00