Switched to Halo gun in gun.js, work in progress on hydraMove to add flying
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
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
MenuOption::Visage now default to false.
changed
    float specular = max(0.0, dot(normalize(gl_LightSource[0].position + vec4(0.0, 0.0, 1.0, 0.0)), normalizedNormal));
to
    float specular = max(0.0, dot(gl_LightSource[0].position, normalizedNormal));

Calculation for specular value has to be done like in all other shaders with the unmodified unnormalized lightsource position. Otherwise the specular effect will have weird behaviour.
Merge pull request #2865 from talentraspel/19662

MenuOption::Visage now default to false.
added dead zone to pitch in hydra move, animated models show up where you are
Merge pull request #2866 from talentraspel/19661

yep - this fixes the issue.
Merge branch 'master' of https://github.com/worklist/hifi
revert test change
debug off
removed dead code
Merge pull request #2868 from PhilipRosedale/master

Improved hydra movement
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
Lock joystick states for thread safety.