Commit graph

29294 commits

Author SHA1 Message Date
Stephen Birarda
e74f47b64c use a list of pairs of pairs for ACK2 2015-07-31 18:13:11 -07:00
Stephen Birarda
5e716c36f9 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-31 17:32:32 -07:00
Atlante45
9537aea5c0 Fix nak timeout packet size 2015-07-31 17:31:30 -07:00
Stephen Birarda
22ead79988 fix another char allocation in PacketTests 2015-07-31 17:30:22 -07:00
Atlante45
667bb62f0e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 17:27:34 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Atlante45
27400df391 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 17:21:36 -07:00
Stephen Birarda
ea5da73683 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-31 17:19:23 -07:00
Stephen Birarda
df1e97c591 cleanup RTT stats, add assert for CT 2015-07-31 17:19:14 -07:00
Atlante45
2946cb7ed5 Collapse ControlPacket ctors 2015-07-31 17:15:10 -07:00
Stephen Birarda
0e3403833d make capacitySpeedDelta a double 2015-07-31 17:00:53 -07:00
Atlante45
cba51ac63d Fix congestion control 2015-07-31 16:53:43 -07:00
Stephen Birarda
15ce9aabc5 don't assert on moved CC 2015-07-31 16:52:59 -07:00
Stephen Birarda
fa6628e7eb make sure we init CongestionControl 2015-07-31 16:52:09 -07:00
Stephen Birarda
84b8fc9f06 fix casing of onACK method in CC 2015-07-31 16:41:22 -07:00
Stephen Birarda
9b6c8bcf77 update EWMA for delivery rate and bandwidth 2015-07-31 16:37:38 -07:00
Stephen Birarda
2db540ffde fix for double in PacketTimeWindow 2015-07-31 16:35:42 -07:00
Stephen Birarda
681c9afe90 add parens to PacketTimeWindow division 2015-07-31 16:31:42 -07:00
Stephen Birarda
e39611dc1c fix for PacketTimeWindow calculations 2015-07-31 16:31:08 -07:00
Atlante45
f9c8f30083 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 16:16:06 -07:00
Atlante45
7083d84372 Fix ack timestamps 2015-07-31 16:15:21 -07:00
Stephen Birarda
d420bca88e fix for ACK2 sending, output prettier stats 2015-07-31 16:14:33 -07:00
Atlante45
c5b92d319f Update stats gathering 2015-07-31 16:14:19 -07:00
Atlante45
ed614521fd Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 15:12:15 -07:00
Atlante45
fcec53bdce Fix sequence number crash 2015-07-31 15:09:58 -07:00
Stephen Birarda
ce21204151 add output of connection stats in UDTTest 2015-07-31 15:09:30 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master
fix for unique_ptr<char> allocations
2015-07-31 15:09:18 -07:00
Stephen Birarda
12ad60a6b5 add a missed char[] in OctreePacketProcessor 2015-07-31 14:48:54 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Brad Hefta-Gaub
b46a430fba Merge pull request #5468 from bwent/reset-position
Add gettable naturalPosition property for model entities
2015-07-31 11:03:27 -07:00
Atlante45
06bbb7c4f1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 11:00:22 -07:00
Atlante45
354621b33c Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 11:00:04 -07:00
Stephen Birarda
e346dbcfee seqlen fix in SendQueue 2015-07-31 10:59:06 -07:00
Stephen Birarda
ee9ae9ceec fix for vector initialization in PacketTimeWindow 2015-07-31 10:51:17 -07:00
Atlante45
9ef5f87aed Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 10:47:10 -07:00
bwent
aab1f70800 Renaming vars 2015-07-31 10:47:05 -07:00
Stephen Birarda
50c0b59ba2 handle priority of re-transmission of loss 2015-07-31 10:46:52 -07:00
Atlante45
b437f3bca9 Made connection hash hold unique ptr 2015-07-31 10:42:43 -07:00
Stephen Birarda
1ad2f515de Merge pull request #5455 from thoys/assignment-agent-ping-fix
Fixes Assignment-Agents to have no constantly reconnecting Avatar/AudioMixer
2015-07-31 10:41:52 -07:00
Atlante45
da7a8f6e2f Added new connection stats 2015-07-31 10:41:16 -07:00
Atlante45
4f8f9903c2 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 10:18:42 -07:00
bwent
67760fad79 Add gettable naturalPosition property for model entities 2015-07-31 10:15:35 -07:00
Stephen Birarda
98a53cbd72 don't require a sendQueue for control packet sending 2015-07-31 09:56:50 -07:00
Stephen Birarda
f2ab2fb08a start with a congestion window of 16, not 25 grand 2015-07-31 09:36:55 -07:00
Brad Hefta-Gaub
569ed4bbf9 Merge pull request #5452 from samcake/yellow
Migrate Linux to use GLEW and move to parity with windows for Opengl (compatibility 4.3)
2015-07-31 09:33:52 -07:00
Stephen Birarda
c2d39f0f6a make packet send period update respect max bandwidth 2015-07-31 09:02:43 -07:00
Stephen Birarda
0ea1bb578f support max bandwidth in congestion control 2015-07-31 08:57:25 -07:00
Sam Gateau
b08b2d29cc Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-30 18:40:21 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status
q
:q
wq
2015-07-30 18:27:47 -07:00
Atlante45
d7713d7aec Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 18:22:52 -07:00