2087 commits

Author	SHA1	Message	Date
Stephen Birarda	65142a3963	clean up agent comment for domain settings request	2015-11-18 14:20:56 -08:00
Stephen Birarda	c54dffac12	fix entity-server avg ping, remove debug	2015-11-18 10:32:35 -08:00
Stephen Birarda	0e3d3451d7	make keep alive pings the responsibility of NL	2015-11-18 10:24:10 -08:00
Brad Hefta-Gaub	293914b84f	added NodeActivated signal to make it easier for users to know when a recently added node has an active socket	2015-11-17 16:31:34 -08:00
Brad Hefta-Gaub	073215d067	handle socketActivated	2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub	9c4286b6ca	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-17 15:50:54 -08:00
Stephen Birarda	f5ec458a5e	make activeSocket checks more consistent	2015-11-17 15:38:03 -08:00
Stephen Birarda	3906a747b8	fix a couple of bad checks	2015-11-17 15:33:57 -08:00
Stephen Birarda	34b8fca83b	add socketActivated signal to NetworkPeer for punch success	2015-11-17 15:04:31 -08:00
Stephen Birarda	7dfdb3c72e	protect LNL packet sending without active socket	2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub	3efbcb7062	debug the late connect case	2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub	d8a3927311	debug the late connect case	2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub	85aa3b3f83	handle subscribe when messages mixer is not available	2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub	8112b3b57e	add senderUUID to the messageReceived signal	2015-11-17 14:16:22 -08:00
Brad Hefta-Gaub	2d3fe497e4	fix typo	2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub	60ae1259fa	more cleanup work	2015-11-17 11:06:27 -08:00
Brad Hefta-Gaub	034debc483	cleanup	2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub	f9a674bca5	implement subscribe/unsubscribe in MessagesClient	2015-11-17 10:01:31 -08:00
Brad Hefta-Gaub	6b61ec569c	more work on channels	2015-11-17 09:47:50 -08:00
ZappoMan	f712fae4d2	more hacking	2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub	12f206e2f0	more work on messages	2015-11-16 17:00:03 -08:00
Brad Hefta-Gaub	40e69f6946	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub	d42a1a721f	first cut at messages-mixer	2015-11-16 15:26:17 -08:00
Stephen Birarda	584e35e4ab	have killNodeWithUUID return success to avoid double lookup	2015-11-16 10:58:11 -08:00
Stephen Birarda	ea38c4cc49	don't allow domain check-ins while shutting down	2015-11-12 18:04:15 -08:00
Stephen Birarda	6b2987eef8	handle domain server node removal in NodeList	2015-11-12 17:47:51 -08:00
Stephen Birarda	e52e9be44c	re-broadcast disconnects from domain-server	2015-11-12 17:23:39 -08:00
Stephen Birarda	1c9396d66e	handle disconnect request in domain-server	2015-11-12 15:43:03 -08:00
Stephen Birarda	8bdb81d832	send disconnect packet from node when leaving domain	2015-11-12 15:03:19 -08:00
Stephen Birarda	0a64242160	cleanup string grabbing for PacketType enum	2015-11-12 14:43:25 -08:00
Stephen Birarda	288ee0e9e8	add a NodeDisconnect packet	2015-11-12 11:39:32 -08:00
ericrius1	31fe5fa953	Bump version num, use different shader for additive blending effect	2015-11-03 17:15:10 -08:00
samcake	393f6a4c76	Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version	2015-10-30 11:35:50 -07:00
Clément Brisset	a37c94bd3c	Merge pull request #6202 from birarda/asset-parenting ... don't force parenting of AssetUpload/AssetRequest	2015-10-30 09:45:42 -07:00
Stephen Birarda	06897aa474	don't force parenting of AssetRequest/AssetUpload	2015-10-27 19:29:54 -07:00
samcake	bc7ad9d3f7	Move the keyLIght properties in their own group and add the ambientURL in	2015-10-26 09:27:06 -07:00
Brad Hefta-Gaub	b7c40c2df1	fix Queue OUT stat	2015-10-15 11:41:04 -07:00
Stephen Birarda	2caa7f6d64	change getUrl to getATPUrl, use in ATPAssetMigrator	2015-10-13 16:56:20 -07:00
Stephen Birarda	76bfc6218a	add back block removed in merge	2015-10-13 16:36:10 -07:00
Stephen Birarda	fc82ea8541	resolve conflicts on merge with upstream/master	2015-10-13 16:12:54 -07:00
Stephen Birarda	c328941b9d	Merge pull request #6074 from huffman/fix-empty-hash ... Fix crash when atp url is empty	2015-10-13 16:02:28 -07:00
Ryan Huffman	c468cabe7e	Fix crash when atp url is empty	2015-10-13 15:12:01 -07:00
Stephen Birarda	cf74cfb50e	add an ATPAssetMigrator for bulk ATP migration	2015-10-13 10:38:52 -07:00
Atlante45	b7ba99380a	Pretty up loading debug	2015-10-12 15:32:44 -07:00
Atlante45	7eadb11404	Remove optional upload caching	2015-10-12 15:09:17 -07:00
Atlante45	0e0a8301eb	Collapse line	2015-10-12 15:06:51 -07:00
Atlante45	0cdad78581	Move debug to helper functions	2015-10-12 15:03:37 -07:00
Atlante45	4abac35c72	Cache on upload	2015-10-12 15:03:37 -07:00
Atlante45	51acf07c15	Factor couple methods in AssetUtils	2015-10-12 15:03:37 -07:00