ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
Stephen Birarda
ef58453fda
turn off verbose octree packet debug
2014-07-30 18:10:11 -07:00
Stephen Birarda
eba92eb517
have the OctreeEditPacketSender emit a signal when payment is required
2014-07-30 17:21:04 -07:00
Stephen Birarda
ab1be38fd5
reset the cost of the packet back to 0 so it doesn't keep accumulating
2014-07-30 14:02:46 -07:00
Stephen Birarda
7a128e5f77
add satoshi cost to voxel packet debug
2014-07-30 10:14:51 -07:00
Stephen Birarda
66592466ad
pipe satoshi cost down to queuePacketToNodes
2014-07-30 10:05:21 -07:00
Stephen Birarda
6a534a6ff1
send along satoshi costs for voxel additions from VoxelEditPacketSender
2014-07-29 17:31:12 -07:00
Stephen Birarda
39e6d7d31b
octree packet methods can take a cost
2014-07-29 11:40:07 -07:00
ZappoMan
61d998d2ad
tweaks
2014-07-15 10:29:29 -07:00
wangyix
ce0101aa2a
fixed octreeEditPacketSender seq numbers errors; untested
2014-07-10 14:53:29 -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
wangyix
b63c88f42c
removed more spaces
2014-06-18 09:38:39 -07:00
wangyix
bdbb12f4dc
switched edit nacks to non-verified
2014-06-17 14:35:40 -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
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
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
ZappoMan
6502750e7c
removed debugging
2014-05-02 09:34:31 -07:00
ZappoMan
715e6b8e60
debugging model editing
2014-05-02 09:10:30 -07:00
Atlante45
681aab5bf0
Remove printf and replace them by qDebug()
2014-04-21 16:17:45 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
ZappoMan
cfa618d694
cleanup constructors
2014-03-08 23:31:23 -08:00
Stephen Birarda
60eb588e96
remove some unecessary null pointer checks
2014-03-03 11:36:01 -08:00
ZappoMan
4bb7bb2b77
make pending packets thread safe
2014-02-10 12:48:45 -08:00
Stephen Birarda
3ad8e7260e
fix an accidental DOS and remove getNodeActiveSocketOrPing API
2014-02-07 13:42:52 -08:00
Stephen Birarda
b988308a8d
leverage writeDatagram helper in NodeList, ping if no active socket
2014-02-07 09:49:54 -08:00
Stephen Birarda
a823722d27
add writeDatagram helper to NodeList to insert md5 hash
2014-02-06 14:28:58 -08:00
Stephen Birarda
cda06d1cb3
replace uint64_t with quint64 for Qt friendlyness
2014-01-28 12:35:42 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Stephen Birarda
80106979a5
replace packetSenderNotify with signal/slot combo
2014-01-23 15:55:36 -08:00
Brad Hefta-Gaub
278ca02595
remove debug code
2014-01-21 14:06:55 -08:00
Brad Hefta-Gaub
d831f9df5e
first cut at using partial property info in particle edits
2014-01-20 16:34:45 -08:00
Stephen Birarda
599e3bb9e5
resolve conflicts on merge with upstream master
2014-01-14 16:15:58 -08:00
Stephen Birarda
8676ac38f9
foreach spacing and reference repairs
2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36
initial newline removal from all QDebug calls
2014-01-14 13:09:22 -08:00
Stephen Birarda
9efb391ecf
repair crazy references to node ponter from old iterator style
2014-01-14 10:50:06 -08:00
Stephen Birarda
7d1a64ca8c
change NodeList container to QHash with QSharedPointer
2014-01-13 17:09:21 -08:00
ZappoMan
f1da6bf90b
fix various compiler warnings on gcc
2014-01-02 15:58:03 -08:00
ZappoMan
d71bc248f4
support adjusting particles based on clockSkew
2013-12-19 14:49:58 -08:00
ZappoMan
32c2aef29b
temp remove debug verbosity
2013-12-16 11:36:19 -08:00
ZappoMan
f9b7c23857
correct handleing of app shutdown and scripting enging termination
2013-12-16 11:26:30 -08:00
ZappoMan
c067f8ad11
moved most of VoxelEditPacketSender into new generic base class OctreeEditPacketSender
2013-12-05 16:27:35 -08:00
