Commit graph

13723 commits

Author SHA1 Message Date
wangyix
5f62b43ba6 added edit nack types to non-verified list 2014-06-17 12:14:44 -07:00
wangyix
011e7c2de2 removed debug code 2014-06-17 11:53:09 -07:00
wangyix
8187912384 added qDebug() check in SentPacketHistory for seq numbers
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
2014-06-17 11:34:35 -07:00
wangyix
6e71523346 added OctreeEditPacketSender::nodeKilled(), no locks yet
also added nodeKilled() calls to the 3 editsenders in
Application::nodeKilled()
2014-06-17 10:58:44 -07:00
wangyix
dc71f87ea4 edit nacks seem to be working;
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
2014-06-17 10:42:56 -07:00
wangyix
06f8464ec9 edit nacks ready for test; seq numbers sometimes repeat?? 2014-06-16 17:17:48 -07:00
wangyix
e3db60d1ef forgot to add "break;"s 2014-06-16 16:42:04 -07:00
wangyix
4d84e1fff1 added processNackPacket calls to DatagramProcessor 2014-06-16 16:41:00 -07:00
wangyix
18a9d74b88 changed OctreeEditPacketSender to queue packets for resend as nack is parsed 2014-06-16 16:35:30 -07:00
wangyix
95b2524784 removed magic number 65536 from OctreeInboundPacketProcessor 2014-06-16 16:08:48 -07:00
wangyix
5e37704772 SentPacketHistory now handles rollover
updated SentPacketHistory path in comments
2014-06-16 15:59:38 -07:00
wangyix
ddfe98ad43 added code to parse nack packets in OctreeEditPacketSender 2014-06-16 15:32:39 -07:00
wangyix
14f50f4576 removed old SentPacketHistory 2014-06-16 14:05:27 -07:00
wangyix
69c2a2d12b moved SentPacketHistory to libraries/networking/src 2014-06-16 14:04:21 -07:00
wangyix
0f7ce694c0 minor changes before moving SentPacketHistory 2014-06-16 13:52:01 -07:00
wangyix
ebfd65dea8 added OctreeInboundPacketProcessor::process() override to send nack periodically
added code to remove dead nodes' stats in sendNackPackets()
2014-06-16 12:30:16 -07:00
wangyix
2b20720f51 added sendNackPackets() to OctreeInboundPacketProcessor
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
wangyix
b210b07b81 rollovers are now handled in SingleSenderStats::trackInboundPacket 2014-06-13 11:08:15 -07:00
wangyix
3d4fae4b3f Revert "added code for AC to send nack packets; no locking yet"
This reverts commit 15bd0878c4.
2014-06-13 09:58:56 -07:00
wangyix
1491216962 Revert "added locking on _singleSenderStats; untested!"
This reverts commit c542da9707.
2014-06-13 09:58:45 -07:00
wangyix
c542da9707 added locking on _singleSenderStats; untested! 2014-06-12 12:03:22 -07:00
wangyix
15bd0878c4 added code for AC to send nack packets; no locking yet 2014-06-12 11:37:05 -07:00
wangyix
7955979599 added _missingSequenceNumbers tracking to OctreeInboundPacketProcessor 2014-06-12 09:17:12 -07:00
wangyix
7aef5edb8f removed debug var 2014-06-11 15:27:24 -07:00
wangyix
0601c24b24 removed debug prints 2014-06-11 15:26:22 -07:00
wangyix
ac0b037f0f removed connect(); put call into Application::nodeKilled
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
2014-06-11 15:25:00 -07:00
wangyix
a8c9780004 updated connect() to qt5 format 2014-06-11 12:13:27 -07:00
wangyix
2080cc3dee removed debug variable 2014-06-11 11:59:15 -07:00
wangyix
decd6109fb made nodeKilled signatures match 2014-06-11 11:57:54 -07:00
wangyix
760627003f killNode() to nodeKilled() 2014-06-11 11:11:04 -07:00
wangyix
fc07ceb412 added killNode() slot for _packetCounts garbage collection 2014-06-11 10:54:44 -07:00
wangyix
01005dc792 Merge remote-tracking branch 'upstream/master' 2014-06-11 10:09:49 -07:00
AndrewMeadows
49a33ff46a Merge pull request #3006 from ey6es/metavoxels
Streaming/delta-streaming for script values.
2014-06-11 09:25:39 -07:00
Andrzej Kapolka
f677858891 Merge pull request #3009 from ZappoMan/bugFix
fix some bugs in models
2014-06-10 16:56:56 -07:00
Andrzej Kapolka
bdbed066a8 Merge pull request #3008 from AndrewMeadows/bug-fix
fix for broken neck on some body models
2014-06-10 16:54:06 -07:00
wangyix
c6a9a8924d changed NetworkPacket::_sendingNode to ::_node 2014-06-10 16:43:53 -07:00
wangyix
5ab271330e moved sendNack() into packetDistributor()
...for the purpose of enforcing packets sent per interval in
OctreeSendThread.  Corrected mistake in keeping track of number of
special packets sent where sendSpecialPacket() was assumed to only send
one packet per call.
2014-06-10 15:35:48 -07:00
ZappoMan
0ae7411bf0 fix some bugs in models 2014-06-10 13:37:53 -07:00
wangyix
b96b6c9857 added default constructor for NetworkPacket
updated param comments in ReceivedPacketProcessor
2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4 VoxelPacketProcessor -> OctreePacketProcessor
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
2014-06-10 11:05:51 -07:00
Andrew Meadows
c9ba71aa01 fix for broken neck on some body models 2014-06-10 09:38:38 -07:00
Brad Hefta-Gaub
f3fb39574f Merge pull request #3007 from wangyix/master
Added Developer menu option to disable nack packets.
2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b var name change again 2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f nackdisable to disablenack 2014-06-09 17:41:20 -07:00
wangyix
de61029f05 Added dev menu option to disable nack packets 2014-06-09 17:30:09 -07:00
Andrzej Kapolka
d1549b00ab Might as well include strings in the "simple" random script objects. 2014-06-09 17:22:44 -07:00
Andrzej Kapolka
3293ab788b Fix for script object deltas. 2014-06-09 17:19:36 -07:00
Andrzej Kapolka
496b0f1673 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-09 16:52:03 -07:00
Andrzej Kapolka
590f045ed1 Script value streaming tests, fixes. 2014-06-09 16:51:41 -07:00
Andrzej Kapolka
78ad06f61c Merge pull request #3005 from AndrewMeadows/bug-fix
Fix IK for hydra hands.
2014-06-09 16:29:11 -07:00