1438 commits

Author	SHA1	Message	Date
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
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
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
Stephen Birarda	6805b0e2c6	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-10-17 09:23:25 -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
Stephen Birarda	ef655f5e78	clear agent audio injector after send, don't send if empty	2013-10-16 11:50:19 -07:00
Stephen Birarda	1ed2b3d8fe	add both fulfilled and queued assignments to DS json	2013-10-15 15:38:43 -07:00
Stephen Birarda	2ec42a2a5d	revise linkage of civetweb for both DS and VS	2013-10-15 14:24:54 -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
Stephen Birarda	0eae0f129c	allow audio injection from javascript	2013-10-11 17:37:48 -07:00
Stephen Birarda	515e2d5a23	handle conflicts on merge with upstream master	2013-10-11 14:24:05 -07:00
Stephen Birarda	8be527f85d	remove sleep time debug	2013-10-11 11:15:10 -07:00
Stephen Birarda	13ac5472ea	fix an idiotic bug with silent node kill thread	2013-10-11 10:23:59 -07:00
Stephen Birarda	60095bcbca	add debug on NodeList clear	2013-10-11 10:08:28 -07:00
Philip Rosedale	53e2486d4d	Merge pull request #1045 from birarda/data-server ... fix bug with constant avatar kill/adds	2013-10-10 18:05:23 -07:00
Stephen Birarda	7d68c79fd8	fix bug with constant avatar kill adds	2013-10-10 17:40:01 -07:00
Philip Rosedale	bf3f507301	Merge pull request #1043 from birarda/master ... fix domain jumping with goToUser, remove planet environments	2013-10-10 17:25:43 -07:00
Stephen Birarda	9cf040780c	remove the planets from the VS environment	2013-10-10 16:36:38 -07:00
Stephen Birarda	aa0a97b959	use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread	2013-10-10 16:23:22 -07:00
ZappoMan	c86bad77c9	progress on keep local voxels	2013-10-10 15:23:22 -07:00
ZappoMan	d939d3aaae	Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels	2013-10-09 14:02:40 -07:00
ZappoMan	c25b03dd58	first cut at keeping local voxels	2013-10-09 14:02:31 -07:00
Andrzej Kapolka	aa353a57ad	Fix for mouse ray with off axis projection.	2013-10-09 13:38:06 -07:00
Andrzej Kapolka	5511c02449	Merge branch 'master' of https://github.com/worklist/hifi	2013-10-09 11:53:08 -07:00
Philip Rosedale	3a92856386	Merge pull request #1029 from birarda/nameserver ... initial revision of storing user data in data-server	2013-10-09 11:36:36 -07:00
Stephen Birarda	36a57e2a98	remove more debugging in NodeList	2013-10-09 10:42:33 -07:00
Stephen Birarda	7d69c6f211	remove extraneous debugging in NodeList	2013-10-09 10:41:33 -07:00
Andrzej Kapolka	dfd5f7d53e	Fix for screwy view when you lean too far forward.	2013-10-09 10:40:20 -07:00
Stephen Birarda	6fe0b0b124	don’t have AvatarMixer ask DS for agents	2013-10-09 10:40:19 -07:00
Stephen Birarda	8bac70e4a5	pass UUID from data-server to avatar-mixer	2013-10-08 13:43:31 -07:00
Stephen Birarda	6bd71da84e	pack the UUID with the avatar data	2013-10-08 13:31:39 -07:00
Stephen Birarda	892614470e	Merge branch 'master' of github.com:worklist/hifi into nameserver	2013-10-08 11:19:32 -07:00
Stephen Birarda	40dd698293	don’t have AvatarMixer ask DS for agents	2013-10-08 11:07:46 -07:00
Stephen Birarda	76cecb43cf	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-10-08 09:59:52 -07:00
ZappoMan	8baa863242	fixed PPS bugs in threaded version of PacketSender class	2013-10-07 17:34:41 -07:00
Stephen Birarda	5a7d21f529	add UUID helper class to get UUID string without braces	2013-10-07 10:56:23 -07:00