Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Add "Leap Motion on HMD" developer menu option
Configure Leap controller per HMD option when controller is created
Don't calibrate avatar for Leap Motion if mounted on HMD
require a distinction between master config and user config
add locked settings to json return for auth'ed settings
disable form inputs for values set by master config
add a tooltip to say why locked settings cannot be changed
fix for settings save without organization
use two dashes for url as command line option
Merge branch 'master' of https://github.com/worklist/hifi
Don't bother using a callback to render the eye vectors; just rely on the
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
frame interpolation for recordings
Merge pull request #3504 from ey6es/master

Don't bother using a callback to render the eye vectors; just rely on th...
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
make the sixense library name a constant
wrap sixenseExit call in HAVE_SIXENSE ifdef
handle avatar location changes after avatar position has been reloaded