beginning of hook of AudioInjector into JS
replace QVariantMap glm::vec3 setters with conversions for QScriptValue
add methods to set/get samples and volume
Merge branch 'master' of github.com:worklist/hifi into assignment
remove non-sensical comment for assignment client debug changes
Merge branch 'master' of github.com:worklist/hifi into assignment
don’t have AvatarMixer ask DS for agents
fixed a couple crashes and cleaned up some code
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
merge cleanup
handle conflicts on merge with upstream master
implement hide cursor on no mouse movement
Merge pull request #1053 from birarda/master

change goToUser shortcut to @
Merge pull request #1052 from ZappoMan/hide_cursor

implement hide cursor on no mouse movement
Merge pull request #1051 from ZappoMan/keep_local_voxels

Clean up some crashes in client side handling of voxels
allow audio injection from javascript
remove the Agent static instance
remove static instance set from Agent.cpp
Merge pull request #1055 from birarda/assignment

add audio injection from javascript
reset nodeTypesOfInterest on NodeList reset