Commit graph

93 commits

Author SHA1 Message Date
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
f89b225da2 handle local socket changes by monitoring every so often 2014-10-06 09:17:25 -07:00
Stephen Birarda
60e3f3edfa add skipSubHandler to OctreeServer HTTPRequestHandler calls 2014-10-02 11:20:56 -07:00
ZappoMan
6c062102e9 fix typo in comment 2014-09-07 21:21:29 -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
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
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
ZappoMan
230c2f2684 cleanup storage of entity ids on the server, added improved checks for server vs client 2014-07-29 12:52:46 -07:00
Atlante45
36fb530594 Switched DomainServer to NetworkAccessManager 2014-07-02 10:26:38 -07:00
ZappoMan
687a81a223 fix crash in SendNack on server shutdown 2014-06-30 13:18:58 -07:00
wangyix
c7788b793c removed erroneous call updateNodeWithDataFromPacket for octree data nacks 2014-06-18 13:36:54 -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
ff2a5342ee removed another extra space 2014-06-09 12:57:50 -07:00
wangyix
968ea3563c removed an extra space 2014-06-09 12:37:42 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
b39559d860 packet recovery seems to be working
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
wangyix
5461a06e99 completed code to resend nacked packets on AC 2014-06-06 09:33:14 -07:00
wangyix
1a7e3a859c started work on resending nacked packets 2014-06-05 18:00:58 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
ZappoMan
60b8ab0de5 CR feedback 2014-04-21 17:45:38 -07:00
ZappoMan
7d18dbdfb8 more cleanup 2014-04-21 16:35:42 -07:00
ZappoMan
e55c488964 clean up some old debugging 2014-04-21 16:17:59 -07:00
ZappoMan
7a8a8e2fac delete tree on server shutdown 2014-04-21 15:14:06 -07:00
ZappoMan
75f079e2b3 tweak debugging 2014-04-21 14:15:13 -07:00
ZappoMan
7798c6eb09 some debugging 2014-04-21 11:48:58 -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
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
ZappoMan
dc7e2dbe1b more debugging 2014-04-01 20:14:38 -07:00
ZappoMan
97b2e68988 more debugging 2014-04-01 14:05:05 -07:00
ZappoMan
b7695ba050 more debugging 2014-04-01 13:55:25 -07:00
ZappoMan
124619f8d9 more debugging 2014-04-01 12:51:34 -07:00
ZappoMan
6cb44a4d0c more debugging 2014-04-01 12:33:59 -07:00
ZappoMan
916a5d2da0 more debugging 2014-04-01 12:24:03 -07:00
ZappoMan
f504569655 more debugging 2014-04-01 11:49:49 -07:00
ZappoMan
58a52cf5e1 more debugging 2014-04-01 11:45:29 -07:00
ZappoMan
30ff4a1d19 more debugging 2014-04-01 11:32:35 -07:00
ZappoMan
1aa05c4de5 more debugging 2014-04-01 11:26:55 -07:00
ZappoMan
9e445098f1 more debugging 2014-04-01 11:22:44 -07:00
ZappoMan
193e237285 tweaks 2014-04-01 10:58:20 -07:00
ZappoMan
9d757434ab testing tweak 2014-04-01 10:47:25 -07:00
ZappoMan
ce8a599b16 tweak 2014-04-01 10:38:21 -07:00
ZappoMan
64c7a6a440 testing, remove create sending thread and processing of query 2014-04-01 10:25:32 -07:00
ZappoMan
ff17c6a071 quiet some debugging 2014-04-01 10:08:46 -07:00
ZappoMan
20d944a43b removed some debug 2014-04-01 09:31:40 -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
b5c538b051 added some debugging 2014-03-31 18:22:06 -07:00