2071 commits

Author	SHA1	Message	Date
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Anthony J. Thibault	2a9adafc09	Bumped avatar packet version number	2015-11-25 12:13:40 -08:00
samcake	a1668cdc73	Let the AssertClient JS interface use global vars	2015-11-23 22:28:59 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Clément Brisset	5d75fcbfce	Merge pull request #6430 from birarda/unique_linked_data ... use a unique_ptr for linkedData in Node	2015-11-20 15:01:41 -08:00
Brad Hefta-Gaub	c7673aad4a	Merge pull request #6447 from huffman/polyline-texture ... Add texture property to polyline entity type	2015-11-20 13:31:34 -08:00
Brad Davis	eef01f8a13	Merge pull request #6443 from ZappoMan/assetJS ... fix crash with no asset server	2015-11-20 12:58:16 -08:00
Stephen Birarda	b34934b849	resolve conflicts on merge with upstream/master	2015-11-20 11:52:53 -08:00
Brad Hefta-Gaub	f1badc017b	CR feedback	2015-11-20 11:43:50 -08:00
Brad Hefta-Gaub	caa8b0b5b6	fix unix build	2015-11-20 11:07:01 -08:00
Brad Hefta-Gaub	4bbfcb6092	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub	0e5e33446e	handle old protocol case	2015-11-20 09:57:30 -08:00
Brad Hefta-Gaub	abf169ebd9	fix senderID in messages, dry up code	2015-11-20 09:03:21 -08:00
Brad Hefta-Gaub	5c6cd9b06c	fix thread safety and crash with no asset server	2015-11-19 18:53:12 -08:00
Brad Hefta-Gaub	f80a765a29	add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:28:20 -08:00
Stephen Birarda	271387f96e	use a unique_ptr for linkedData in Node	2015-11-18 18:03:31 -08:00
Stephen Birarda	08e6b63090	cleanup debug of received domain-server settings	2015-11-18 15:43:31 -08:00
Stephen Birarda	f2ecce6043	use safer domain settings request in audio-mixer	2015-11-18 15:13:29 -08:00
Stephen Birarda	1a066abb26	fix some indentation for UDT_CONNECTION_DEBUG lines	2015-11-18 14:43:56 -08:00
Stephen Birarda	65142a3963	clean up agent comment for domain settings request	2015-11-18 14:20:56 -08:00
Ryan Huffman	3d0afc3c5f	Update entities version number for polyline change	2015-11-18 14:00:00 -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