Commit graph

27822 commits

Author SHA1 Message Date
Stephen Birarda
e6f1fef6e4 remove numBytesForPacketHeader from sendStats 2015-07-07 18:02:08 -07:00
Stephen Birarda
e7e489af61 use new networking in sendPacketToIceServer 2015-07-07 18:01:17 -07:00
Stephen Birarda
402f7dc075 correct PingType_t pack and PacketList readData 2015-07-07 17:56:05 -07:00
Stephen Birarda
61960c80c8 fix PingType_t cast for icePingPacket 2015-07-07 17:53:08 -07:00
Stephen Birarda
e0aea7f955 fix QDataStream creations in LimitedNodeList 2015-07-07 17:52:33 -07:00
Stephen Birarda
7a9dbd7f2f repairs for NetworkPacket removal 2015-07-07 17:50:32 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Stephen Birarda
1cfa65a3df fix reference to NodePacketPair packet in PacketSender 2015-07-07 17:40:15 -07:00
Stephen Birarda
bf625f5af1 move JSON stats sending to a packet list 2015-07-07 17:39:58 -07:00
Stephen Birarda
88f8f692fb fix QDataStream creation with NLPacket 2015-07-07 17:31:14 -07:00
Stephen Birarda
ccb632cd39 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-07 16:58:45 -07:00
Stephen Birarda
cc045c2a30 fix using for NodePacketPair typedef 2015-07-07 16:57:41 -07:00
Stephen Birarda
6c6143f21e remove NetworkPacket and replace with NodePacketPair 2015-07-07 16:56:05 -07:00
Atlante45
fa43c62722 RingBufferHistory handles unique_ptr 2015-07-07 16:45:43 -07:00
Atlante45
9cfa422ef8 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 16:41:47 -07:00
Stephen Birarda
30840422ad use NLPacket::createCopy in NetworkPacket 2015-07-07 16:35:59 -07:00
Atlante45
ac9e3b0326 More compile fixes 2015-07-07 16:34:52 -07:00
Stephen Birarda
ff487ee092 move the AudioClient mix packet 2015-07-07 16:30:50 -07:00
Atlante45
ac89571a79 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 16:28:21 -07:00
Atlante45
fcd11461c2 Added NLPacket::createCopy 2015-07-07 16:27:48 -07:00
Stephen Birarda
2a69a89696 Merge remote-tracking branch 'huffman/atp' into atp 2015-07-07 16:27:18 -07:00
Ryan Huffman
60538d4a82 Merge branch 'atp' of github.com:birarda/hifi into atp
Conflicts:
	libraries/audio-client/src/AudioIOStats.cpp
2015-07-07 16:26:22 -07:00
Atlante45
e0119e8767 Fix a couple packet types names 2015-07-07 16:26:20 -07:00
Stephen Birarda
2ab9cd7a9a replace payload with getPayload 2015-07-07 16:25:56 -07:00
Atlante45
833f36e88e Comment deprecated methods 2015-07-07 16:25:39 -07:00
Stephen Birarda
32e75fcee8 actually reset the NLPacket for audio to start writing 2015-07-07 16:25:21 -07:00
Ryan Huffman
3690ecc28f Add std::move to sendPacket calls 2015-07-07 16:24:11 -07:00
Stephen Birarda
631c745784 allow equal for piggyback check in OctreeSendThread 2015-07-07 16:21:14 -07:00
Stephen Birarda
6a76f858d8 close of PacketList not required to count last packet 2015-07-07 16:17:15 -07:00
Stephen Birarda
20b0f4f3d1 force the unordered PacketList 2015-07-07 16:15:59 -07:00
Stephen Birarda
191ede4675 Merge remote-tracking branch 'huffman/atp' into atp 2015-07-07 16:15:03 -07:00
Stephen Birarda
1f68ad892a replace PacketList usage with NLPacketList 2015-07-07 16:14:57 -07:00
Andrew Meadows
30dd9728eb Merge pull request #5271 from howard-stearns/fight-club-scripts
Baseline versions of the scripts we've been handing around for fight-club.
2015-07-07 16:13:07 -07:00
Andrew Meadows
f1b505d46b Merge pull request #5266 from howard-stearns/expose-avatar-collisions-to-scripts
Expose avatar collisions to scripts, ...
2015-07-07 16:12:18 -07:00
Stephen Birarda
6d502405ef resolve conflicts on merge with Atlante45/protocol 2015-07-07 16:12:07 -07:00
Stephen Birarda
018831e230 Merge remote-tracking branch 'huffman/protocol' into atp 2015-07-07 16:10:07 -07:00
Stephen Birarda
71e8c0f5cf use getPayload instead of constData in PacketList 2015-07-07 16:07:54 -07:00
Stephen Birarda
b5eb4945ab fix packet segmentation in PacketList 2015-07-07 16:06:09 -07:00
Stephen Birarda
bb15326676 repair send of path query packet 2015-07-07 16:02:21 -07:00
Stephen Birarda
05be8199c8 make broadcastToNodes take NLPacket unique ptr 2015-07-07 15:55:33 -07:00
Stephen Birarda
5728cf5056 fix ping methods in LNL 2015-07-07 15:54:18 -07:00
Atlante45
d496b33ae6 Compile fixes 2015-07-07 15:51:29 -07:00
Stephen Birarda
eac3a2a640 packet repairs for AudioInjector 2015-07-07 15:50:32 -07:00
Atlante45
1932703fec Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-07 15:49:45 -07:00
Andrew Meadows
e4ec049f50 Merge pull request #5265 from jherico/oglplus
Updating oglplus version and switching to url based dist
2015-07-07 15:49:36 -07:00
Stephen Birarda
e35217836f send correct packet in AudioIOStats 2015-07-07 15:46:48 -07:00
Stephen Birarda
60797a26ea CR fixes for new networking in AudioClient 2015-07-07 15:45:16 -07:00
Atlante45
79d1a9f6c8 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 15:45:12 -07:00