Brad Hefta-Gaub
866116d285
more debugging
2015-11-11 12:13:47 -08: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
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
862c788aec
move payload adjustments to Packet
2015-07-23 15:27:32 -07:00
Stephen Birarda
e127c5c06d
rename Packet methods for clarity
2015-07-15 10:40:40 -07:00
Stephen Birarda
0327a8d477
fix bytesAvailable, don't double seek in Packet
2015-07-14 20:47:16 -07:00
Atlante45
c80df94b06
Update includes for moved files
2015-07-13 15:28:55 -07:00
Atlante45
957e6394a9
sendPacket function take Node& not a pointer
2015-07-13 11:57:20 -07:00
Stephen Birarda
a38cb56c1c
fix an accidental comment add
2015-07-09 11:56:24 -07:00
Atlante45
cc0e0e6a1f
Compile fixes in assignment client
2015-07-09 11:35:36 -07:00
Atlante45
605b004514
Assigment client compile fixes
2015-07-09 11:19:36 -07:00
Stephen Birarda
631c745784
allow equal for piggyback check in OctreeSendThread
2015-07-07 16:21:14 -07:00
Stephen Birarda
ff18a05507
CR fixes for octree classes
2015-07-07 15:21:10 -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
Seth Alves
32cc0eacfc
improve a debug print
2015-05-22 15:21:26 -07:00
Seth Alves
53fe41ef4d
improve a debug print
2015-05-22 15:11:56 -07:00
Seth Alves
945a84d24f
adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum
2015-05-22 15:01:43 -07:00
Seth Alves
866a6fba9b
Merge pull request #4823 from birarda/master
...
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
Seth Alves
83748096ef
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
2015-05-11 11:37:53 -07:00
Stephen Birarda
3d06a86670
drop packets on floor when shutting down
2015-05-08 11:57:25 -07:00
Stephen Birarda
fe1b8cc52b
fix entity tree reset / add OST assert for myServer
2015-05-08 11:04:22 -07:00
Stephen Birarda
d75d204ff6
standardize cleanup of ThreadedAssignments
2015-05-07 17:03:43 -07:00
Stephen Birarda
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -07:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
Andrew Meadows
58b965c9a2
lock Octree higher when extracting things from bag
2015-01-09 16:12:43 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
Atlante45
0bd9ed469e
Changed NodeList::getInstance() calls to use the DM
2014-12-17 15:28:25 -08:00
ZappoMan
90b079d5a8
remove debug
2014-11-06 13:51:48 -08:00
ZappoMan
2b62402a57
possible fix for entities not always updating bug
2014-11-06 13:17:46 -08:00
ZappoMan
c5e02c4ec5
removed unused lastAttemptedSubTree
2014-09-13 07:58:49 -07:00
ZappoMan
66a2f58192
fix to runaway saving file and optimizations to general encoding paths
2014-09-03 10:55:56 -07:00
ZappoMan
75bb42fb73
debug cleanup
2014-08-22 10:54:00 -07:00
ZappoMan
49cf6dff3a
more DIDNT_FIT logic improvements/fixes
2014-08-18 14:09:01 -07:00
ZappoMan
a3bb8b1239
have partial elements set a stop reason of DIDNT_FIT to fix partial encoding issues
2014-08-18 09:37:07 -07:00
ZappoMan
f8f0da189f
more work on more entities in a cell
2014-08-15 17:13:59 -07:00
ZappoMan
84ba810dc4
work on reseved bytes in octree packet data
2014-08-15 11:26:55 -07:00
ZappoMan
2db897a00e
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-11 14:40:25 -07:00
wangyix
c6a9a8924d
changed NetworkPacket::_sendingNode to ::_node
2014-06-10 16:43:53 -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
ZappoMan
a0783f3f4a
try appendElementData() a different way
2014-06-10 10:43:50 -07:00
ZappoMan
5eb6ddbdb3
first cut at support for extra element data
2014-06-09 16:04:25 -07:00
ZappoMan
c5647addf4
Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements
2014-06-09 14:10:47 -07:00
ZappoMan
6f1ec01797
rename nodeBag to elementBag in a bunch of places
2014-06-09 13:42:44 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
