12159 commits

Author	SHA1	Message	Date
Atlante45	15e9797827	CR	2015-08-31 22:12:42 +02: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
Brad Davis	08e4fe2dc2	Revert "Add common vector constants to JS"	2015-08-28 16:26:56 -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
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
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
Stephen Birarda	54cd430be9	unlock if double lock succeeds but queues not empty	2015-08-28 10:35:29 -07:00
Stephen Birarda	ac3a1d54b1	don't lock in while for maybeResendPacket	2015-08-28 10:07:01 -07:00
Stephen Birarda	d66375bb09	fix queue timeout for empty queue	2015-08-28 09:54:51 -07:00
Stephen Birarda	577b6bf62f	correct the check for flow window size	2015-08-28 09:52:33 -07:00
Stephen Birarda	e662209754	use a QMutex instead of QReadWriteMutex	2015-08-28 09:48:55 -07:00
Stephen Birarda	dcd5a4aec2	address comments in code review	2015-08-28 09:47:25 -07:00
Stephen Birarda	21c80e45c2	guard connection addition by a mutex in Socket	2015-08-28 09:42:52 -07:00
Stephen Birarda	539108dd45	repairs for new timeout code	2015-08-28 09:26:32 -07:00
Stephen Birarda	0b712eef55	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-28 09:10:12 -07:00
Stephen Birarda	77aeae7dc0	change to timeout behaviour to re-send unACKed packets	2015-08-28 09:10:06 -07:00
Stephen Birarda	cf98d4a8f7	add a control packet type for LightACK	2015-08-28 07:31:44 -07:00
Atlante45	12fdec232b	CR	2015-08-28 16:31:02 +02:00
Atlante45	ea05fcea0c	Forward AssetResourceRequest loading errors	2015-08-28 16:03:31 +02:00
Stephen Birarda	d908cd4a53	use NotStarted instead of Unsent, return NotFound for Files	2015-08-28 06:35:02 -07:00
Brad Davis	b7dd47efcb	Merge pull request #5674 from birarda/master ... cleanup of some warnings	2015-08-27 23:34:43 -07:00
Ryan Huffman	a7294eb0e5	Add AccessDenied error for failure to open File in FileResourceRequest	2015-08-27 22:48:15 -07:00
Ryan Huffman	2a4b25dd76	Update names of ResourceRequest enums	2015-08-27 22:23:06 -07:00
Stephen Birarda	341e27fecc	unlock mutexes before calling notify	2015-08-27 22:02:08 -07:00
Stephen Birarda	98888a36a3	use const ref where appropriate for asset classes	2015-08-27 21:33:37 -07:00
Stephen Birarda	111abac0f1	Merge pull request #30 from huffman/cache-limit ... Update ResourceCache to only emit failure when not retrying	2015-08-27 21:17:16 -07:00
Ryan Huffman	147fbd4b54	Update ResourceCache to only emit failure when not retrying	2015-08-27 21:11:12 -07:00
Stephen Birarda	c5c73b7809	remove _ipd variable from OculusLegacyDisplayPlugin	2015-08-27 18:26:55 -07:00
Stephen Birarda	8ea20b5e5e	fix warning on string literal call to qFatal	2015-08-27 18:26:55 -07:00
Stephen Birarda	f7d32add0c	wrap OVR variables in ifdef for MAJOR_VERSION >= 6	2015-08-27 18:26:55 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	5fc09a68a8	add an assert that enqueued packet is part of message	2015-08-27 17:24:57 -07:00
Stephen Birarda	33dc65a00a	fix for return of processable packets	2015-08-27 17:09:47 -07:00
Stephen Birarda	8ebcb03b2b	don't process duplicate or pre-handshake packets	2015-08-27 16:55:13 -07:00
Ryan Huffman	4bbbd892bd	Fix atp scheme checking in ResourceCache	2015-08-27 16:46:33 -07:00
Ryan Huffman	31bdeed396	Remove cache limit for atp urls	2015-08-27 16:43:40 -07:00
Stephen Birarda	8ee27bca2b	remove urlAsString from Model	2015-08-27 16:00:21 -07:00
Stephen Birarda	413ec718de	fix max pairs for timeout NAK	2015-08-27 15:22:53 -07:00
Stephen Birarda	8eeb808572	Merge branch 'protocol' of github.com:birarda/hifi into asset-hash	2015-08-27 15:16:41 -07:00
Stephen Birarda	549c514400	fix upload leak, return error for failed load	2015-08-27 15:12:08 -07:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Stephen Birarda	eae90cbe8a	resolve conflicts on merge with origin/protocol	2015-08-27 14:47:35 -07:00
Stephen Birarda	c80c4a9b45	resolve conflicts on merge with origin/protocol	2015-08-27 14:45:22 -07:00