wangyix
ce0101aa2a
fixed octreeEditPacketSender seq numbers errors; untested
2014-07-10 14:53:29 -07:00
wangyix
fd051310da
prune missing set before constructing nack packets;
...
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
2014-07-01 12:01:51 -07:00
wangyix
f2dfa6b978
fixed warnings
2014-06-30 16:10:58 -07:00
wangyix
0ae58bd7f9
added senderUUID arg to seq stats
2014-06-27 15:39:11 -07:00
wangyix
2ec04fb756
replaced old seqnum tracking code with SequenceNumberStats
2014-06-25 17:20:57 -07:00
Brad Hefta-Gaub
6d77d438ab
Merge pull request #3057 from AndrewMeadows/ragdoll
...
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
Andrew Meadows
c98631f820
merge upstream/master into andrew/ragdoll
2014-06-18 17:23:24 -07:00
wangyix
761a154a93
Merge remote-tracking branch 'upstream/master'
2014-06-18 15:59:45 -07:00
Brad Hefta-Gaub
c7b1b504b4
Merge pull request #3047 from birarda/master
...
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
wangyix
827b28ceda
Merge remote-tracking branch 'origin/master'
...
Conflicts:
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
2014-06-18 15:21:19 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
wangyix
f76b4dc1ab
made getMissingSequenceNumbers() inline
2014-06-18 13:39:49 -07:00
wangyix
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Stephen Birarda
5878b4af59
setup listener unattenuated zones for source ring buffers
2014-06-18 12:50:16 -07:00
Clément Brisset
7597191081
Merge pull request #3042 from ZappoMan/editModelFeatures
...
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
ZappoMan
26075d9d26
add support for changing the model URL of a model
2014-06-18 11:29:56 -07:00
wangyix
7cef5eeeec
replaced UINT16_MAX at 2 other places
2014-06-18 10:27:02 -07:00
wangyix
b63c88f42c
removed more spaces
2014-06-18 09:38:39 -07:00
wangyix
8c4e365958
added forgotten i++ in sendNackPackets()
...
plus minor style fixes
2014-06-18 09:28:42 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
wangyix
7f4cf3719e
added rollover handling to OctreeSceneStats
2014-06-17 16:40:08 -07:00
wangyix
bdbb12f4dc
switched edit nacks to non-verified
2014-06-17 14:35:40 -07:00
ZappoMan
4413049302
fixed a bug in inside out ray casting returning the wrong face
2014-06-17 13:05:35 -07:00
ZappoMan
9a3f8508cf
add support for inside out ray intersection on AACube and AABox
2014-06-17 12:12:53 -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
18a9d74b88
changed OctreeEditPacketSender to queue packets for resend as nack is parsed
2014-06-16 16:35:30 -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
0f7ce694c0
minor changes before moving SentPacketHistory
2014-06-16 13:52:01 -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
Andrew Meadows
92159a7ed5
Shape::get/setCenter() instead of get/setPosition()
2014-06-16 08:43:27 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
ZappoMan
23ef5b5404
added some comments
2014-06-04 10:22:19 -07:00
matsukaze
46d45a2d43
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
...
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.
Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
2014-06-02 05:55:58 -04:00
AndrewMeadows
eed2cd28ef
Merge pull request #2956 from ZappoMan/perfstats
...
Fix Ray Intersection bug that was causing low FPS... also added more performance debugging
2014-05-29 18:48:38 -07:00
ZappoMan
6a57e662ac
removed extra line
2014-05-29 18:34:11 -07:00
ZappoMan
e59e253727
fix ray intersection performance
2014-05-29 18:32:11 -07:00
