Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)
slaps sound only on impact with velocity
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Revert "Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)"

This reverts commit d68a551940fe522797a8f76ac796a88fb535251b.
Reverted key mapping change since Andrzej fixed the underlying problem.
merge fix
bigger catch radius, tweak sounds, different new ball button
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
merge
debug off
Merge pull request #1417 from PhilipRosedale/master

Cleanup and tweaks to make throw/catch better
update homebrew qt5 formula with patched 5.2.0 stable
Merge pull request #1420 from birarda/injected-audio

updated patched qt5 homebrew formula
remove all bottle options from formula
Merge pull request #1421 from birarda/master

remove bottle options from qt5 formula
Fixed chat height
typo
Merge pull request #1426 from PhilipRosedale/master

Fixed chat height