Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 10:00:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36752 commits 25 branches 0 tags 1.1 GiB
Commit graph

2177 commits

Author SHA1 Message Date
Brad Hefta-Gaub
8395fb6eff normalize how ScriptCache::getScript() works relative to ResourceManager 2015-09-11 21:24:39 -07:00
Stephen Birarda
6da388f2af cleanup UDT_CONNECTION_DEBUG, add time for node timeout 2015-09-11 16:38:14 -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
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
Sam Gateau
c9ec65fd65 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 09:51:43 -07:00
Stephen Birarda
a286f4e7d0 Merge pull request #5772 from Atlante45/protocol 
Asset server node JSON stats
 2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master 
fail asset request if hash does not match
 2015-09-11 09:09:56 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
8c1fb67825 Lock nodeHash mutex for node lookup 2015-09-11 14:21:55 +02:00
Atlante45
0037a1f4a7 Win build fix 2015-09-11 14:21:55 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
08e0a8d705 AssetServer JSON stats 2015-09-11 14:21:53 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Brad Hefta-Gaub
626fcb867b CR feedback 2015-09-09 17:27:39 -07:00
Brad Hefta-Gaub
f710afbfd1 CR feedback 2015-09-09 17:26:01 -07:00
Brad Hefta-Gaub
d62945c6bf fix degenerative url scheme case 2015-09-09 17:13:16 -07:00
Stephen Birarda
f06e4eaae9 fix suppression of packet from unknown node 2015-09-09 15:20:35 -07: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
Andrew Meadows
b6cef3d1a9 fix Qt includes 2015-09-08 18:19:33 -07:00
Stephen Birarda
a3feff1bd4 put DomainServerConnectionToken back in NON_SOURCED 2015-09-08 16:19:15 -07:00
Stephen Birarda
e1c395f5ea resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
Stephen Birarda
e0a8469354 fix for sequence point warning 2015-09-08 13:42:52 -07:00
David Rowe
2325cb8ee0 Merge branch 'master' into 20669 2015-09-08 13:26:20 -07:00
Stephen Birarda
9878143661 repairs to ShaderCache for Resource changes 2015-09-08 08:58:35 -07:00
David Rowe
cb9468c311 Add colorSpread entity particle property 2015-09-07 16:27:42 -07:00
Rudi Chen
b703ce01fb Make sure libdl is linked after libcrypto. 
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
 2015-09-06 21:42:02 -04:00
David Rowe
12b8a5a1d5 Add alpha property support to ParticleEffect entities 
Add at same "level" as color so that it's available for other entity
types to use in the future.
 2015-09-05 10:23:27 -07:00
David Rowe
18bc7befee Merge branch 'master' into 20669 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-09-04 13:49:46 -07:00
David Rowe
c910da7179 Add radiusStart and radiusFinish entity particle properties 2015-09-04 12:27:18 -07:00
Stephen Birarda
875d10575f add filename rename somehow missed in previous commit 2015-09-04 12:43:43 -06:00
Stephen Birarda
3875a7d881 fix bad copy on merge to FileResourceRequest 2015-09-04 12:39:35 -06:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
David Rowe
45ff118249 Add new radiusSpread entity particle property 2015-09-03 14:55:08 -07:00
Seth Alves
3963035599 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 21:08:23 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Stephen Birarda
231ea3b240 fix namespacing for sequence number hasher 2015-09-01 15:35:50 -06:00
Stephen Birarda
f24a267d83 fix hasher for HifiSockAddr on ubuntu 2015-09-01 15:16:02 -06:00
Seth Alves
e32b9191f5 bump AvatarData protocol version 2015-09-01 13:35:58 -07:00
Stephen Birarda
6e7db4e816 Merge pull request #51 from huffman/tiemstamp-on-receive-packet-from-packetlist 
Move lastHeardMicroStamp to be updated when filtering packets
 2015-09-01 14:35:07 -06:00
Clément Brisset
a1db4c37a7 Merge pull request #42 from birarda/control-pair-probe 
send a control packet as bandwidth probe
 2015-09-01 22:33:51 +02:00
Ryan Huffman
639dbea25b Move lastHeardMicroStamp to be updated when filtering packets 2015-09-01 13:32:24 -07:00
Clément Brisset
5a8a95f367 Merge pull request #48 from huffman/win-fixes 
More Windows build fixes
 2015-09-01 21:41:56 +02:00
Ryan Huffman
70c937d37f Replace NO_ERROR with NoError 2015-09-01 12:31:30 -07:00
Ryan Huffman
b73d307210 Move std::placeholders::_1 to where they are used 2015-09-01 12:24:38 -07:00
Ryan Huffman
fb8e822fa8 Fix lines longer than 120 columns 2015-09-01 12:14:58 -07:00
Ryan Huffman
d166e6d8c3 Move UUID.cpp/h to libraries/shared 2015-09-01 12:00:43 -07:00
Ryan Huffman
cb5a49e6e4 Add missing headers needed to build on Windows 2015-09-01 11:59:45 -07:00
Ryan Huffman
019d234ffd Replace std::bind for methods that use std::unique_ptr with a lambda 2015-09-01 11:58:33 -07:00
Stephen Birarda
56d6d95df9 only process cp tail if in the right spot 2015-09-01 12:09:58 -06:00
Clément Brisset
0733ba54c7 Win build fixes 2015-09-01 18:23:44 +01:00
Stephen Birarda
6c9021c288 only send second packet of pair when required 2015-09-01 11:10:19 -06:00
Stephen Birarda
2a8250ced5 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-09-01 11:10:06 -06:00
Clément Brisset
1e8ab09cd4 Merge pull request #46 from huffman/win-fixes 
Windows build fixes
 2015-09-01 18:52:55 +02:00
Ryan Huffman
899b94eab3 Add cstdint include to Asset* files 2015-09-01 09:41:19 -07:00
Ryan Huffman
db92e3155c Update AssetServerError enum to be camelcase 2015-09-01 09:39:30 -07:00
Stephen Birarda
be78d7f3aa fix headers for move of UUID to shared 2015-09-01 10:20:06 -06:00
Stephen Birarda
4824b38465 move UUID back to shared 2015-09-01 10:17:07 -06:00
Ryan Huffman
791652557e Fix friend declaration in Socket from udt::UDTTest to UDTTest 2015-08-31 17:32:00 -07:00
Ryan Huffman
e36c2b8567 Remove extra curly brace 2015-08-31 16:55:35 -07:00
Stephen Birarda
8d3788c2b6 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-08-31 17:33:53 -06:00
Stephen Birarda
adad752860 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-08-31 16:07:27 -06:00
Stephen Birarda
33f1302d1f Merge branch 'atp' of github.com:birarda/hifi into atp 2015-08-31 16:04:58 -06:00
Stephen Birarda
4255220a69 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-31 16:04:44 -06:00
Ryan Huffman
423370dccb Merge pull request #37 from birarda/upload-task 
add a task for upload in asset-server
 2015-08-31 14:55:37 -07:00
Clément Brisset
745f8dfa1b Merge pull request #39 from huffman/ordered-insertion 
Update message handling to use insertion sort
 2015-08-31 23:46:06 +02:00
Atlante45
0de4c02e8d Add time unit in debug 2015-08-31 23:24:14 +02:00
Atlante45
3f5394281b Fix HTTPS timeout issue 2015-08-31 23:20:07 +02:00
Atlante45
8f74935e96 Don't reload on error 2015-08-31 22:34:16 +02:00
Atlante45
9a9c703a78 Some code cleanup 2015-08-31 22:31:24 +02:00
Atlante45
15e9797827 CR 2015-08-31 22:12:42 +02:00
Ryan Huffman
e8fba991fa Update raw loop to use find_if for message packet sorting 2015-08-31 12:35:41 -07:00
Stephen Birarda
04d23f6cc2 Merge branch 'timers-from-thread' into atp 2015-08-31 11:50:35 -07:00
Stephen Birarda
46d90b4f31 make sure syn timer is moved to Socket thread 2015-08-31 11:40:06 -07:00
Stephen Birarda
de2bfd0d0d some QThread cleanup and fix in Socket 2015-08-31 11:30:31 -07:00
Stephen Birarda
181c8a8b65 handle packet probe when no data available 2015-08-31 10:48:45 -07:00
Ryan Huffman
fc80745c08 Update message handling to use insertion sort 2015-08-30 20:03:15 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Stephen Birarda
7937101a58 fix define for UDT_CONNECTION_DEBUG 2015-08-29 14:44:18 -07:00
Stephen Birarda
b81f996366 add network logging to SendQueue, fix ctor order 2015-08-29 14:38:07 -07:00
Stephen Birarda
e67a3e8541 use define to hide verbose connection debugging 2015-08-29 14:36:46 -07:00
Stephen Birarda
2b0b883db2 remove debug for writeReliablePacket invoke 2015-08-29 14:28:50 -07:00
Stephen Birarda
71ff855d86 add connection cleanup that respects send/receive 2015-08-29 14:28:24 -07:00
Stephen Birarda
d16894d2c5 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 16:41:49 -07:00
Stephen Birarda
441a5d34bf don't go inactive in sync 2015-08-28 16:36:07 -07:00
Stephen Birarda
42105dfc33 replace mutexes with invoked methods in Socket 2015-08-28 16:34:24 -07:00
Stephen Birarda
20d1244db4 use a write lock for sync so it can be recursive 2015-08-28 15:17:44 -07:00
Stephen Birarda
abffc0317b expire the connection if it is 16 timeouts since data 2015-08-28 15:07:07 -07:00
Stephen Birarda
d6310da8c8 consider handshake ACK not received on send queue stop 2015-08-28 15:01:03 -07:00
Stephen Birarda
ee203dbe45 fix check after mutex creation 2015-08-28 14:57:22 -07:00
Stephen Birarda
a30bc79dd5 guard send queue creation with a mutex 2015-08-28 14:55:25 -07:00
Stephen Birarda
1e09321b1a avoid creating multiple send queues from connection 2015-08-28 14:49:27 -07:00
Stephen Birarda
d1386fcb14 Merge branch 'upload-task' into atp 2015-08-28 14:19:30 -07:00
Stephen Birarda
b7d0aa062a repairs to cleanup of send queue 2015-08-28 14:19:20 -07:00
Atlante45
bcf3fceadc Typo 2015-08-28 22:10:54 +02:00
Atlante45
729fd96539 Fix bug where _requestLimit is stuck at 0 2015-08-28 22:10:33 +02:00
Stephen Birarda
b9d1f39c65 remove include in SendQueue that is unneeded 2015-08-28 12:36:48 -07:00
Atlante45
a448eb9109 Fix Asset Upload popup 2015-08-28 20:35:39 +02:00
Atlante45
993217491f Retry to load only on timeout 2015-08-28 20:35:39 +02:00
Stephen Birarda
058a3c422b re-remove the flow window full variable 2015-08-28 11:32:17 -07:00
Stephen Birarda
f2cb85ab09 add missing break to switch for LightACK 2015-08-28 11:16:05 -07:00
Stephen Birarda
3f85e8a2fe add an UploadAssetTask so uploading is on diff thread 2015-08-28 11:12:52 -07:00
Ryan Huffman
c6d98f3c67 Update ResourceCache to retry an asset request when the node is unavailable 2015-08-28 10:59:38 -07:00
Stephen Birarda
9575b47e4e don't unlock double lock outside conditional 2015-08-28 10:38:15 -07:00
Stephen Birarda
54cd430be9 unlock if double lock succeeds but queues not empty 2015-08-28 10:35:29 -07:00
Stephen Birarda
ac3a1d54b1 don't lock in while for maybeResendPacket 2015-08-28 10:07:01 -07:00
Stephen Birarda
d66375bb09 fix queue timeout for empty queue 2015-08-28 09:54:51 -07:00
Stephen Birarda
577b6bf62f correct the check for flow window size 2015-08-28 09:52:33 -07:00
Stephen Birarda
e662209754 use a QMutex instead of QReadWriteMutex 2015-08-28 09:48:55 -07:00
Stephen Birarda
dcd5a4aec2 address comments in code review 2015-08-28 09:47:25 -07:00
Stephen Birarda
21c80e45c2 guard connection addition by a mutex in Socket 2015-08-28 09:42:52 -07:00
Stephen Birarda
539108dd45 repairs for new timeout code 2015-08-28 09:26:32 -07:00
Stephen Birarda
0b712eef55 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 09:10:12 -07:00
Stephen Birarda
77aeae7dc0 change to timeout behaviour to re-send unACKed packets 2015-08-28 09:10:06 -07:00
Sam Gateau
8ea8eea08d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-28 08:13:10 -07:00
Stephen Birarda
cf98d4a8f7 add a control packet type for LightACK 2015-08-28 07:31:44 -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
d908cd4a53 use NotStarted instead of Unsent, return NotFound for Files 2015-08-28 06:35:02 -07:00
Ryan Huffman
a7294eb0e5 Add AccessDenied error for failure to open File in FileResourceRequest 2015-08-27 22:48:15 -07:00
Ryan Huffman
2a4b25dd76 Update names of ResourceRequest enums 2015-08-27 22:23:06 -07:00
Stephen Birarda
341e27fecc unlock mutexes before calling notify 2015-08-27 22:02:08 -07:00
Stephen Birarda
98888a36a3 use const ref where appropriate for asset classes 2015-08-27 21:33:37 -07:00
Stephen Birarda
111abac0f1 Merge pull request #30 from huffman/cache-limit 
Update ResourceCache to only emit failure when not retrying
 2015-08-27 21:17:16 -07:00
Ryan Huffman
147fbd4b54 Update ResourceCache to only emit failure when not retrying 2015-08-27 21:11:12 -07:00
Stephen Birarda
5fc09a68a8 add an assert that enqueued packet is part of message 2015-08-27 17:24:57 -07:00
Stephen Birarda
33dc65a00a fix for return of processable packets 2015-08-27 17:09:47 -07:00
Stephen Birarda
8ebcb03b2b don't process duplicate or pre-handshake packets 2015-08-27 16:55:13 -07:00
Ryan Huffman
4bbbd892bd Fix atp scheme checking in ResourceCache 2015-08-27 16:46:33 -07:00
Ryan Huffman
31bdeed396 Remove cache limit for atp urls 2015-08-27 16:43:40 -07:00
Stephen Birarda
413ec718de fix max pairs for timeout NAK 2015-08-27 15:22:53 -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
549c514400 fix upload leak, return error for failed load 2015-08-27 15:12:08 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
eae90cbe8a resolve conflicts on merge with origin/protocol 2015-08-27 14:47:35 -07:00
Stephen Birarda
c80c4a9b45 resolve conflicts on merge with origin/protocol 2015-08-27 14:45:22 -07:00
Stephen Birarda
183a2ab996 Merge pull request #18 from Atlante45/protocol 
Cleanup connections
 2015-08-27 14:41:00 -07:00
Ryan Huffman
dabea21d66 Remove unused variable 2015-08-27 14:30:48 -07:00
Ryan Huffman
5aa5bca8f7 Add path to headers 2015-08-27 14:29:54 -07:00
Stephen Birarda
f238c1b167 include the extension in upload confirmation 2015-08-27 14:29:42 -07:00
Stephen Birarda
1da9eeab1f handle double handshake in Connection 2015-08-27 14:27:29 -07:00
Stephen Birarda
86a7a42d24 use compact hash representation for asset-server 2015-08-27 14:22:21 -07:00
Ryan Huffman
4fcfd5b8f8 Fix indentation 2015-08-27 13:58:28 -07:00
Ryan Huffman
b401a62d7f Disable request limiting for ATP requests in ResourceCache 2015-08-27 13:58:17 -07:00
Ryan Huffman
33d6f561eb Reintroduce request limit in ResourceCache 2015-08-27 12:52:11 -07:00
Ryan Huffman
b30a008162 Fix bug with NetworkTexture occasionally breaking on assert 2015-08-27 12:48:55 -07:00
Stephen Birarda
f3797964e2 resolve conflicts on merge with huffman/atp-server 2015-08-27 12:21:15 -07:00
Stephen Birarda
16eee10cab repairs to permission error for asset-server upload 2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734 fix PacketReceiver cleanup, return permission error for upload 2015-08-27 12:01:24 -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
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions 
Extended Particle entity to allow for more varied effects
 2015-08-27 10:45:03 -07:00
Stephen Birarda
0f4a4b5cc1 resolve conflicts on merge with huffman/atp-server 2015-08-27 10:30:56 -07:00
Ryan Huffman
c6493b1720 Remove extension from hash in AssetResourceRequest 2015-08-27 10:27:12 -07:00
Stephen Birarda
513cae0d40 thread the AssetUpload so it doesn't take over main 2015-08-27 10:23:02 -07:00
Sam Gateau
4f7b857130 Merge 2015-08-27 10:01:39 -07:00
Ryan Huffman
667db200c0 Cleanup BatchLoader 2015-08-27 09:39:12 -07:00
Ryan Huffman
8765329a46 Add ASSET_TOO_LARGE to AssetUtils 2015-08-27 09:32:39 -07:00
Ryan Huffman
92dbe9997c Clean up AssetRequest 2015-08-27 09:31:50 -07:00
Ryan Huffman
15854c6715 Make AssetClient methods private 2015-08-27 09:31:34 -07:00
Ryan Huffman
b72e7e356d Clean up AssertClient 2015-08-27 09:31:17 -07:00
Stephen Birarda
c277584f2e Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-27 09:17:25 -07:00
Ryan Huffman
c2fcf5865a Update log message for uploading assets 2015-08-26 16:02:47 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Ryan Huffman
d66c521200 Move SendAssetTask to separate file 2015-08-26 15:37:23 -07:00
Stephen Birarda
0450e84008 Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-26 15:30:25 -07:00
Stephen Birarda
9e286666b5 add UDT to comment for Connection cleanup 2015-08-26 14:55:59 -07:00
Stephen Birarda
c340c34b38 add comments for PacketReceiver TODOs 2015-08-26 14:53:05 -07:00
Stephen Birarda
d3b19f36fd don't use remove_if since it can't be used on associative 2015-08-26 14:43:09 -07:00
Stephen Birarda
4039c2e3e0 fix for asset-server naming, deadlock in timeout/wait 2015-08-26 14:27:12 -07:00
Ryan Huffman
2e585256ff Update asset hash to Sha256 2015-08-26 14:20:24 -07:00
Ryan Huffman
269d5bb6da Resolve bugs with *Cache changes 2015-08-26 14:04:55 -07:00
Stephen Birarda
352f3543c3 resolve conflicts on merge with ds-cleanup 2015-08-26 13:33:50 -07:00
Stephen Birarda
f16e0a63ee add a string for asset-server node type 2015-08-26 13:29:40 -07:00
Stephen Birarda
d039930ca3 resolve conflicts on merge with clement/protocol 2015-08-26 12:50:13 -07:00
Stephen Birarda
413c3a4fd7 Merge branch 'handshake' into asset-upload 2015-08-26 12:45:00 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Atlante45
5b5dc94335 Make DoubleLock thread-safe but not self-unlocked 2015-08-26 20:03:04 +02:00
Atlante45
b1fa12cc43 Better debug message 2015-08-26 19:38:24 +02:00
Atlante45
cd8d6df287 Use high_resolution_clock instead of clock 2015-08-26 19:36:18 +02:00
Atlante45
7a5ed24485 typo (I can't spell inactive correctly) 2015-08-26 19:31:33 +02:00
Stephen Birarda
3a918eedca resolve conflicts on merge with upstream master 2015-08-26 10:01:24 -07:00
Ryan Huffman
c878eb0cd9 Fix atomics not being initialized in SendQueue 2015-08-26 09:31:03 -07:00
Ryan Huffman
868558b4f0 Add registration of QSharedPointer<NLPacketList> meta type 2015-08-26 09:29:46 -07:00
Ryan Huffman
24faab2089 Add sendPacketList that take Node 2015-08-26 09:29:15 -07:00
Atlante45
3184dee10a Emit queueInnactive when flow window is full for too long 2015-08-26 17:49:17 +02:00
Atlante45
8049819beb Tweak DoubleLock 2015-08-26 17:11:32 +02:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Atlante45
6958a31efe Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-26 16:37:45 +02:00
Atlante45
c96632d4b6 Cleanup connection on node kills 2015-08-26 16:07:47 +02:00
Atlante45
373d4b8944 Remove connection from socket when innactive 
If innactive for more than 5 seconds, remove it from hash
 2015-08-26 15:53:49 +02:00
Atlante45
00b224e769 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 14:57:31 +02:00
Clément Brisset
2745cc5d12 Merge pull request #15 from birarda/wait-condition 
add a wait condition in SendQueue if there's nothing to do
 2015-08-26 14:57:16 +02:00
Sam Gateau
1e9fce2a61 Drafting the materials for FBXReader 2015-08-25 22:12:51 -07:00
Stephen Birarda
d5e77ba907 clear the pending received messages on handshake receive 2015-08-25 18:26:30 -07:00
Stephen Birarda
54f2dc54f6 add a condition_variable wait_until to not lock for handshake 2015-08-25 18:23:50 -07:00
Stephen Birarda
0ce8e05f19 reset the receiver's state on handshake 2015-08-25 18:01:37 -07:00
Stephen Birarda
82f5e2e04f skip processing of control packets before handshake 2015-08-25 17:26:25 -07:00
Stephen Birarda
83d76084f1 don't process packets in Connection without handshake 2015-08-25 17:14:41 -07:00
Stephen Birarda
cabdee8391 send a handshake before first packet send 2015-08-25 17:12:03 -07:00
Ryan Huffman
0bfa0c4942 Add progress to AssetResourceRequest 2015-08-25 16:35:41 -07:00
Ryan Huffman
0e98b179dd Update Asset gettings and uploading in AssetClient 2015-08-25 16:34:44 -07:00
Ryan Huffman
12b2dfb2f9 Clean up HTTPResourceRequest 2015-08-25 15:45:00 -07:00
Ryan Huffman
3eff605d72 Update asset server number 2015-08-25 15:44:37 -07:00
Ryan Huffman
1e6ff8a1e4 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-25 15:25:52 -07:00
Ryan Huffman
3959928bbb Update ResourceRequest::moveData to getData 2015-08-25 15:20:00 -07:00
Ryan Huffman
2efba00e3e Update BasePacket::read to do a copy 2015-08-25 15:19:07 -07:00
Ryan Huffman
6bba2f4cb1 Update Packet to properly copy packet position and message number 2015-08-25 15:18:40 -07:00
Ryan Huffman
c1b9613a30 Update PacketList::writeData() to be non-recursive 2015-08-25 14:58:56 -07:00
Atlante45
1878920ba4 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 21:43:37 +02:00
Stephen Birarda
61507bde09 fix order of member initialization in PacketList 2015-08-25 11:24:26 -07:00
Stephen Birarda
9ff7bfd0b5 some header cleanup in UDTTest output 2015-08-25 11:21:04 -07:00
Stephen Birarda
5e5bd77870 add initialization for all atomics in SendQueue 2015-08-25 09:55:21 -07:00
Stephen Birarda
c8ba24817f fix for hash specialization for QUuid 2015-08-24 17:09:52 -07:00
Stephen Birarda
f7799bcf8f add TODO for settings fail, cleanup 2015-08-24 17:02:47 -07:00
Stephen Birarda
e84595af49 add a wait condition for empty queue and loss list 2015-08-24 17:02:40 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Ryan Huffman
4191ccd60d Move *ResourceRequest objects to separate files 2015-08-24 12:16:20 -07:00
ericrius1
13892db866 removed logging 2015-08-24 11:41:03 -07:00
Atlante45
f802f354ca prefer scoped locker to unlocks 2015-08-21 15:36:03 +02:00
Brad Davis
c3991dbb8c Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor 
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
 2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations. 
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
 2015-08-20 18:59:51 -07:00
Stephen Birarda
1756e60647 complete test for ordered packets in udt-test target 2015-08-20 14:22:05 -07:00
Ryan Huffman
0a290da529 Merge branch 'ordered-sending' into atp-server 2015-08-20 11:50:06 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Stephen Birarda
74d6e5ba89 make sure LNL goes down before domain-server 2015-08-20 10:01:12 -07:00
Ryan Huffman
bb15811f6b Merge remote-tracking branch 'clement/protocol' into ordered-sending 2015-08-20 09:14:04 -07:00
Atlante45
f6854782a4 Debug/Lock cleanup 2015-08-20 14:57:35 +02:00
Atlante45
62c76d0332 registerListenerForTypes optimisations 2015-08-20 14:56:35 +02:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin 
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
 2015-08-19 15:59:04 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
Ryan Huffman
7305135125 Update ResourceManager 2015-08-19 12:16:34 -07:00
Ryan Huffman
4827d326f4 Update ResourceCache to allow multiple downloads on the same resource 2015-08-19 12:11:47 -07:00
Ryan Huffman
d18ce5066f Fix error with Assignment::Type not being hashable 2015-08-19 11:55:06 -07:00
Ryan Huffman
121d3a77ad Fix iterator usage in SendQueue 2015-08-19 11:27:31 -07:00
Ryan Huffman
fc29297d87 Update SendQueue::queuePacketList to use splice 2015-08-19 10:55:26 -07:00
Ryan Huffman
df51069305 Rename getAllData to getMessage 2015-08-19 10:39:19 -07:00
Ryan Huffman
ebf112e200 Replace NLPacketList::getSourceID() with const& return 2015-08-19 10:03:52 -07:00
Ryan Huffman
5ba3280975 Remove <list> include in NLPacketList 2015-08-19 10:01:16 -07:00
Ryan Huffman
f2b4c0e269 Merge listener signatures into intializer list in PacketListener 2015-08-19 09:03:31 -07:00
Ryan Huffman
f5aac5f086 Remove unused include 2015-08-19 09:02:17 -07:00
Ryan Huffman
3c5483a008 Fix style issue with const 2015-08-19 08:59:05 -07:00
Ryan Huffman
10cd315a10 Fix QMutexLocker in PacketReceiver 2015-08-19 08:58:53 -07:00
Ryan Huffman
c6a8ccd490 Replace usage of qDebug with qCDebug in PacketReceiver 2015-08-19 08:56:48 -07:00
Ryan Huffman
cda0aaf7cf Update PacketReceiver to use scoped locks 2015-08-19 08:54:24 -07:00
Ryan Huffman
92dadb437c Replace magic number '30' for number of bits in message number 2015-08-18 23:15:47 -07:00
Ryan Huffman
97bb36add4 Add constant for message line size 2015-08-18 23:11:47 -07:00
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -07:00
Ryan Huffman
62eaaed9e5 Add PacketList support to LimitedNodeList 2015-08-18 23:10:05 -07:00
Ryan Huffman
0b3986ef9b Replace NLPacket unique_ptr ctor with && ctor 2015-08-18 23:09:02 -07:00
Ryan Huffman
9154067cfb Add PacketList interface to PacketReceiver 2015-08-18 23:08:25 -07:00
Ryan Huffman
69a2d0b5b0 Add 32-bit message data to packet header 2015-08-18 23:07:54 -07:00
Ryan Huffman
46d5f73e4e Add support for creating NLPacketList from PacketList 2015-08-18 23:07:08 -07:00
Ryan Huffman
8032f05ed6 Add support for generating PacketList from received data 2015-08-18 23:06:30 -07:00
Ryan Huffman
5cb028cf43 Add support for PacketList to SendQueue 2015-08-18 23:05:07 -07:00
Ryan Huffman
9c65849037 Add ordered sending to Socket and Connection 2015-08-18 23:04:32 -07:00
Stephen Birarda
e4c1de7845 fix variable names for sourced/verified 2015-08-18 17:15:09 -07:00
Stephen Birarda
bd56a5074d inline a curly bracket after template 2015-08-18 12:10:05 -07:00
Stephen Birarda
a58c6b9320 remove CC close given that it is not called 2015-08-18 12:09:28 -07:00
Stephen Birarda
bc7d8d7029 change UDT note comment 2015-08-18 12:06:45 -07:00
Stephen Birarda
23c6e8bd45 fixes for packet version bumps 2015-08-18 12:03:49 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Stephen Birarda
1c3543febc use string style hashing for IPv6 addresses 2015-08-18 11:39:04 -07:00
Stephen Birarda
bf919f105a add a simple container-test, speed HifiSockAddr hashing 2015-08-18 11:29:07 -07:00
Stephen Birarda
b7d779bb25 put back branching for signed Type 2015-08-18 09:56:00 -07:00
Stephen Birarda
426a8909e1 wait on the SendQueue thread in Connection 2015-08-18 09:40:13 -07:00
Stephen Birarda
4e540828bd use mod in place of branching for SequenceNumber 2015-08-18 09:33:22 -07:00
Stephen Birarda
f039851f13 remove std namespacing from Connection 2015-08-17 16:57:42 -07:00
Stephen Birarda
75e7de3019 remove getConnectionSockAddrs vector move 2015-08-17 16:49:08 -07:00
Stephen Birarda
d9f445d5f6 put custom hashing for UUID in UUIDHasher 2015-08-17 16:45:15 -07:00
Stephen Birarda
abf07dc06d move hasher for UUID to UUID.h 2015-08-17 16:39:52 -07:00
Stephen Birarda
2ec4d8ff3c rename return of HifiSockAddr objects for connections 2015-08-17 16:39:12 -07:00
Stephen Birarda
d89c54112d cleanup indentation in Socket 2015-08-17 16:35:23 -07:00
Stephen Birarda
fe100695f0 rename dest to destination for SendQueue 2015-08-17 16:29:21 -07:00
Stephen Birarda
feddb613e2 add comments, use scoped locker in SendQueue 2015-08-17 16:28:33 -07:00
Stephen Birarda
1c176e55ed add some comments to PacketTimeWindow 2015-08-17 16:13:14 -07:00
Stephen Birarda
71b2d90c64 clarify comment in LossList header 2015-08-17 16:08:34 -07:00
Stephen Birarda
bc6846e08c fix a typo in Connection header 2015-08-17 16:07:55 -07:00
Stephen Birarda
8c22627f32 fix a typo in comment 2015-08-17 16:07:29 -07:00
Stephen Birarda
ec82e65aec comment flow window size changes for light ACK 2015-08-17 16:07:07 -07:00
Stephen Birarda
42b5b37b96 force timeout NAK to fit MTU 2015-08-17 15:47:43 -07:00
ZappoMan
014bf661fa bump packet version 2015-08-17 11:18:25 -07:00
Eric Levin
ec25d7994c bumped protocol number for new particle properties 2015-08-14 21:58:22 -07:00
ZappoMan
44fcf71f07 change domain to be 32k and still have origin centered at 0 2015-08-14 15:26:49 -07:00
ZappoMan
5fdd7304aa Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-14 09:33:53 -07:00
Leonardo Murillo
b345d75e4d More cleanup and showing version in ds web gui 2015-08-13 16:44:28 -06:00
Leonardo Murillo
7c4813f1cf Another versioning checkpoint + cleanup 2015-08-13 16:35:55 -06:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Howard Stearns
daae750d68 No symbolic names for non-entity contants. 2015-08-12 16:40:00 -07:00