Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45374 commits 75 branches 59 tags 1.2 GiB
Commit graph

2723 commits

Author SHA1 Message Date
Zach Pomerantz
1e8d45aecb Put ScriptableResource state enum in prototype 2016-04-27 19:20:43 -07:00
Zach Pomerantz
0c78d5bdd1 Change ScriptableResource signal to state 2016-04-27 19:20:42 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Zach Pomerantz
6b53c1e85d Avoid leaking ScriptableResource 2016-04-27 11:55:02 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Brad Hefta-Gaub
f0659a985c Merge pull request #7726 from Atlante45/fix/pmtu-disc-fail 
Fix for path MTU discovery fail
 2016-04-22 12:24:44 -07:00
Seth Alves
4561962db1 Merge pull request #7736 from huffman/fix/asset-request-crash 
Fix AssetClient not properly cleaning up canceled requests
 2016-04-22 11:45:26 -07:00
Ryan Huffman
1416e397e4 Merge branch 'playEntityCollisionSound-crash' of github.com:sethalves/hifi into fix/asset-request-crash 2016-04-22 10:02:00 -07:00
Stephen Birarda
5ea8b83745 use noquote so URLs are not quoted 2016-04-21 17:16:21 -07:00
Zach Pomerantz
069065dc23 Fix recursive invokes of ResourceCache::prefetch 2016-04-21 17:15:11 -07:00
Stephen Birarda
19702a9cd4 cleanup check for resource retry 2016-04-21 17:14:07 -07:00
Stephen Birarda
8cd330f431 add back on fail when server unavailable 2016-04-21 17:07:29 -07:00
Stephen Birarda
3a8c2144bf move asset retry debug to print before retry 2016-04-21 16:55:49 -07:00
Ryan Huffman
9e46b43489 Add threading related asserts to AssetClient 2016-04-21 16:39:57 -07:00
Ryan Huffman
da5bbe51d1 Fix AssetClient not properly disconnecting from callbacks 2016-04-21 16:37:21 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Seth Alves
b088191966 Merge pull request #7731 from huffman/fix/asset-request-crash 
Fix AssetRequest crash where signal was not disconnected
 2016-04-21 15:22:08 -07:00
Brad Davis
e9959df2df Decoupling resourcecache from nodelist 2016-04-21 14:46:09 -07:00
Ryan Huffman
63d98b1b5c Fix AssetRequest crash where signal was not disconnected 2016-04-21 12:12:04 -07:00
Zach Pomerantz
2fd88d9fe1 Add sanity check to ResourceCache::updateTotalSize 2016-04-21 10:45:51 -07:00
Zach Pomerantz
cba5bff89e Make ResourceCache::prefetch private and comment 2016-04-21 10:33:35 -07:00
Brad Hefta-Gaub
f9c4959578 remove some debugging, tweak formatting 2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Atlante45
778c19d7e4 Make sure the socket allows fragmenting 2016-04-21 08:38:08 -07:00
Zach Pomerantz
92e372f385 Expose Resource progress as a signal 2016-04-20 20:18:22 -07:00
Zach Pomerantz
1a0a623d5f Report ScriptableResource memory cost to engine 2016-04-20 20:18:22 -07:00
Zach Pomerantz
5ec82fa43d Add release invokable to ScriptableResource 2016-04-20 20:18:22 -07:00
Zach Pomerantz
825431829d Add url property to ScriptableResource 2016-04-20 20:18:22 -07:00
Zach Pomerantz
df4857947b Add prefetch overload for texture specificity 2016-04-20 20:18:22 -07:00
Zach Pomerantz
8ad8b5d0d9 Return ScriptableResource from prefetch 2016-04-20 20:14:15 -07:00
Zach Pomerantz
74e1f817a5 Add prefetch to all resource caches 2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Atlante45
492bc75d68 Reduce max packet size to 1492 2016-04-20 15:58:01 -07:00
Zach Pomerantz
2cc48a6ca6 Add url to resource retry debug 2016-04-20 12:20:05 -07:00
Ryan Huffman
92339bf5fc Merge pull request #7701 from birarda/udt-fixes 
use nextPacketTimestamp to catch up, not stay ahead
 2016-04-19 12:57:43 -07:00
Brad Hefta-Gaub
523d365ce7 Merge pull request #7680 from Atlante45/fix/clear-atp-cache 
Don't use invalidated iterators
 2016-04-19 07:24:07 -07:00
Seth Alves
70ddd8529b Merge pull request #7684 from zzmp/fix/runaway-loading-resources 
Fix ResourceCacheSharedItems::_loadingRequests removals
 2016-04-18 15:46:45 -07:00
Stephen Birarda
9cce964013 use nextPacketTimestamp only to catch up, not stay ahead 2016-04-18 14:19:36 -07:00
Atlante45
c9fa91936a Cleanup disk cache io device 2016-04-18 14:10:51 -07:00
Zach Pomerantz
0d06d8ea93 Clear freed loading resources 2016-04-15 17:34:45 -07:00
Zach Pomerantz
d2426f30c6 Mv ResourceCacheShared to top of impl 2016-04-15 16:40:07 -07:00
Atlante45
dfc3e5d488 Don't use invalidated iterators 2016-04-15 13:57:48 -07:00
Zach Pomerantz
cff5886313 Use correct resources lock 2016-04-15 10:46:19 -07:00
Zach Pomerantz
fc9de4b7e6 Merge branch 'master' of github.com:highfidelity/hifi into fix/cache-tallies 2016-04-15 00:37:03 -07:00
Atlante45
b3b2f98f6c Merge branch 'master' of https://github.com/highfidelity/hifi into fix/clear-atp-cache 2016-04-14 17:59:36 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Zach Pomerantz
32e9c49cf0 Fix cache tallies for uncached resources 2016-04-14 17:00:20 -07:00
Seth Alves
f114888c1c Merge pull request #7665 from birarda/ice-server-redundancy 
allow domain-server to cycle through ice-servers when failing
 2016-04-14 14:36:29 -07:00
Stephen Birarda
bc0b3b38b3 remove narrowing conversion for ICE_SERVER_DEFAULT_PORT 2016-04-14 12:25:47 -07:00
Zach Pomerantz
e20acb1d42 Track resources as they fall out of cache 2016-04-13 15:44:14 -07:00
Stephen Birarda
8832a9d9ed add ICEServerHeartbeatACK packet type 2016-04-12 17:59:07 -07:00
Atlante45
0f62d5c997 clear ATP assets on domain change 2016-04-12 15:30:53 -07:00
Atlante45
7c652aa3ca Add lock on ResourceCache data structs 2016-04-12 15:30:39 -07:00
Atlante45
364f935b89 Allow cleanup of the old request 2016-04-12 13:51:11 -07:00
Atlante45
05895f628a Revert to using a Resource 2016-04-12 13:51:11 -07:00
Atlante45
5cc90ce8f0 Make sure resource req are cleaned up with there parents 2016-04-12 13:51:11 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Chris Collins
0faab41057 Merge pull request #7624 from birarda/new-home-set 
allow ATP scripts to be used by scripted Agent
 2016-04-12 09:42:14 -07:00
Stephen Birarda
1df0dce971 use ResourceRequest in Agent to handle ATP scripts 2016-04-08 14:38:26 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Clément Brisset
680ab1e38b Merge pull request #7578 from zzmp/fix/delete-resource-later 
Delete resource the Qt way
 2016-04-06 17:17:47 -07:00
Zach Pomerantz
4300f2e415 Delete resource the Qt way 2016-04-06 14:43:48 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Zach Pomerantz
107cfcf10b Change Resource setBytes->setSize 2016-04-04 13:59:57 -07:00
Zach Pomerantz
f34e951c3f Make resource cache props thread-safe 2016-04-04 13:59:56 -07:00
Zach Pomerantz
aa0245b9c2 Debug when limit of checkins reached 2016-04-04 12:22:03 -07:00
Zach Pomerantz
3c86191a59 Add resources prop to caches 2016-04-02 17:37:51 -07:00
Zach Pomerantz
b70a4d043b Expose resource cache count props 2016-04-01 19:52:42 -07:00
Seth Alves
6025a66fa1 Merge pull request #7532 from Atlante45/feat/delayed-decrease 
Delay congestion epochs first decrease
 2016-04-01 18:07:43 -07:00
Zach Pomerantz
3b45a57e1d Remove resource completely when uncached 2016-04-01 17:42:36 -07:00
Zach Pomerantz
d72c695417 Sanitize ResourceCache to expose to JS/QML 
fix sanitize
 2016-04-01 17:42:36 -07:00
Brad Hefta-Gaub
a3734eba00 Merge pull request #7535 from birarda/suppress-more 
add suppression for ring buffer and sequence number messages
 2016-04-01 13:04:32 -07:00
Ryan Huffman
0948c8cefb Fix format of long lines 2016-04-01 10:11:32 -07:00
Ryan Huffman
8e375fd076 Fix asset resource request not properly cleaning up 2016-04-01 10:08:44 -07:00
Stephen Birarda
fc8707dc05 add suppression for unreasonable sequence number messages 2016-03-31 18:04:13 -07:00
Zach Pomerantz
809b489146 Don't cache 0-sized Resources 2016-03-31 17:15:20 -07:00
Zach Pomerantz
b80f0fc8a6 Add actual byte size to Resource 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
Atlante45
31942d9a73 Code cleanup 2016-03-31 16:09:54 -07:00
Atlante45
86b425143b Use Mbps for max bandwith 2016-03-31 11:03:06 -07:00
Atlante45
c95bc1c563 Don't set _loss on delayed decrease 2016-03-30 15:58:31 -07:00
Atlante45
2e3040715b Delay congestion epoch's first decrease 2016-03-30 14:59:46 -07:00
Ryan Huffman
96a35a8f43 Fix bug where a pending asset request could receive a pending message after deletion 2016-03-29 11:33:02 -07:00
Clément Brisset
b6ce7a7db8 Merge pull request #7492 from birarda/next-packet-delta 
fix for incorrect next packet delta in udt::SendQueue
 2016-03-28 14:12:04 -07:00
Clément Brisset
19ccee5d3c Merge pull request #7490 from birarda/udt-fixes 
cleanup unused public keys in ice-server
 2016-03-28 13:48:45 -07:00
Stephen Birarda
1df7cf5c8d Merge pull request #7484 from Atlante45/fix/atp-req-limit 
Fix segfault with gxx
 2016-03-28 13:31:12 -07:00
Atlante45
659d7e7335 Fix segfault with gxx 2016-03-28 13:17:07 -07:00
Atlante45
103c6d89f2 Add Socket include to see debug macro 2016-03-28 13:11:44 -07:00
Stephen Birarda
c0b92486f9 fix incorrect next packet delta 2016-03-28 11:09:32 -07:00
Stephen Birarda
3e4b4a0fc7 cleanup un-used public keys in ice-server 2016-03-28 10:03:05 -07:00
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177 
Guard against lack of GL support to avoid crash
 2016-03-25 16:31:14 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Ryan Huffman
306425b940 Merge pull request #7475 from birarda/udt-fixes 
guard long sleeps in udt::SendQueue
 2016-03-25 13:56:45 -07:00
Stephen Birarda
d9abc79b5d return for AccountManager sendRequest if threads do not match 2016-03-25 13:37:13 -07:00
Stephen Birarda
044fb983d7 cast chrono durations to qint64 2016-03-25 13:07:54 -07:00
Stephen Birarda
ce4d56fb90 add warning for long sendqueue sleeps 2016-03-25 13:06:21 -07:00
Stephen Birarda
74e041e9aa cast chrono durations to int explicitly 2016-03-25 11:41:41 -07:00
Stephen Birarda
d8859def37 fix for AccountManagerAuth::Type register, consts 2016-03-25 10:47:06 -07:00
Stephen Birarda
0043a84234 guard the SendQueue sleep and send a user activity when weird 2016-03-25 10:22:14 -07:00
Zach Pomerantz
aad40f5de0 Drop network data after processing 2016-03-25 09:58:34 -07:00
Brad Hefta-Gaub
cd5beabf10 Revert "Drop resource data after load" 2016-03-24 20:37:16 -07:00
Zach Pomerantz
afc853572a Drop resource data after load 2016-03-24 15:50:51 -07:00
Clément Brisset
caf2595e13 Merge pull request #7452 from birarda/udt-fixes 
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
 2016-03-24 11:00:57 -07:00
Philip Rosedale
f8f0e48af9 Merge pull request #7453 from Atlante45/fix/atp-req-limit 
Make ATP respect request limit
 2016-03-24 09:20:30 -07:00
Andrew Meadows
21c770f37b Merge pull request #7441 from zzmp/clean/resource-reinsert 
Restrict Resource reinsertion
 2016-03-24 08:41:12 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
Atlante45
69c516caaf Have ATP respect request limit 2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221 fix for race in last receiver response 2016-03-23 18:23:30 -07:00
Stephen Birarda
1b322c8d01 don't oversend because of packet pairs 2016-03-23 18:07:28 -07:00
Stephen Birarda
57da7c2ba7 add handling for short circuit loss in SendQueue 2016-03-23 17:29:46 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
Zach Pomerantz
8b1a78bac0 Restrict Resource reinsertion 2016-03-23 13:00:29 -07:00
Zach Pomerantz
17aa2845a8 Add finished signal to Resource loading 2016-03-23 13:00:02 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Stephen Birarda
20c923db32 remove leaking unused method from NLPacketList 2016-03-21 17:26:49 -07:00
Brad Hefta-Gaub
a6bf84b90e Merge pull request #7399 from zzmp/fix/qml-thread 
Move QML rendering to a defined thread
 2016-03-21 15:31:42 -07:00
Atlante45
170433997c Set Asset server max bandwidth wiring 2016-03-21 14:50:18 -07:00
Atlante45
c48be75a37 Make sure everyone calls sendPeriod's setter 2016-03-21 14:50:18 -07:00
Stephen Birarda
884df5739d remove comment that indicates that onTimeout is not used 2016-03-21 14:28:55 -07:00
Stephen Birarda
0956649cdb give CongestionControl timeout event from SendQueue 2016-03-21 14:28:55 -07:00
Stephen Birarda
8e97a50957 unlock before de-activating the queue 2016-03-21 14:28:55 -07:00
Stephen Birarda
c65ab5f1ad re-check the timeout guards before acting on timeout 2016-03-21 14:28:55 -07:00
Stephen Birarda
24fd39dfa3 make sure NAKs is empty before append from timeout 2016-03-21 14:28:26 -07:00
Stephen Birarda
4fe9ad94f5 notify on the emptyCondition if an ACK is received 2016-03-21 14:28:26 -07:00
Stephen Birarda
74ae18e514 replace append with insert to work around assert 2016-03-21 14:28:26 -07:00
Stephen Birarda
b059e98ff5 fix units for timeout check on expiry 2016-03-21 14:28:26 -07:00
Stephen Birarda
b7ff94e20d put packets back in the queue if flow window is full 2016-03-21 14:28:26 -07:00
Stephen Birarda
4c5ad8a03e remove first congestion event drops 2016-03-21 14:28:26 -07:00
Stephen Birarda
08dff9c7ac handle expiry check even if a packet was sent 2016-03-21 14:28:26 -07:00
Stephen Birarda
cbcc6e3ef2 fix for last decrease sequence number 2016-03-21 14:28:26 -07:00
Stephen Birarda
93a00c3d5d don't perform a decrease during single packet loss events 2016-03-21 14:28:26 -07:00
Stephen Birarda
13a906aa20 Merge pull request #7412 from huffman/fix-handshake-packet 
Fix handshake packet being used across SendQueues
 2016-03-21 14:28:07 -07:00
Stephen Birarda
eb5ecc84ff Merge pull request #7398 from huffman/add-request-handshake 
Add HandshakeRequest packet
 2016-03-21 14:27:28 -07:00
Ryan Huffman
c515355cff Fix handshakeRequestPacket not being thread safe 2016-03-21 14:07:15 -07:00
Ryan Huffman
afb1d68f3b Fix handshake packet being used across SendQueues 2016-03-21 13:24:04 -07:00
Andrew Meadows
f58a00f75a Merge pull request #7409 from huffman/fix-handle-reply-finished 
Fix edge-case where resource can receive a signal after request deleted
 2016-03-21 13:10:24 -07:00
Ryan Huffman
4f32749c17 Fix edge-case where resource can receive a signal after request deleted 2016-03-21 11:54:41 -07:00
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Ryan Huffman
b7678f9818 Remove accidental addition of whitespace 2016-03-18 16:33:00 -07:00
Ryan Huffman
c5c35b7e89 Add HandshakeRequest packet 2016-03-18 16:30:19 -07:00
Bradley Austin Davis
16e6d9a4f9 Make shared lists thread safe 2016-03-18 11:15:35 -07:00
Zach Pomerantz
b1e020d3fd Fix threadname typo 2016-03-17 15:56:57 -07:00
Clément Brisset
35aa074955 Merge pull request #7369 from birarda/udt-slow-start 
repairs to udt SendQueue packet timing
 2016-03-16 09:44:58 -07:00
Stephen Birarda
c94e2bdc8b grab the now timestamp only when needed 2016-03-16 08:53:31 -07:00
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -07:00
Stephen Birarda
1cd16da83e do sleep timing off when next packet would have been 2016-03-15 15:28:55 -07:00
Stephen Birarda
0012967734 use curly braced initialization for consts 2016-03-15 14:38:41 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master 
Fill in the Downloads: line of the stats window
 2016-03-15 10:42:09 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Stephen Birarda
8cb602173a remove the unused member variable 2016-03-14 20:54:41 -07:00
Stephen Birarda
7858b6b0cd fix for slow start initial value with new randomization 2016-03-14 15:06:05 -07:00
Mark Johnson
b7a47d7bf2 Tabs -> Spaces 2016-03-12 17:35:57 -08:00
Mark Johnson
d868b541c4 Separate the request limit value from the active request value 
Use _requestLimit as the download limit, and track active downloads using
_requestsActive.  If the limit is changes below the active count, it will
continue downloading all active requests, but not allow new requests until
the active count gets below the limit.  If the limit increases, the pending
request queue will be checked immediately to fill the available download slots.
 2016-03-12 17:19:29 -08:00
Stephen Birarda
895920a211 short circuit upload when file cannot be opened 2016-03-11 15:19:41 -08:00
Stephen Birarda
85e203e2cb return an empty string for no error 2016-03-11 11:44:46 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Stephen Birarda
9522c2d17c add file open and write error handling 2016-03-11 11:04:34 -08:00
Stephen Birarda
6ae5ed6588 add trimming to MappingRequest ctors 2016-03-10 16:57:39 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Stephen Birarda
d077ade350 fix path regex to handle leading double slash 2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
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
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
ae3c0f6646 add hash and path checking 2016-03-09 18:03:44 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
d299ce2677 Fix missing semicolon 2016-03-09 14:56:56 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Stephen Birarda
96ba57a946 remove client side caching of ATP mappings 2016-03-09 14:24:14 -08:00
Ryan Huffman
64bd41c37f Add AssetMappingItem and extra data to items 2016-03-09 14:03:56 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Ryan Huffman
38edfe0557 Fix GetAllMappings reading 2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Clément Brisset
3f50abcd17 Merge pull request #82 from birarda/atp-rename-mapping 
add rename mapping operation for atomic rename
 2016-03-09 11:57:20 -08:00
Zach Pomerantz
54af58834a Mark Resource loaded after postprocessing 2016-03-09 10:34:07 -08:00
Stephen Birarda
87d5958eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-08 17:11:18 -08:00
Stephen Birarda
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -08:00
Stephen Birarda
181b20f673 move the AssetScriptInterface to script-engine 2016-03-08 14:49:26 -08:00
Stephen Birarda
f9f42a085a add client side handling for mapping rename 2016-03-08 14:43:55 -08:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Zach Pomerantz
925ea8bcda Add Resource::isCacheable 2016-03-08 13:30:58 -08:00
Stephen Birarda
cf5de317ba use correct error handling for MappingRequest errors 2016-03-08 12:21:54 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
e92a9c9741 fix comment for asset packet version push 2016-03-08 11:53:53 -08:00
Stephen Birarda
88c1892bf6 remove a comment block re-added in merge 2016-03-08 11:51:59 -08:00
Stephen Birarda
8107287e6c remove start from mapping request subclasses 2016-03-08 11:42:57 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Ryan Huffman
5368ae3f91 Remove extraneous thread checks in MappingRequest subclasses 2016-03-08 11:20:15 -08:00
Ryan Huffman
93d3fb5ccf Fix network error response for mapping requests 2016-03-08 11:19:08 -08:00
Ryan Huffman
c9bd67bc3e Add MappingRequest superclass and mapping specific errors 2016-03-08 11:18:10 -08:00
Ryan Huffman
e06c1591fb Remove initializer 2016-03-08 10:43:26 -08:00
Ryan Huffman
0a75a94790 Remove commented out private slot 2016-03-08 10:31:40 -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
88760d389f Merge branch 'master' of https://github.com/highfidelity/hifi into atp-mappings 2016-03-08 10:21:32 -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
Stephen Birarda
909979bab9 fix SLOT connection for local address check 2016-03-08 09:11:38 -08:00
Stephen Birarda
73b7e787d3 change signature of errorTestingLocalSocket 2016-03-08 09:09:28 -08:00
Stephen Birarda
20ab108d51 remove some debug for local socket check error 2016-03-07 18:01:57 -08:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -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
08f181be76 handle mapping requests from AssetResourceRequest 2016-03-07 16:30:26 -08:00
Stephen Birarda
12a774d47f return error if persistence fails for set/delete operations 2016-03-07 15:46:44 -08:00
Seth Alves
ee55721f79 allow sending interface-local messsages 2016-03-07 15:13:24 -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
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
19cd352a77 Add read/writeString to PacketList and Packet 2016-03-07 13:53:36 -08:00
Ryan Huffman
7317d3b2ea Revert AssetRequest back to using hash 2016-03-07 13:53:29 -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
292bc12f37 Add read/writeString to PacketList and Packet 2016-03-07 13:24:12 -08:00
Ryan Huffman
2986aa1937 Revert AssetRequest back to using hash 2016-03-07 13:23:47 -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
Stephen Birarda
04fd7bcdb2 create the directory to hold account file if not present 2016-03-01 14:42:09 -08:00
Atlante45
7b179ab91a First draft for mapping requests 2016-03-01 13:08:46 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562 Merge pull request #7217 from huffman/udt-random-seq 
Randomize initial send sequence number in UDT
 2016-03-01 12:59:10 -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
aa63dcc9d2 Add PacketType qMetaType 2016-03-01 11:36:49 -08:00
Ryan Huffman
cc9c87d281 Fix packet version mismatch not showing for domain packets 2016-03-01 11:36:49 -08:00
Ryan Huffman
548a672df9 Update DomainList version to 18 2016-02-29 15:31:38 -08:00
Ryan Huffman
04f512c99b Add extra debug to udt connection 2016-02-29 14:58:25 -08:00
Ryan Huffman
57a6cbc9dd Remove _hasReceivedData 2016-02-29 14:22:49 -08:00
Ryan Huffman
2229e397fa Move seq num initialization to handshake 2016-02-29 14:22:26 -08:00
Ryan Huffman
b442075205 Add initial seq number to handshake 2016-02-29 14:22:08 -08:00
Ryan Huffman
a7bb47fbcc Fix initialization of variables for SendQueue and Connection 2016-02-26 11:20:31 -08:00
Ryan Huffman
a0203cf9d5 Update BasePacket to 0-initialize data 2016-02-26 11:13:10 -08:00