Commit graph

43 commits

Author SHA1 Message Date
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Ryan Huffman
35f147f557 Cleanup use of OctalCodePtrList and add allocateOctalCodePtr 2016-05-17 10:59:51 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues
Make octal code pointers use shared_ptr, add locks around access.
2016-05-17 10:59:51 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
f472b515c3 remove wantsColor support since its always true and required for entities 2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
5a75a17174 Revert "Cruft removal" 2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub
849a8707d2 remove wantsColor support since its always true and required for entities 2015-12-03 11:11:15 -08:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Atlante45
7713219718 Compile fixes 2015-07-08 10:40:35 -07:00
Stephen Birarda
e953b36f58 handle stats + data packet combination in OctreeSendThread 2015-07-07 12:56:20 -07:00
Stephen Birarda
01b1c46237 more networking API changes in octree classes 2015-07-07 12:31:22 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
ZappoMan
9a02545d9e useless semicolon removal 2014-09-03 12:26:05 -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
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
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
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
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
Atlante45
f74bd491d6 CR 2014-04-29 12:48:50 -07:00
Atlante45
8686fecdad Switch OctreeSceneStats to quintX 2014-04-28 16:08:26 -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
Brad Hefta-Gaub
711e6ca3f5 clean up casts and types to fix warnings in a cleaner way 2014-03-14 17:43:55 -07:00
ZappoMan
86feabee99 add last scene packets, bytes and pps 2014-03-12 02:22:24 -07:00
ZappoMan
0017625442 fix unix compiler issue 2014-03-11 16:48:49 -07:00
ZappoMan
12becb9d19 improve octree stats display 2014-03-11 16:22:35 -07:00
Andrzej Kapolka
d3b005112e Changes from Philip's code review. 2014-02-07 10:03:23 -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
ZappoMan
72649f1ac9 adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00