Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 23:13:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7941 commits 25 branches 0 tags 1.1 GiB
Commit graph

1898 commits

Author SHA1 Message Date
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -08:00
ZappoMan
70213630e1 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-25 13:38:22 -08:00
ZappoMan
66ebaae7c8 added debugging/logging of sleep times removed bail early loging in send thread since it wasn't needed and reduced sending potential in high PPS case 2013-11-25 13:34:53 -08:00
ZappoMan
78d39ed948 added timing details for better debugging and results measurement 2013-11-25 10:41:07 -08:00
Philip Rosedale
d7b1eae446 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-25 09:45:27 -08:00
Philip Rosedale
62c882b788 Rounding numbers 2013-11-25 09:44:40 -08:00
ZappoMan
78a8f2d0cc added comments 2013-11-25 08:56:37 -08:00
ZappoMan
17f5530893 fixed wasted bitmasks bug where we would include colors and extra layers 2013-11-25 01:42:19 -08:00
ZappoMan
8bb2bd2ecf get voxel packet statistics to work and add them to server status page 2013-11-25 00:26:37 -08:00
ZappoMan
8d8d73a940 start of statistics, convert level key into class 2013-11-24 20:49:47 -08:00
ZappoMan
ed80895eb3 fix issue where we sometimes don't completely fill a packet mid scene 2013-11-24 20:29:54 -08:00
ZappoMan
0cd269632e fix bug where some parts of scene weren't sent, turned out it was in the octal code not fitting voxels getting ignored 2013-11-24 17:49:10 -08:00
ZappoMan
32e770d2b7 tweaks to debugging 2013-11-24 16:02:05 -08:00
ZappoMan
3ef7c1a732 moved const definitions to better file 2013-11-24 15:28:50 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
94584d4ead disable voxel packet compression for now 2013-11-24 15:01:37 -08:00
ZappoMan
e2f5069e6a more VoxelPacket compression tuning 2013-11-24 14:41:50 -08:00
ZappoMan
57633f8b92 fixed comment 2013-11-24 00:05:06 -08:00
ZappoMan
ba26e5c3e3 add back non-compression mode to VoxelPacket and tweaks to how compression works to make it more efficient 2013-11-24 00:02:51 -08:00
ZappoMan
c28027b7ca better compressed packets with fewer calls to checkCompress 2013-11-23 22:30:15 -08:00
ZappoMan
e65f74e06b moved compression into VoxelPacket class. works, but too slow for larger sizes 2013-11-23 21:40:50 -08:00
ZappoMan
cd1d3765a9 cleaned up const semantics and DRYed up appendBitMask 2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd Revert "cleaned up some comments and code" 
This reverts commit 99c427c97d.
 2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d cleaned up some comments and code 2013-11-23 16:18:18 -08:00
ZappoMan
cb43b0dea1 cleaned up some comments and code 2013-11-23 15:10:03 -08:00
ZappoMan
b0cc6494da cleaned up some comments and code 2013-11-23 14:58:23 -08:00
ZappoMan
7ff7b13c6b cleaned up some comments 2013-11-23 14:52:34 -08:00
ZappoMan
a9f336e34e cleaned up packet sending accounting and debug output to be less verbose unless requested 2013-11-23 14:49:53 -08:00
ZappoMan
a9642a3e15 tweaks and cleanup 2013-11-23 14:21:14 -08:00
ZappoMan
51547f6f8d tweaks and cleanup 2013-11-23 14:20:12 -08:00
ZappoMan
13e6a187bd tweaks and cleanup 2013-11-23 14:19:18 -08:00
ZappoMan
0ed31b5b9f tweaks and cleanup 2013-11-23 14:14:00 -08:00
ZappoMan
29522d1e50 tweaks and cleanup 2013-11-23 14:07:01 -08:00
ZappoMan
ae5d5324c1 added some comments to VoxelPacket 2013-11-23 14:02:46 -08:00
ZappoMan
4c0569fc60 removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs 2013-11-23 13:55:21 -08:00
ZappoMan
11d7cb64c2 switch back to qDebug 2013-11-23 13:42:11 -08:00
ZappoMan
b1a0ed6480 remove old buffer style approach to encoding 2013-11-23 13:36:38 -08:00
ZappoMan
661152956a clean up comments 2013-11-23 13:23:03 -08:00
ZappoMan
00b3451729 properly handle update fails when encoding 2013-11-23 13:11:06 -08:00
ZappoMan
b1adf82d4b cleaned up const semantics in streaming voxel packets, fixed double reset bug 2013-11-23 13:05:37 -08:00
ZappoMan
1d88399476 cleaning up semantics of VoxelPacket 2013-11-22 20:39:11 -08:00
ZappoMan
0cd0012aab cleaning up semantics of VoxelPacket 2013-11-22 20:08:58 -08:00
ZappoMan
9d8f0b82df make append() private 2013-11-22 17:59:47 -08:00
ZappoMan
69eee541db removed some old debug, standardize callers of VoxelPacket to use semantic entry points instead of direct access to bytes 2013-11-22 17:53:25 -08:00
ZappoMan
01488ed332 don't send any voxel stats till we've succesfully encoded at least one voxel 2013-11-22 17:23:12 -08:00
ZappoMan
80cfba465c move sending of packet to immediately following scene end to get better synch of stats packets, also fix duplicate suppression bug 2013-11-22 17:00:39 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
ZappoMan
e60c482086 supress empty packets in handlePacketSend(), DRY up code in deepestLevelVoxelDistributor() 2013-11-22 12:59:52 -08:00
ZappoMan
a426f97e52 removing some debug output 2013-11-22 10:04:59 -08:00
ZappoMan
48dad5ab86 fix bug in packet filling related to octcodes for new trees not fitting 2013-11-22 09:49:50 -08:00
ZappoMan
4fc9d5409c voxel sender now uses maximum bytes in packets with VoxelPacket class 2013-11-21 23:46:12 -08:00
ZappoMan
c25199c80a removed some debugging 2013-11-21 21:27:37 -08:00
ZappoMan
b9429eeb1e working version of writeToSVO that uses VoxelPacket and fills it to limit before writing 2013-11-21 21:18:31 -08:00
ZappoMan
5a9baf2779 moved some debug code 2013-11-21 20:36:09 -08:00
ZappoMan
e8c3670cdd added packet.reset() in writeToSVO() 2013-11-21 20:18:19 -08:00
ZappoMan
e0c55be4e2 more debug 2013-11-21 15:21:29 -08:00
ZappoMan
9784288b63 added some debugging 2013-11-21 13:51:40 -08:00
ZappoMan
e2e9c29824 implement old vs new side by side encoding to test for correctness 2013-11-21 13:26:28 -08:00
ZappoMan
6c640752cd make compression optional 2013-11-21 12:04:13 -08:00
ZappoMan
a590f384a6 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-21 11:33:08 -08:00
ZappoMan
e959be82f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-21 11:18:47 -08:00
Andrzej Kapolka
cd4ef08dae Merge pull request #1272 from ZappoMan/stats_crash_bug_fix 
fix to crash in client side VoxelSceneStats crash
 2013-11-21 10:59:57 -08:00
ZappoMan
cb56ad2e2f fix a couple of bugs in display of voxel stats on server status 2013-11-21 10:43:40 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
ZappoMan
8c90e96740 addeding VoxelPacket class for encoding bit streams 2013-11-19 15:36:21 -08:00
ZappoMan
c2cb6df61c first cut at compresses voxel packets 2013-11-18 09:46:32 -08:00
ZappoMan
4da70cf3c8 fix to crash on deleteNotify 2013-11-15 16:45:03 -08:00
ZappoMan
1d272c333a fix new VoxelPersistThread behavior so it's actually only checking dirty bits every each persist cycle 2013-11-13 21:31:34 -08:00
ZappoMan
865d2d19f1 added some debugging to see why the servers are spinning out constantly checking for dirty tree 2013-11-13 17:29:01 -08:00
ZappoMan
3c17c70541 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-13 17:15:41 -08:00
ZappoMan
496f3a1380 removed some noise, and made persist thread less sleepy 2013-11-13 16:37:08 -08:00
ZappoMan
1a4ffcec93 removing more noise and dont sleep if we failed to lock the node 2013-11-13 16:24:01 -08:00
ZappoMan
02df4a82b5 removing more noise 2013-11-13 16:04:55 -08:00
ZappoMan
ba9cd6fdd4 removing more noise 2013-11-13 16:04:21 -08:00
ZappoMan
5b09248ba9 remove noisy debugging 2013-11-13 15:15:54 -08:00
ZappoMan
3d20152c36 use node->trylock() in VoxelSendThread() to handle shutdown race condition 2013-11-13 15:11:43 -08:00
ZappoMan
4640d337b7 added more noisy debugging 2013-11-13 13:47:39 -08:00
ZappoMan
4ac6338b8b added Noisy debugging to voxel server main loop 2013-11-13 12:54:34 -08:00
ZappoMan
e32bfc38f5 change voxelServersExist() to make sure that all existing voxel servers have a legitimate jurisdiction 2013-11-13 01:06:17 -08:00
ZappoMan
2b604864d6 fix bug where VoxelEditPacketSender oversends to unknown jurisdictions 2013-11-12 00:35:55 -08:00
ZappoMan
c625d79fd2 removed comment 2013-11-11 17:27:29 -08:00
ZappoMan
59cfa89f1b fixed CR feedback 2013-11-11 17:26:04 -08:00
ZappoMan
0eace966e9 added support to also show inbound packet stats per sender 2013-11-11 17:20:31 -08:00
ZappoMan
af8438b098 add stats to voxel server to show average voxel edit packet statistics 2013-11-11 16:31:36 -08:00
ZappoMan
d9ed6443db style cleanup, correct some comments 2013-11-10 14:06:44 -08:00
ZappoMan
977b730fc0 add support for tuning the size of packets used by VoxelEditPacketSender 2013-11-10 12:44:20 -08:00
ZappoMan
eb73de6b67 added a couple more JS APIs and removed some debug code 2013-11-10 12:33:54 -08:00
ZappoMan
1a6efea5c0 improvements to PPS behavior of PacketSender 2013-11-10 10:39:56 -08:00
ZappoMan
2e8cb63abb add more voxel edit transit time debugging 2013-11-08 10:47:47 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
a75e577d0a voxel edit packet debugging support 2013-11-08 09:32:06 -08:00
ZappoMan
b0a4ffb11c fix comments line breaks 2013-11-08 02:27:34 -08:00
ZappoMan
3da6062639 fix comment 2013-11-08 02:26:23 -08:00
ZappoMan
a708486834 fix comment 2013-11-08 02:25:51 -08:00
ZappoMan
20c66386f8 fix comment 2013-11-08 02:24:46 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
ZappoMan
f1704e9d79 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 18:53:06 -08:00
ZappoMan
cad51885e8 removed some hackery 2013-11-07 17:21:45 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
ZappoMan
afaa448f92 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-11-07 15:52:29 -08:00
ZappoMan
fffbdb1db0 reverted code 2013-11-07 15:52:19 -08:00
Stephen Birarda
5889d4122f use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem 2013-11-07 15:41:10 -08:00
ZappoMan
385865c6c1 remove comment 2013-11-07 15:25:21 -08:00
ZappoMan
ce41477f46 fix VS crash on domain server restart 2013-11-07 15:23:23 -08:00
Stephen Birarda
9aacda7d56 fix for AC lack of QCoreApplication 2013-11-07 14:34:01 -08:00
ZappoMan
77ba88e56d removed dead comment 2013-11-07 13:06:57 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
Stephen Birarda
72b2309dc0 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-11-07 12:43:58 -08:00
Stephen Birarda
24c88512e2 only attempt to deleteLater on linkedData if it exists 2013-11-07 12:41:29 -08:00
Stephen Birarda
fe962e6be1 only call deleteLater for linkedData if we have a QCoreApplication instance 2013-11-07 12:38:28 -08:00
ZappoMan
100439784d got rid of redundant getTree() 2013-11-06 17:37:37 -08:00
ZappoMan
76ad42015a added debugging to JurisdictionMap for server crashes 2013-11-06 16:41:08 -08:00
ZappoMan
f9291e6e5c implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer 2013-11-06 15:22:17 -08:00
ZappoMan
c3914e648f lock our node while using it to prevent crash on domain shutdown 2013-11-06 13:52:31 -08:00
ZappoMan
5cd0ecde18 small tweak in debug out 2013-11-06 12:10:19 -08:00
ZappoMan
0da28fd44c debbugging for node shutdown in VS 2013-11-06 11:20:40 -08:00
ZappoMan
987ce16b10 more potential fixes for voxel server crashes 2013-11-06 01:55:04 -08:00
ZappoMan
1b18b53cfd removed force_crash by default 2013-11-06 00:09:37 -08:00
ZappoMan
c1b22dfdd6 added force_crash to test crashing behavior 2013-11-06 00:00:21 -08:00
ZappoMan
58b74e1f58 added uptime/start time to server status page, and disabled noisy debuggin 2013-11-05 20:49:20 -08:00
ZappoMan
93ad1c3f99 make temp copy of NetworkPacket to protect against vector resizing 2013-11-05 15:11:31 -08:00
ZappoMan
318b9b1671 make temp copy of NetworkPacket to protect against vector resizing 2013-11-05 14:50:49 -08:00
ZappoMan
406d42fe87 added more debugging 2013-11-05 14:27:20 -08:00
ZappoMan
1c580551bb added more debugging 2013-11-05 13:47:58 -08:00
ZappoMan
3ba9c8c30e added more debugging 2013-11-05 13:41:15 -08:00
ZappoMan
7cbebf3941 fixed warning and logic problem 2013-11-05 13:11:35 -08:00
ZappoMan
6dc7f68f0e Merge pull request #1185 from birarda/assignment 
add helper to ping if no active socket
 2013-11-05 12:55:06 -08:00
Stephen Birarda
eef6fd53eb cleanup node type check in JL 2013-11-05 12:37:38 -08:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
ZappoMan
e296be8c7a make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known 2013-11-05 12:31:20 -08:00
ZappoMan
9060020279 style cleanup 2013-11-05 11:33:28 -08:00
ZappoMan
4cab991c02 style cleanup 2013-11-05 11:24:51 -08:00
ZappoMan
adf0feed29 style clenaup 2013-11-05 11:14:29 -08:00
ZappoMan
1c4163b010 add guards against buffer overflow in voxel server for edit/delete voxel packets 2013-11-05 11:12:14 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
ZappoMan
7daff4c279 coding standard cleanup 2013-11-04 15:36:46 -08:00
ZappoMan
9e88cfe953 initlaize sortedChildren[] array to help prevent possible crashes 2013-11-04 15:33:28 -08:00
ZappoMan
e89079e86c add server config to the status page 2013-11-04 15:32:53 -08:00
Philip Rosedale
11e6982a9d Merge pull request #1176 from ZappoMan/bugfixes 
fix oversending bug
 2013-11-04 13:36:47 -08:00
ZappoMan
e0d5f2476c tweak 2013-11-04 13:21:30 -08:00
ZappoMan
e8a1a383a3 fix oversending bug 2013-11-04 13:19:42 -08:00
Stephen Birarda
5c3075401a add a guard for JurisdictionListener kill for missing UUID 2013-11-04 12:03:04 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
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
ZappoMan
14cf5b04b5 added suppression of duplicate voxel packets to save on bit/packet rate 2013-10-24 10:33:19 -07:00
ZappoMan
8ac5f5070c Merge branch 'master' of https://github.com/worklist/hifi into view_is_similar 2013-10-23 17:59:00 -07:00
ZappoMan
b4c88a85f8 improvements to subtle moves for view frustum and voxel serving 2013-10-23 17:49:58 -07:00
Stephen Birarda
d85ed014ba switch to bootstrap 3, complete initial index page 2013-10-23 14:43:59 -07:00
ZappoMan
aa5e2b6a19 memset to 0 in VoxelNode to address potential memory corruption 2013-10-23 10:54:02 -07:00
Stephen Birarda
1eba133a6d use char array of static length for pool 2013-10-22 13:35:26 -07:00
Stephen Birarda
b4a2214d26 add notion of pool back to assignment 2013-10-22 11:43:06 -07:00
Philip Rosedale
d44a82fce1 Merge pull request #1097 from ZappoMan/keep_local_voxels 
Fixed bug in Keep Local Voxels
 2013-10-22 09:35:47 -07:00
ZappoMan
73d8cdacf8 fixed comment 2013-10-22 09:24:21 -07:00
ZappoMan
bfb9ed2229 fix issue with delta frustums in hideOutOfView 2013-10-22 09:22:55 -07:00
Philip Rosedale
cab9e7f658 Merge pull request #1094 from birarda/assignment 
allow multiple buffers to be hooked to an individual node
 2013-10-21 20:29:10 -07:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07:00
Stephen Birarda
fbb097accb remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer 2013-10-21 15:03:07 -07:00
ZappoMan
303f4a8ce4 improved VoxelNode delete of children 2013-10-21 14:44:46 -07:00
ZappoMan
2f423e66eb fixed long line 2013-10-21 14:43:55 -07:00
Stephen Birarda
1b129a43b5 initial changes to allow for multiple buffers per client 2013-10-21 14:27:55 -07:00
Stephen Birarda
b3909da5f0 audio injector requires two UUIDs 2013-10-18 17:37:25 -07:00
Stephen Birarda
4fe2e25bf0 add a stream identifier back to the audio injector 2013-10-18 17:36:59 -07:00
Stephen Birarda
7da1f5a235 add AudioMixerClientData to hold vector of PositionalAudioRingBuffer 2013-10-18 17:32:53 -07:00
Stephen Birarda
0dd16cfc1e debug a STUN reponse that only changes port 2013-10-18 15:27:35 -07:00
Stephen Birarda
32680bbaad continued STUN requests for keepalive, propagate socket changes 2013-10-18 15:05:16 -07:00
Stephen Birarda
d85c0bb88a add a DELETE method to civetweb to delete assignment by UUID 2013-10-18 10:25:35 -07:00
ZappoMan
ca7225e525 fix reset of VoxelSystem on eraseAllVoxels() 2013-10-17 18:45:52 -07:00
Stephen Birarda
11a05481e1 remove an infamous birarda extra g 2013-10-17 17:54:52 -07:00
Stephen Birarda
ded7735572 remove crazy debug from testing 2013-10-17 17:54:25 -07:00
Stephen Birarda
a4798acb22 bring ping interval back to 1 second 2013-10-17 17:35:24 -07:00
Stephen Birarda
b25487cda3 increase the ping interval 2013-10-17 17:33:34 -07:00
Stephen Birarda
65e0670eba Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 17:25:21 -07:00
Stephen Birarda
19e6f668d2 add debug to test hole punching 2013-10-17 17:25:14 -07:00
Stephen Birarda
bd806241fd don't attempt to send in UDPSocket with NULL destAddress 2013-10-17 17:01:15 -07:00
Stephen Birarda
b4ef3dbd8a add ping/reply to assignment-client servers 2013-10-17 16:56:52 -07:00
Stephen Birarda
7d48c9b3bd don't attempt to inject if audio mixer has no active socket 2013-10-17 16:49:05 -07:00
Stephen Birarda
75d8934961 fix pinging of agents in broadcast to nodes 2013-10-17 16:46:49 -07:00
Stephen Birarda
964200cdab Merge pull request #1080 from ZappoMan/voxelnode_memory_savings 
fix voxel nodes to work with new UUID format
 2013-10-17 16:35:40 -07:00
ZappoMan
370defdc4a fixed comment 2013-10-17 16:16:20 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Stephen Birarda
87d6c0085f add a fallback if STUN to outside server isn't possible 2013-10-17 15:11:02 -07:00
Stephen Birarda
42de553e32 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 14:51:20 -07:00
Stephen Birarda
4bbb59be72 fix use of htonl in constant outside function 2013-10-17 14:45:38 -07:00
ZappoMan
a11b6858d3 fix small stats bug 2013-10-17 14:43:19 -07:00
Stephen Birarda
90e189b425 remove accidentally double saved NodeList.cpp 2013-10-17 14:42:07 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
d7d8d76b07 fix ping of VS from agent 2013-10-17 13:58:00 -07:00
ZappoMan
8d7874b01b add guards to prevent runaway reaverageVoxels(), added stats to see if 4 children could be packed internally 2013-10-17 13:47:18 -07:00
Stephen Birarda
74e66dfd35 push various PACKET_TYPES, repairs to Agent for UUID setup 2013-10-17 13:35:53 -07:00
Stephen Birarda
0ae825d761 temporary activation of node public socket in VS 2013-10-17 13:01:03 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
ZappoMan
6688b450c5 cleaned up some printf's to qDebug's 2013-10-17 12:31:18 -07:00
ZappoMan
8448e47df8 cleanup dead code 2013-10-17 12:27:23 -07:00
ZappoMan
515dc657fb cleanup dead code 2013-10-17 12:26:01 -07:00
ZappoMan
fbf1a75d07 cleanup dead code 2013-10-17 12:24:53 -07:00
ZappoMan
095b716366 make population stats use public getters and private member variables 2013-10-17 12:16:03 -07:00