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

2045 commits

Author SHA1 Message Date
Stephen Birarda
6a186ad1fe ensure a handshake goes out the first time 2015-09-15 09:48:17 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Stephen Birarda
a27e0e7cc7 remove an unused alias 2015-09-14 17:18:22 -07:00
Stephen Birarda
84ab4fd585 force minimum for p_hrc time_point values 2015-09-14 17:16:42 -07: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
15b809bd16 Merge pull request #5795 from birarda/phrc 
fix high resolution timing for VS2012 in networking
 2015-09-14 13:49:20 -07:00
Stephen Birarda
d82fd9a6ed Merge pull request #5797 from huffman/fix-assert 
Fix assert in AssetResourceRequest
 2015-09-14 13:40:13 -07:00
Ryan Huffman
f3b513866a Fix assert in AssetResourceRequest 2015-09-14 13:39:14 -07:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill 
DO NOT MERGE: Cleanup asset requests on node kill
 2015-09-14 13:08:01 -07:00
Ryan Huffman
29d26a1f9a Fix namespace issues std:: template specialization 2015-09-14 12:17:36 -07: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
e87fcb78cd Add proper cleanup of AssetRequest in AssetResourceRequest 2015-09-14 11:34:51 -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
Stephen Birarda
302fd923b8 Merge branch 'master' of https://github.com/highfidelity/hifi into phrc 2015-09-14 11:21:37 -07:00
Stephen Birarda
9b926f6f04 add an hrc with proper resolution for < VC2015 2015-09-14 11:21:08 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
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