Commit graph

10472 commits

Author SHA1 Message Date
Ryan Huffman
d36ed9cd0d Fix missing semicolon 2015-07-14 16:12:47 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
2015-07-14 15:59:16 -07:00
Stephen Birarda
5edb809cd1 remove header packet methods from LimitedNodeList 2015-07-14 15:54:23 -07:00
Ryan Huffman
a61fbff018 Add error handling when reading path query response 2015-07-14 15:52:28 -07:00
Stephen Birarda
b4d01c4644 fix variable name for coding standard 2015-07-14 15:52:16 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Ryan Huffman
38591a8edb Update avatar billboard loading to use packet.readAll() 2015-07-14 15:43:15 -07:00
Stephen Birarda
b7b2cb73ef remove check for shutting down 2015-07-14 15:43:10 -07:00
Stephen Birarda
ca47165d72 compare bytesAvailable to 0 2015-07-14 15:42:28 -07:00
Stephen Birarda
55eb24e69e call right method from packetReceiver 2015-07-14 15:41:31 -07:00
Stephen Birarda
e749b9727f have threaded assignment de-register for packets in finished 2015-07-14 15:33:05 -07:00
Stephen Birarda
19c1ce2d6f remove the QUDPSocket readyRead hack 2015-07-14 15:29:41 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
ef7a91af8f Make NLPacket read SourceID/VerificaitionHash methods protected 2015-07-14 15:27:38 -07:00
Ryan Huffman
47f3aad437 Update use of sendingNode->getUUID() to use packet->getSourceID instead 2015-07-14 15:23:41 -07:00
Ryan Huffman
96bd650b55 Fix NLPacket::localHeaderSize 2015-07-14 15:22:35 -07:00
Ryan Huffman
7bd10afbf2 Remove packetVersionMatch from LimitedNodeList 2015-07-14 15:22:16 -07:00
Ryan Huffman
86e4d5f631 Remove PacketReceiverListener 2015-07-14 15:12:32 -07:00
Ryan Huffman
0c02933e66 Remove LimitedNodeList::processKillNode(const QByteArray& datagram) 2015-07-14 15:09:45 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
2015-07-14 14:53:45 -07:00
Stephen Birarda
23548a99bc move NACK packet disabling to EntityEditPacketSender 2015-07-14 14:43:01 -07:00
Ryan Huffman
d49c71d132 Update a shared ptr NLPacket parameter to use NLPacket& 2015-07-14 14:42:03 -07:00
Ryan Huffman
027d131b2a Move sequence number updating to PacketReceiver 2015-07-14 14:40:39 -07:00
Stephen Birarda
1f4ac0f17c emit mutedByMixer signal for a noisy mute 2015-07-14 14:30:46 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Ryan Huffman
64bed72ae6 Add Packet::peekPrimitive 2015-07-14 14:23:10 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Stephen Birarda
fa9372875e fix headers in AvatarHashMap 2015-07-14 13:54:10 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Stephen Birarda
c63d714400 remove variables for out in PacketReceiver 2015-07-14 12:54:43 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar
Avatars rendered correctly based on Scene.shouldRenderAvatars
2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
samcake
99ae0326ad FIxing th ecompilation issue on mac, ready to ship 2015-07-13 19:17:09 -07:00
Sam Gateau
5555ccd225 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80 Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js 2015-07-13 16:18:39 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -07:00
Clément Brisset
24eb4c8263 Merge pull request #5309 from sethalves/quiet-compiler
quiet compiler
2015-07-13 15:55:35 -07:00
Stephen Birarda
57c3f0fd20 fix unmatched diagnostic pop 2015-07-13 15:40:20 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Stephen Birarda
26be492475 use same listener for many packets in AudioMixer 2015-07-13 14:46:56 -07:00
Stephen Birarda
775c1b7310 Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp 2015-07-13 14:26:23 -07:00
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Ryan Huffman
2efa2877da Update LimitedNodeList::processKillNode to work with NLPacket 2015-07-13 12:07:21 -07:00
Ryan Huffman
6a7cd7417c Update AvatarData packet processing to work with NLPacket 2015-07-13 12:07:01 -07:00