Merge branch 'master' of https://github.com/highfidelity/hifi into hazeOnTransparent

This commit is contained in:
Nissim Hadar 2017-12-18 08:04:04 -08:00
commit 51e70365f0

View file

@ -898,8 +898,7 @@
}
}
function keyReleaseEvent(event) {
if ((event.text.toUpperCase() === "X") && !event.isAutoRepeat && !event.isShifted && !event.isMeta && !event.isControl
&& !event.isAlt) {
if (event.text.toUpperCase() === "X" && !event.isAutoRepeat) {
updateTriggers(0.0, true, Controller.Standard.RightHand);
}
}