Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
show total memory usage for voxels
fix reset of VoxelSystem on eraseAllVoxels()
Merge branch 'master' of github.com:worklist/hifi into assignment
add AudioMixerClientData to hold vector of PositionalAudioRingBuffer
add a stream identifier back to the audio injector
audio injector requires two UUIDs
Merge branch 'master' of github.com:worklist/hifi into assignment
initial changes to allow for multiple buffers per client
some debug timing and voxel stats display
added some new debug menus
added some debugging
fixed long line
improved VoxelNode delete of children
remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer
better working version of hideOutOfView voxel support
added reset settings for Old vs New voxel culling mode