Eric Levin
e7c5a24e3d
fixed packet number increment logic
2015-06-02 09:38:45 -07:00
Eric Levin
f51ad6b8da
merged master
2015-06-01 15:39:05 -07:00
Stephen Birarda
33fde7c66d
remove extra debug
2015-05-29 13:21:24 -07:00
Stephen Birarda
2207bfaf40
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls
2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd
fix fail case for DS pings
2015-05-29 12:06:07 -07:00
Seth Alves
b0f6826d17
Merge pull request #4995 from birarda/domain-dtls
...
speed up initial connection to domains
2015-05-29 10:50:01 -07:00
Stephen Birarda
e91ee7e7e3
only send add packet for nodes in interest set
2015-05-29 09:49:54 -07:00
Stephen Birarda
046828ee5d
make the LNL the parent of any Nodes it adds
2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9
cleanup debug logs for DS/node ping punch
2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6
remove NetworkPeer dtor debug, fix ICE socket
2015-05-28 16:44:34 -07:00
Stephen Birarda
493a9da43e
make sure DS log handler is cleaned up
2015-05-28 16:23:14 -07:00
Stephen Birarda
9d2e1773a0
fix memory issues for immediate ice pings
2015-05-28 15:31:21 -07:00
Stephen Birarda
da0c9fbc31
fix send of existing peer to querier
2015-05-28 14:37:16 -07:00
Stephen Birarda
e096cbe040
have ice-server immediately send peer to DS
2015-05-28 14:25:18 -07:00
Stephen Birarda
531ef1fa1c
change ice-server heartbeat behaviour
2015-05-28 14:05:43 -07:00
Stephen Birarda
eb6b80133b
immediately ping the ICE DS every 25ms
2015-05-28 13:17:48 -07:00
Stephen Birarda
81c23e9ca0
output if pinged node cannot be reached
2015-05-28 11:22:27 -07:00
Stephen Birarda
cee058c4ce
handle immediate add packets in NodeList
2015-05-28 11:02:45 -07:00
Stephen Birarda
5c75863af4
immediately send add packet from DS for new node
2015-05-28 10:45:03 -07:00
Stephen Birarda
667df66963
add packet type for DS node add
2015-05-27 18:25:38 -07:00
Stephen Birarda
0cb67cce2c
add ping timer tied to NetworkPeer
2015-05-27 18:22:23 -07:00
Stephen Birarda
757d02a600
fix reset on address lookup
2015-05-27 16:00:56 -07:00
Stephen Birarda
e6e2c4b95d
look for connection steps in LimitedNodeList
2015-05-27 15:54:39 -07:00
Stephen Birarda
734798a365
fix move of connection steps to LNL
2015-05-27 15:50:31 -07:00
Stephen Birarda
c7c542ef4c
decouple STUN from DS check in
2015-05-27 14:24:15 -07:00
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
Stephen Birarda
4b6b34836d
repair anomalies in timing table
2015-05-27 10:30:45 -07:00
Stephen Birarda
9cb6ccaa46
thread safe timing of domain connection
2015-05-26 16:49:18 -07:00
Stephen Birarda
d1489c50fe
add connection times getter to NodeList
2015-05-26 14:18:58 -07:00
Stephen Birarda
626f22191c
add a QAbstractTableModel for domain connection steps
2015-05-26 14:17:02 -07:00
Stephen Birarda
f9251471da
add audio connection to final part of connection steps
2015-05-26 10:44:45 -07:00
Stephen Birarda
f28ade1075
log connection times for eventual stats display
2015-05-26 10:37:44 -07:00
Stephen Birarda
27717db9d1
fire off DS check immediately once DS info is known
2015-05-22 16:38:26 -07:00
Stephen Birarda
69f1cd80e6
immediately send ICE heartbeat once data present
2015-05-22 16:29:01 -07:00
Andrew Meadows
461d08c0a9
merge upstream/master into andrew/bispinor
2015-05-22 11:35:02 -07:00
Eric Levin
fe99941de3
fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp
2015-05-21 19:35:27 -07:00
Seth Alves
52ce26d80d
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-21 09:20:56 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817
contain QSharedMemory for local server port to reader
2015-05-20 17:11:08 -07:00
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
b32e069f1d
bump protocol version
2015-05-19 14:45:01 -07:00
Andrew Meadows
ead1d9f4d1
formatting
2015-05-19 14:15:09 -07:00
Stephen Birarda
2eb796eca6
resolve conflicts on merge with upstream/master
2015-05-18 10:25:24 -07:00
Stephen Birarda
5645fdc8b9
send user to token creation page
2015-05-14 15:21:33 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Howard Stearns
ef187b390b
Server versioning.
2015-05-13 15:52:05 -07:00
Stephen Birarda
ca87d64dc7
fix for audio-mixer shutdown hang, removing spaces
2015-05-13 12:03:21 -07:00
Philip Rosedale
349886c146
Merge pull request #4847 from birarda/domain-paths
...
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Seth Alves
db704874b9
bump protocol version for line entities
2015-05-12 16:02:45 -07:00