improved algorithm for rotating eyes to look at target
Merge remote-tracking branch 'upstream/master'
small fix
some preliminary work on avatarRenderer
preparing to add transmitted lookat position data
Merge remote-tracking branch 'upstream/master'
test
test
test
Drag support for adding/removing (as well as coloring) voxels.  I had to
ensure that the "last" voxel edited was the one under the cursor after the
operation, not the one operated on.
Merge branch 'master' of https://github.com/worklist/hifi
added _lookatPosition to avatar Data
cleanup
Merge remote-tracking branch 'upstream/master'
Added toggle for voxel textures; they may be slowing some machines down.
Merge branch 'master' of https://github.com/worklist/hifi
cleanup
Merge remote-tracking branch 'upstream/master'
Merge pull request #355 from birarda/master

have the AudioInjectionManager use sensible defaults when nothing is set
Merge pull request #359 from birarda/master

rearrange member variables in Oscilloscope constructor