Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
0aed08a006
more robust handling of readConfiguration
2015-09-15 16:52:15 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
9e7fb9ae16
shuffle Packet headers, use static enum for PacketType
2015-07-23 13:56:47 -07:00
Stephen Birarda
789235b8c7
make NodeList deleter be deleteLater
2015-07-14 15:28:38 -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
Ryan Huffman
c86e481d4f
Update OctreeServer packet receive handling
2015-07-10 17:28:27 -07:00
Ryan Huffman
09f978207b
Add packet handling to OctreeServer
2015-07-10 12:23:58 -07:00
Stephen Birarda
5dc09692b4
more packet creation fixes for entitites
2015-07-08 18:13:06 -07:00
Stephen Birarda
0d64e82fe2
replace PacketType declarations with PacketType::Value
2015-07-02 16:38:52 -07:00
Stephen Birarda
8c6715e4fc
resolve conflicts on merge with upstream/master
2015-05-11 11:10:22 -07:00
Stephen Birarda
3d06a86670
drop packets on floor when shutting down
2015-05-08 11:57:25 -07:00
Stephen Birarda
bfccf02912
use lamdbas for linkedDataCreateCallback
2015-05-07 15:37:02 -07:00
Seth Alves
3bc85c2531
instead of a json checkbox, a dropdown to chose the file type
2015-03-12 09:34:01 -07:00
Seth Alves
2a06816f71
added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting
2015-03-11 23:09:15 -07:00
ZappoMan
60aec8ac00
add support for multiple backup rules
2015-01-13 13:41:32 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
Andrew Meadows
b9944edf66
OctreeServer::createTree() is now protected
2014-12-02 11:13:37 -08:00
ZappoMan
bdfe02bbd0
Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements
...
Conflicts:
assignment-client/src/octree/OctreeServer.cpp
libraries/octree/src/OctreePersistThread.cpp
libraries/octree/src/OctreePersistThread.h
2014-11-17 11:22:00 -08:00
ZappoMan
f44513ebe7
added support for rolling version numbers in backups
2014-11-15 22:55:12 -08:00
ZappoMan
4adb4787cd
added debugging of usecTimestampNow() in octree server to better understand flight times
2014-11-15 21:50:42 -08:00
ZappoMan
cd4b267732
implement persist backup
2014-11-14 11:11:32 -08:00
ZappoMan
e9a332de4d
make entity and voxel servers support domain based configuration
2014-11-05 12:12:17 -08:00
Stephen Birarda
e9bcc90166
handle remaining conversions for AccountManager passing QNetworkReply
2014-10-14 16:16:54 -07:00
Stephen Birarda
60e3f3edfa
add skipSubHandler to OctreeServer HTTPRequestHandler calls
2014-10-02 11:20:56 -07:00
ZappoMan
9e21d26a6d
improve ping behavior and clockskew in octree servers by introducing datagramprocessing thread
2014-09-05 19:03:44 -07:00
ZappoMan
25e8c7d3f1
useless semicolon removal
2014-09-03 12:22:02 -07:00
Stephen Birarda
e1ba076a71
complete redemption of signed transactions from octree server
2014-07-31 11:03:12 -07:00
Stephen Birarda
eadae8ed1a
allow unauthenticated redemptions of signed transactions from octree server
2014-07-31 10:05:26 -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
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
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
wangyix
f82be105e8
moved _sequenceNumber back to OctreeQueryNode
2014-05-29 12:54:34 -07:00
wangyix
c799077379
added flag,seq,ts to ParticleErase and ModelErase
...
... this fixes unreasonable flight-time issue
2014-05-28 17:20:10 -07:00
ZappoMan
715e6b8e60
debugging model editing
2014-05-02 09:10:30 -07:00
ZappoMan
e55c488964
clean up some old debugging
2014-04-21 16:17:59 -07:00
ZappoMan
59cbda20c6
added some threading and event debugging
2014-04-20 19:48:17 -07:00
ZappoMan
50f7db8fe1
quiet some debugging
2014-04-18 15:02:10 -07:00
ZappoMan
2c02178802
Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
...
Conflicts:
assignment-client/src/AssignmentClient.cpp
assignment-client/src/AssignmentClient.h
libraries/shared/src/NodeList.cpp
2014-04-18 14:28:54 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
ZappoMan
7cd39d3ef0
add forceNodeShutdown() to handle forced shutdown of nodes in case of server shutdown
2014-03-31 20:53:34 -07:00
ZappoMan
514f43c6cc
revert tweaks
2014-03-31 15:10:36 -07:00
ZappoMan
a82a583030
cleanup
2014-03-31 14:59:28 -07:00
ZappoMan
faa062f8ab
use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting
2014-03-31 14:08:19 -07:00