1767 commits

Author	SHA1	Message	Date
Stephen Birarda	cf98d4a8f7	add a control packet type for LightACK	2015-08-28 07:31:44 -07:00
Stephen Birarda	d908cd4a53	use NotStarted instead of Unsent, return NotFound for Files	2015-08-28 06:35:02 -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	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	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
Stephen Birarda	183a2ab996	Merge pull request #18 from Atlante45/protocol ... Cleanup connections	2015-08-27 14:41:00 -07:00
Ryan Huffman	dabea21d66	Remove unused variable	2015-08-27 14:30:48 -07:00
Ryan Huffman	5aa5bca8f7	Add path to headers	2015-08-27 14:29:54 -07:00
Stephen Birarda	f238c1b167	include the extension in upload confirmation	2015-08-27 14:29:42 -07:00
Stephen Birarda	1da9eeab1f	handle double handshake in Connection	2015-08-27 14:27:29 -07:00
Stephen Birarda	86a7a42d24	use compact hash representation for asset-server	2015-08-27 14:22:21 -07:00
Ryan Huffman	4fcfd5b8f8	Fix indentation	2015-08-27 13:58:28 -07:00
Ryan Huffman	b401a62d7f	Disable request limiting for ATP requests in ResourceCache	2015-08-27 13:58:17 -07:00
Ryan Huffman	33d6f561eb	Reintroduce request limit in ResourceCache	2015-08-27 12:52:11 -07:00
Ryan Huffman	b30a008162	Fix bug with NetworkTexture occasionally breaking on assert	2015-08-27 12:48:55 -07:00
Stephen Birarda	f3797964e2	resolve conflicts on merge with huffman/atp-server	2015-08-27 12:21:15 -07:00
Stephen Birarda	16eee10cab	repairs to permission error for asset-server upload	2015-08-27 12:13:20 -07:00
Stephen Birarda	c212ef5734	fix PacketReceiver cleanup, return permission error for upload	2015-08-27 12:01:24 -07:00
Ryan Huffman	a49a1eb0d6	Add extension to atp requests	2015-08-27 11:51:45 -07:00
Stephen Birarda	f92ee597e5	fix width of asset upload dialog to fit ATP url	2015-08-27 11:32:03 -07:00
Brad Hefta-Gaub	7b2f944f48	Merge pull request #5561 from ericrius1/particleExtensions ... Extended Particle entity to allow for more varied effects	2015-08-27 10:45:03 -07:00
Stephen Birarda	0f4a4b5cc1	resolve conflicts on merge with huffman/atp-server	2015-08-27 10:30:56 -07:00
Ryan Huffman	c6493b1720	Remove extension from hash in AssetResourceRequest	2015-08-27 10:27:12 -07:00
Stephen Birarda	513cae0d40	thread the AssetUpload so it doesn't take over main	2015-08-27 10:23:02 -07:00
Ryan Huffman	667db200c0	Cleanup BatchLoader	2015-08-27 09:39:12 -07:00
Ryan Huffman	8765329a46	Add ASSET_TOO_LARGE to AssetUtils	2015-08-27 09:32:39 -07:00
Ryan Huffman	92dbe9997c	Clean up AssetRequest	2015-08-27 09:31:50 -07:00
Ryan Huffman	15854c6715	Make AssetClient methods private	2015-08-27 09:31:34 -07:00
Ryan Huffman	b72e7e356d	Clean up AssertClient	2015-08-27 09:31:17 -07:00
Stephen Birarda	c277584f2e	Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload	2015-08-27 09:17:25 -07:00
Ryan Huffman	c2fcf5865a	Update log message for uploading assets	2015-08-26 16:02:47 -07:00
Ryan Huffman	d66c521200	Move SendAssetTask to separate file	2015-08-26 15:37:23 -07:00
Stephen Birarda	0450e84008	Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload	2015-08-26 15:30:25 -07:00
Stephen Birarda	9e286666b5	add UDT to comment for Connection cleanup	2015-08-26 14:55:59 -07:00
Stephen Birarda	c340c34b38	add comments for PacketReceiver TODOs	2015-08-26 14:53:05 -07:00