Commit graph

10427 commits

Author SHA1 Message Date
Stephen Birarda
c63d714400 remove variables for out in PacketReceiver 2015-07-14 12:54:43 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -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
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
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Stephen Birarda
e5d8a39dde update DomainServer to new packet receive API 2015-07-13 11:11:52 -07:00
Stephen Birarda
1dccc144e7 fix compile errors after PacketReceiver changes 2015-07-13 10:10:22 -07:00
Stephen Birarda
c23899aec2 repairs to packet listener registration 2015-07-13 10:02:53 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Seth Alves
fb23eb0faf Merge pull request #5301 from samcake/yellow
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Seth Alves
87152a4de2 Merge pull request #5302 from AndrewMeadows/astatine
cleanup of ObjectActionSpring and AvatarActionHold
2015-07-12 11:17:09 -07:00
Andrew Meadows
9ce9c541de fix activation of object when action changes 2015-07-10 18:45:40 -07:00
Stephen Birarda
d85fbbfb74 update NodeList for new packet receive code 2015-07-10 17:45:23 -07:00
Stephen Birarda
4442bb55d6 resolve conflicts on merge with huffman/receive_packets 2015-07-10 16:47:27 -07:00
Stephen Birarda
990f7b7332 changes for new packet receive API 2015-07-10 16:45:44 -07:00
Ryan Huffman
fe5b17f061 Remove readPendingDatagrams from ThreadedAssignment 2015-07-10 16:15:05 -07:00
Brad Davis
c1b72db18d Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -07:00
Ryan Huffman
1c212ba1a1 Disable disabling of entity nack packet temporarily 2015-07-10 15:01:45 -07:00
Ryan Huffman
d74ce12098 Remove declaration processAvatarMixerDatagram from AvatarHashMap 2015-07-10 15:01:21 -07:00
Brad Davis
200cbd7e8d Merge pull request #5303 from ZappoMan/animationGlitch
fix motor proteins in cell science
2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162 fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change 2015-07-10 12:43:35 -07:00
Stephen Birarda
2d1c3e27da fix parameter matching in PacketReceiver 2015-07-10 12:27:44 -07:00
Andrew Meadows
294c1ba367 always serialize ACTION_TYPE_SPRING 2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d cleanup of ObjectActionSpring 2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b handle case where action params are missing 2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5 add checks for NaN 2015-07-10 12:25:11 -07:00
Ryan Huffman
972c465bdb Remove PacketReceiver copy ctor and = operator 2015-07-10 12:25:01 -07:00
Ryan Huffman
2f0c21a603 Temporarily disable packet dispatching in PacketReceiver 2015-07-10 12:24:35 -07:00
Ryan Huffman
5a862739aa Fix shared ptr call in AvatarHashMap 2015-07-10 12:24:17 -07:00
Stephen Birarda
528fac6b84 rework of PacketReceiver registration API, HifiSockAddr packet getter 2015-07-10 12:22:25 -07:00
samcake
014802fd45 Merge pull request #5277 from venkatn93/gpuquery
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
Niraj Venkat
2e5fd04d9e Fix to get build working on Linux 2015-07-10 11:27:34 -07:00
Sam Gateau
2c05349b06 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
Ryan Huffman
83dedd0a15 Add todo to move PacketReceiver to its own thread 2015-07-10 09:37:43 -07:00
Ryan Huffman
d009bf826e Update PacketReceiver to use QSharedPointer<NLPacket> 2015-07-10 08:46:21 -07:00
Ryan Huffman
ec0fc81b86 Update EntityEditPacketSender to use QSharedPointer<NLPacket> 2015-07-10 08:46:11 -07:00
Ryan Huffman
4db3b309b5 Update AvatarHashMap to use QSharedPointer<NLPacket> 2015-07-10 08:45:54 -07:00
Ryan Huffman
28a1059232 Update AudioClient to use QSharedPointer<NLPacket> 2015-07-10 08:45:39 -07:00
Brad Hefta-Gaub
89231adc19 Merge pull request #5299 from jherico/homer
Performance optimizations in transform buffers and geometry cache
2015-07-09 19:16:15 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 18:54:06 -07:00