32 commits

Author	SHA1	Message	Date
Stephen Birarda	50a05df721	fix asset loading with error changes	2016-03-10 11:58:57 -08:00
Stephen Birarda	9c53f40fbe	remove nullptr check in AssetMappingsScriptingInterface	2016-03-10 10:52:05 -08:00
Stephen Birarda	2bbeac6597	short circuit asset request for invalid hash	2016-03-10 10:52:05 -08:00
Stephen Birarda	267ed3af82	remove client side handling of extension for ATP hash URLs	2016-03-07 13:57:02 -08:00
Ryan Huffman	7317d3b2ea	Revert AssetRequest back to using hash	2016-03-07 13:53:29 -08:00
Ryan Huffman	5849befb3d	Add caching back to AssetRequest	2015-11-30 11:53:53 -08:00
Ryan Huffman	4220d7a3cc	Add atp hash checking back in	2015-11-30 09:13:59 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Ryan Huffman	f0ad7f85dc	Add readHead* to ReceivedMessage	2015-11-18 15:30:30 -08:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Stephen Birarda	2caa7f6d64	change getUrl to getATPUrl, use in ATPAssetMigrator	2015-10-13 16:56:20 -07:00
Atlante45	0cdad78581	Move debug to helper functions	2015-10-12 15:03:37 -07:00
Atlante45	51acf07c15	Factor couple methods in AssetUtils	2015-10-12 15:03:37 -07:00
Atlante45	dd0244b15d	Added a couple comments	2015-09-16 15:17:15 +02:00
Atlante45	9678e70444	Asset caching	2015-09-16 15:17:15 +02:00
Atlante45	eabee9857a	Enum coding standard	2015-09-16 15:17:14 +02:00
Ryan Huffman	b0ffb50fdf	Move assertion in AssetRequest below error checking ... If the request had an error then there is no reason the assertion should be true.	2015-09-14 15:48:11 -07:00
Ryan Huffman	b8c1c279c6	Update AssetRequest::State enum to use camelcase	2015-09-14 11:22:55 -07:00
Ryan Huffman	6468046c68	Update AssetClient callbacks to return whether a response was received	2015-09-14 11:22:34 -07:00
Ryan Huffman	b564ceb76f	Add network error to AssetRequest	2015-09-11 14:01:08 -07:00
Stephen Birarda	973fd80c1d	fail asset request if hash does not match	2015-09-10 15:24:37 -07:00
Ryan Huffman	70c937d37f	Replace NO_ERROR with NoError	2015-09-01 12:31:30 -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	98888a36a3	use const ref where appropriate for asset classes	2015-08-27 21:33:37 -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	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
Ryan Huffman	92dbe9997c	Clean up AssetRequest	2015-08-27 09:31:50 -07:00
Ryan Huffman	260404f1fb	Add AssetRequest	2015-08-03 16:23:57 -07:00