Commit graph

119 commits

Author SHA1 Message Date
Ryan Huffman
c9bd67bc3e Add MappingRequest superclass and mapping specific errors 2016-03-08 11:18:10 -08:00
Ryan Huffman
e3523c8604 Remove commented out function 2016-03-08 10:28:31 -08:00
Ryan Huffman
7db296fa69 Remove unused get/set/deleteMapping in AssetServer 2016-03-08 10:23:48 -08:00
Ryan Huffman
6ca4b72479 Add deleteMapping to asset scripting interface 2016-03-08 10:11:57 -08:00
Ryan Huffman
a18486d97d Fix GetAllMappingsRequest not storing mappings 2016-03-08 10:11:37 -08:00
Ryan Huffman
cf9d4c256a Add proper cache checking to GetAssetMapping 2016-03-08 10:10:48 -08:00
Stephen Birarda
bf8a2bc9e5 update read for get mapping to toHex 2016-03-08 10:03:29 -08:00
Ryan Huffman
bc99e871e1 Add asset mapping cache 2016-03-07 16:51:49 -08:00
Ryan Huffman
37c0417ea6 Add GetAll and Delete mapping requests 2016-03-07 16:31:49 -08:00
Stephen Birarda
e6ce517041 remove committed version control marker 2016-03-07 13:57:41 -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
7dd436a7a8 Add AssetScriptingInterface methods for mapping 2016-03-07 13:52:04 -08:00
Ryan Huffman
462f00077c Add get/set mapping request 2016-03-07 13:50:57 -08:00
Ryan Huffman
6b485cf81d Update atp mapping operations to use a single packet 2016-03-07 13:49:55 -08:00
Ryan Huffman
6dd3b1b4ee Add AssetScriptingInterface methods for mapping 2016-03-07 13:23:27 -08:00
Ryan Huffman
4e7b63c72e Add get/set mapping request 2016-03-07 13:23:00 -08:00
Ryan Huffman
db98e46bb8 Update atp mapping operations to use a single packet 2016-03-01 16:18:35 -08:00
Atlante45
7b179ab91a First draft for mapping requests 2016-03-01 13:08:46 -08:00
Atlante45
14ae35e741 CR 2016-03-01 12:00:43 -08:00
Atlante45
4944d0a8d0 Handle threading inside AssetServer 2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b Temporary fix to disk cache editor crash 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Ryan Huffman
242167ebf2 Remove debug messages 2015-11-30 11:52:07 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
samcake
a1668cdc73 Let the AssertClient JS interface use global vars 2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub
f1badc017b CR feedback 2015-11-20 11:43:50 -08:00
Brad Hefta-Gaub
5c6cd9b06c fix thread safety and crash with no asset server 2015-11-19 18:53:12 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -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
Stephen Birarda
06897aa474 don't force parenting of AssetRequest/AssetUpload 2015-10-27 19:29:54 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Stephen Birarda
cf74cfb50e add an ATPAssetMigrator for bulk ATP migration 2015-10-13 10:38:52 -07:00
Atlante45
88d073b4ac More disk cache debug info 2015-09-16 15:20:48 +02: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
42d21e4dc1 Update AssetClient's node killed handling to check if node is asset server first 2015-09-14 11:56:47 -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
42b4c7d423 Update AssetClient to handle disconnections from a node 2015-09-11 14:01:08 -07:00
Ryan Huffman
3ae323cb2e Move pending requests in AssetClient to include node sent to 2015-09-11 14:01:08 -07:00
Ryan Huffman
4ed3e36181 Update AssetClient::create* methods to not block on invokeMethod 2015-09-11 14:01:08 -07:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Stephen Birarda
2849d80274 use the exact payload size where possible 2015-09-09 10:39:53 -07:00
Stephen Birarda
e7e1f5fe5c make all of AssetClient packets reliable 2015-09-09 10:35:31 -07:00
Clément Brisset
0733ba54c7 Win build fixes 2015-09-01 18:23:44 +01:00
Ryan Huffman
899b94eab3 Add cstdint include to Asset* files 2015-09-01 09:41:19 -07:00
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