17 commits

Author	SHA1	Message	Date
Stephen Birarda	a4ea0f035a	resolve conflicts on merge with upstream master	2013-08-05 09:56:07 -07:00
ZappoMan	86bf268eef	first cut at multiple voxel servers	2013-07-29 14:56:33 -07:00
Stephen Birarda	f8e7e1de66	modifications to hook shared classes to iOS	2013-07-24 13:05:02 -07:00
Stephen Birarda	8d34c707a1	Merge branch 'master' of github.com:worklist/hifi into assignee	2013-07-22 14:04:09 -07:00
Stephen Birarda	01e6891fd3	save custom domain server hostname to QSettings	2013-07-18 17:23:52 -07:00
Stephen Birarda	45d82dc97c	correct reference to new hostname for Qt temp variable changes	2013-07-18 15:20:05 -07:00
Stephen Birarda	6844490dbe	merge branch assignee with upstream/master	2013-07-16 09:17:39 -07:00
Stephen Birarda	d389dc6e3a	add method to NodeList to set domain IP to local, move mutex lock to node	2013-07-15 15:17:10 -07:00
Stephen Birarda	12697c6b14	add method to clear the NodeList	2013-07-15 14:30:13 -07:00
Stephen Birarda	d6601ad333	resolve conflicts on merge with upstream master	2013-07-11 14:33:50 -07:00
Stephen Birarda	4cf0b7ea66	switch back to statics for domain server check in, fix environment packets	2013-07-11 13:40:29 -07:00
Stephen Birarda	a0226b2548	avoid static variable thread issue by switching to member variables	2013-07-11 13:02:25 -07:00
Stephen Birarda	8ed518c4a2	add a clear method to the NodeList to delete all nodes	2013-07-10 10:51:21 -07:00
Stephen Birarda	ddc684be49	put back sendAssignmentRequest method removed in merge	2013-07-08 17:14:39 -07:00
Stephen Birarda	b5a47cddc0	have stubbed Operative check in with DS	2013-07-08 16:48:53 -07:00
Stephen Birarda	5faad80e12	remove ping unknown thread, version for ping reply	2013-07-08 11:58:19 -07:00
Stephen Birarda	36c6912de8	your agents are now nodes	2013-07-03 10:35:09 -07:00