Commit graph

62 commits

Author SHA1 Message Date
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Ryan Huffman
70430c009d Fix ATP requests not keeping track of all mapping redirects 2017-08-30 14:35:12 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
2017-08-28 15:54:40 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Stephen Birarda
a59103aad5 truncate filename for relative path URL in RR 2017-08-15 15:38:47 -07:00
Stephen Birarda
100ac65975 store relative path URL in resource request on redirect 2017-08-15 15:27:44 -07:00
utkarshgautamnyu
6b969bc39d added code to record total number of ATP/HTTP/File bytes downloaded during session
Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update Application.cpp

Update Application.cpp
2017-07-12 11:13:13 -07:00
Stephen Birarda
d7b3ee9bcb check for cached ATP assets in right place 2017-05-24 19:22:44 -07:00
Stephen Birarda
a04fc41e17 don't capture strong pointer to stat tracker 2017-05-24 17:54:07 -07:00
Stephen Birarda
48c4db1ca4 nest the download stats so they are cleaner 2017-05-24 17:36:21 -07:00
Stephen Birarda
3743cd23b4 add detailed download stats for file/http/atp 2017-05-24 17:22:38 -07:00
Ryan Huffman
074a11306c Add support for atp and file urls in OBJReader 2017-05-01 13:22:02 -07:00
Stephen Birarda
7ae8c741c5 pass the byte range to asset client from AssetResourceRequest 2017-04-26 10:48:57 -07:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Stephen Birarda
504e92607a change format of debug message 2016-10-11 13:23:52 -07:00
Stephen Birarda
20ea7e6c98 change QLoggingCategory include casing 2016-10-11 13:21:53 -07:00
Stephen Birarda
07d0a038a5 set the initial last progress debug 5s back 2016-10-11 13:21:15 -07:00
Stephen Birarda
a0c27e2130 remove timer forced timeouts in ARR, occasionally ouput DL progress 2016-10-11 13:17:57 -07:00
Stephen Birarda
826c2f1a9f push the AssetResourceRequest timeout to 15s 2016-10-11 09:55:16 -07:00
Ryan Huffman
17a1f9b5ae Make timer child of QObject instead of attaching to destroyed 2016-10-05 19:25:17 -07:00
Ryan Huffman
bba5a7563f Remove extraneous logging 2016-10-05 19:25:03 -07:00
Ryan Huffman
1fff480b73 Add timeout to AssetResourceRequest 2016-10-04 16:43:12 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
Stephen Birarda
0012967734 use curly braced initialization for consts 2016-03-15 14:38:41 -07:00
Stephen Birarda
50a05df721 fix asset loading with error changes 2016-03-10 11:58:57 -08:00
Stephen Birarda
2bbeac6597 short circuit asset request for invalid hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
ae3c0f6646 add hash and path checking 2016-03-09 18:03:44 -08:00
Stephen Birarda
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -08:00
Stephen Birarda
cf5de317ba use correct error handling for MappingRequest errors 2016-03-08 12:21:54 -08:00
Stephen Birarda
08f181be76 handle mapping requests from AssetResourceRequest 2016-03-07 16:30:26 -08:00
Stephen Birarda
83b563cf9c use AssetHash alias for hash in AssetResourceRequest 2016-03-07 14:00:12 -08:00
Stephen Birarda
4bf69f20b7 fix removal of requestHash method during cherry-pick 2016-03-07 13:59:17 -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
Atlante45
5f8c3a6b4b Fix AssetResourceRequest crash 2015-10-27 10:27:37 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
Ryan Huffman
f3b513866a Fix assert in AssetResourceRequest 2015-09-14 13:39:14 -07:00
Ryan Huffman
e87fcb78cd Add proper cleanup of AssetRequest in AssetResourceRequest 2015-09-14 11:34:51 -07:00
Ryan Huffman
a5ba86514c Remove log message 2015-09-11 14:01:08 -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
Ryan Huffman
db92e3155c Update AssetServerError enum to be camelcase 2015-09-01 09:39:30 -07:00
Atlante45
3f5394281b Fix HTTPS timeout issue 2015-08-31 23:20:07 +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