20 commits

Author	SHA1	Message	Date
Stephen Birarda	4255220a69	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-31 16:04:44 -06:00
Atlante45	15e9797827	CR	2015-08-31 22:12:42 +02:00
Stephen Birarda	de2bfd0d0d	some QThread cleanup and fix in Socket	2015-08-31 11:30:31 -07:00
Atlante45	993217491f	Retry to load only on timeout	2015-08-28 20:35:39 +02:00
Atlante45	ea05fcea0c	Forward AssetResourceRequest loading errors	2015-08-28 16:03:31 +02:00
Stephen Birarda	98888a36a3	use const ref where appropriate for asset classes	2015-08-27 21:33:37 -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	eae90cbe8a	resolve conflicts on merge with origin/protocol	2015-08-27 14:47:35 -07:00
Ryan Huffman	5aa5bca8f7	Add path to headers	2015-08-27 14:29:54 -07:00
Stephen Birarda	86a7a42d24	use compact hash representation for asset-server	2015-08-27 14:22:21 -07:00
Stephen Birarda	f3797964e2	resolve conflicts on merge with huffman/atp-server	2015-08-27 12:21:15 -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
Stephen Birarda	0f4a4b5cc1	resolve conflicts on merge with huffman/atp-server	2015-08-27 10:30:56 -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	b72e7e356d	Clean up AssertClient	2015-08-27 09:31:17 -07:00
Ryan Huffman	c2fcf5865a	Update log message for uploading assets	2015-08-26 16:02:47 -07:00
Ryan Huffman	0e98b179dd	Update Asset gettings and uploading in AssetClient	2015-08-25 16:34:44 -07:00
Ryan Huffman	a6665612fc	Add GetInfo packets to AssetClient	2015-08-03 16:30:22 -07:00
Ryan Huffman	ee5a1028f7	Add AssetClient	2015-07-23 15:08:38 -07:00