Commit graph

1551 commits

Author SHA1 Message Date
Stephen Birarda
5b505bcc95 just use default to catch unknown Qt message types 2013-10-31 14:16:30 -07:00
Stephen Birarda
bfe7c82232 add default and QtTraceMsg to switch to avoid warnings 2013-10-31 14:10:08 -07:00
Stephen Birarda
9e3de05e97 activate public socket if a node sends data to VS and AM 2013-10-31 13:55:26 -07:00
ZappoMan
9a5cc596b3 CR feedback 2013-10-30 16:57:32 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
2013-10-30 16:48:50 -07:00
ZappoMan
ac236b9ed8 if LOD changes than don't consider WasInView on server 2013-10-30 16:26:42 -07:00
ZappoMan
2f1ecd8d1b improve voxel server's behavior when client is moving, dump out of view pending voxels 2013-10-30 15:12:04 -07:00
ZappoMan
3445a15d61 fix build buster 2013-10-30 12:35:42 -07:00
ZappoMan
96870f5d66 removed debug 2013-10-30 12:15:16 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
ZappoMan
dd7eb66cec adjustable LOD tweaks 2013-10-30 11:53:16 -07:00
ZappoMan
baafea05af make server resend scene when LOD changes 2013-10-30 11:22:38 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
32b1fb2e23 Merge pull request #1145 from birarda/assignment
fix silent node removal thread join bug
2013-10-29 16:35:41 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Stephen Birarda
03b23b504f reference global with colon 2013-10-29 16:05:23 -07:00
Stephen Birarda
66b27fa607 have silent node removal flag reset on join 2013-10-29 15:59:09 -07:00
ZappoMan
3b04eabe8a made sending environments off by default 2013-10-29 15:46:23 -07:00
Stephen Birarda
6e9ee93ed6 add debug for sleep amount to AvatarMixer 2013-10-29 15:28:10 -07:00
Stephen Birarda
08a368a9fd add debug to catch AvatarMixer ghosting 2013-10-29 15:21:55 -07:00
Philip Rosedale
2931e2e41a Merge pull request #1138 from ZappoMan/bugfixes
add mutex for _nodesRequestingJurisdictions to fix crash
2013-10-29 09:49:15 -07:00
Philip Rosedale
6b3a1de22b Merge pull request #1139 from ZappoMan/voxelnode_memory_savings
VoxelNode memory savings
2013-10-29 09:48:53 -07:00
ZappoMan
4874eda317 add mutex for _nodesRequestingJurisdictions to fix crash 2013-10-28 22:16:36 -07:00
ZappoMan
905fd48e84 fix blinking 2013-10-28 16:03:29 -07:00
ZappoMan
97070607ea added SIMPLE_EXTERNAL_CHILDREN mode, which saves on most of our child VoxelNode children storage without being too complicated 2013-10-28 14:43:27 -07:00
ZappoMan
f12064c647 clean up voxel server stats page 2013-10-28 13:24:25 -07:00
ZappoMan
03b2ace488 moved blended _children union into BLENDED_UNION_CHILDREN 2013-10-28 12:54:37 -07:00
ZappoMan
87a44bafc9 added population data back for SIMPLE_CHILD_ARRAY implementation 2013-10-28 12:37:47 -07:00
ZappoMan
e3c64429b9 added SIMPLE_CHILD_ARRAY implementation to temporarily work around memory corruption 2013-10-28 12:10:30 -07:00
ZappoMan
ce524714d9 properly call resetVoxelPacket() when suppressing duplicate packets 2013-10-28 12:09:40 -07:00
ZappoMan
b10d111891 delete _lastVoxelPacket in ~VoxelNodeData() 2013-10-28 12:08:52 -07:00
ZappoMan
3ed61db873 add guard around nodeData on delete 2013-10-28 12:07:56 -07:00
ZappoMan
8cbf5a88e5 Merge pull request #1128 from birarda/master
pay attention to jurisdictions, run the silent node removal thread in the agent
2013-10-25 15:01:51 -07:00
ZappoMan
130213bffc Merge pull request #1129 from ZappoMan/bugfixes
added guard to protect against external child access
2013-10-25 14:24:04 -07:00
ZappoMan
b8a87294e6 added guard to protect against external child access 2013-10-25 14:22:56 -07:00
Stephen Birarda
0ba73154b9 Merge pull request #1127 from ZappoMan/bugfixes
temporarily force external child storage
2013-10-25 14:10:19 -07:00
ZappoMan
dcccfb7ef0 temporarily force external child storage 2013-10-25 14:03:49 -07:00
Stephen Birarda
3df07d344f have assignment client pay attention to jurisdictions 2013-10-25 11:39:21 -07:00
Stephen Birarda
8aad3e146f avoid a divide by zero in PacketSender 2013-10-25 10:49:35 -07:00
Stephen Birarda
67050f5cd2 fix Assignment ctor from data to properly parse payload 2013-10-25 10:34:58 -07:00
Stephen Birarda
9dbbf8c65c don't alloc memory for checkInPacket, make it stack to function 2013-10-25 09:22:23 -07:00
ZappoMan
953196510f removed some dead code 2013-10-25 00:07:34 -07:00
ZappoMan
9492c3de18 various memory leaks and compiler warning fixes 2013-10-25 00:05:52 -07:00
ZappoMan
4a74499ea1 removed asserts and replaced with error messages 2013-10-24 17:43:38 -07:00
Stephen Birarda
b1a7e7c052 make the NodeList handle ping reply packets in VS 2013-10-24 17:03:49 -07:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
ZappoMan
f2229ae708 moved debug into if 2013-10-24 14:21:05 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
9cd04af1ae removed debug 2013-10-24 10:48:17 -07:00
ZappoMan
80701b93d5 Merge branch 'master' of https://github.com/worklist/hifi into rate_control 2013-10-24 10:44:27 -07:00