12197 commits

Author	SHA1	Message	Date
Ryan Huffman	019d234ffd	Replace std::bind for methods that use std::unique_ptr with a lambda	2015-09-01 11:58:33 -07:00
Ryan Huffman	899b94eab3	Add cstdint include to Asset* files	2015-09-01 09:41:19 -07:00
Ryan Huffman	db92e3155c	Update AssetServerError enum to be camelcase	2015-09-01 09:39:30 -07:00
Ryan Huffman	791652557e	Fix friend declaration in Socket from udt::UDTTest to UDTTest	2015-08-31 17:32:00 -07:00
Ryan Huffman	e36c2b8567	Remove extra curly brace	2015-08-31 16:55:35 -07:00
Stephen Birarda	33f1302d1f	Merge branch 'atp' of github.com:birarda/hifi into atp	2015-08-31 16:04:58 -06:00
Stephen Birarda	4255220a69	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-31 16:04:44 -06:00
Ryan Huffman	423370dccb	Merge pull request #37 from birarda/upload-task ... add a task for upload in asset-server	2015-08-31 14:55:37 -07:00
Clément Brisset	745f8dfa1b	Merge pull request #39 from huffman/ordered-insertion ... Update message handling to use insertion sort	2015-08-31 23:46:06 +02:00
Atlante45	0de4c02e8d	Add time unit in debug	2015-08-31 23:24:14 +02:00
Atlante45	3f5394281b	Fix HTTPS timeout issue	2015-08-31 23:20:07 +02:00
Atlante45	8f74935e96	Don't reload on error	2015-08-31 22:34:16 +02:00
Atlante45	9a9c703a78	Some code cleanup	2015-08-31 22:31:24 +02:00
Atlante45	15e9797827	CR	2015-08-31 22:12:42 +02:00
Ryan Huffman	e8fba991fa	Update raw loop to use find_if for message packet sorting	2015-08-31 12:35:41 -07:00
Stephen Birarda	04d23f6cc2	Merge branch 'timers-from-thread' into atp	2015-08-31 11:50:35 -07:00
Stephen Birarda	46d90b4f31	make sure syn timer is moved to Socket thread	2015-08-31 11:40:06 -07:00
Stephen Birarda	de2bfd0d0d	some QThread cleanup and fix in Socket	2015-08-31 11:30:31 -07:00
Atlante45	6657cecb7a	Merge branch 'protocol' of https://github.com/birarda/hifi into popup	2015-08-31 19:52:46 +02:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Ryan Huffman	fc80745c08	Update message handling to use insertion sort	2015-08-30 20:03:15 -07:00
Stephen Birarda	7937101a58	fix define for UDT_CONNECTION_DEBUG	2015-08-29 14:44:18 -07:00
Stephen Birarda	b81f996366	add network logging to SendQueue, fix ctor order	2015-08-29 14:38:07 -07:00
Stephen Birarda	e67a3e8541	use define to hide verbose connection debugging	2015-08-29 14:36:46 -07:00
Stephen Birarda	2b0b883db2	remove debug for writeReliablePacket invoke	2015-08-29 14:28:50 -07:00
Stephen Birarda	71ff855d86	add connection cleanup that respects send/receive	2015-08-29 14:28:24 -07:00
Stephen Birarda	d16894d2c5	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-28 16:41:49 -07:00
Stephen Birarda	441a5d34bf	don't go inactive in sync	2015-08-28 16:36:07 -07:00
Stephen Birarda	42105dfc33	replace mutexes with invoked methods in Socket	2015-08-28 16:34:24 -07:00
Brad Davis	08e4fe2dc2	Revert "Add common vector constants to JS"	2015-08-28 16:26:56 -07:00
Stephen Birarda	20d1244db4	use a write lock for sync so it can be recursive	2015-08-28 15:17:44 -07:00
Stephen Birarda	abffc0317b	expire the connection if it is 16 timeouts since data	2015-08-28 15:07:07 -07:00
Stephen Birarda	d6310da8c8	consider handshake ACK not received on send queue stop	2015-08-28 15:01:03 -07:00
Stephen Birarda	ee203dbe45	fix check after mutex creation	2015-08-28 14:57:22 -07:00
Stephen Birarda	a30bc79dd5	guard send queue creation with a mutex	2015-08-28 14:55:25 -07:00
Stephen Birarda	1e09321b1a	avoid creating multiple send queues from connection	2015-08-28 14:49:27 -07:00
Stephen Birarda	d1386fcb14	Merge branch 'upload-task' into atp	2015-08-28 14:19:30 -07:00
Stephen Birarda	b7d0aa062a	repairs to cleanup of send queue	2015-08-28 14:19:20 -07:00
Brad Hefta-Gaub	1e2374da87	Merge pull request #5677 from jherico/bart ... Add common vector constants to JS	2015-08-28 13:43:13 -07:00
Atlante45	bcf3fceadc	Typo	2015-08-28 22:10:54 +02:00
Atlante45	729fd96539	Fix bug where _requestLimit is stuck at 0	2015-08-28 22:10:33 +02:00
Brad Davis	2aa1976b5d	Add common vector constants to JS, add some missing quaternionin functionality	2015-08-28 13:05:39 -07:00
Stephen Birarda	b9d1f39c65	remove include in SendQueue that is unneeded	2015-08-28 12:36:48 -07:00
Atlante45	a448eb9109	Fix Asset Upload popup	2015-08-28 20:35:39 +02:00
Atlante45	993217491f	Retry to load only on timeout	2015-08-28 20:35:39 +02:00
Stephen Birarda	058a3c422b	re-remove the flow window full variable	2015-08-28 11:32:17 -07:00
Stephen Birarda	f2cb85ab09	add missing break to switch for LightACK	2015-08-28 11:16:05 -07:00
Stephen Birarda	3f85e8a2fe	add an UploadAssetTask so uploading is on diff thread	2015-08-28 11:12:52 -07:00
Ryan Huffman	c6d98f3c67	Update ResourceCache to retry an asset request when the node is unavailable	2015-08-28 10:59:38 -07:00
Stephen Birarda	9575b47e4e	don't unlock double lock outside conditional	2015-08-28 10:38:15 -07:00