Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 08:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9466 from druiz17/textureSwap

Browse source 
tablet button bug fix
This commit is contained in:
Seth Alves 2017-01-23 09:43:36 -08:00 committed by GitHub
commit 4816f07384
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/controllers/handControllerGrab.js
View file

@ -813,7 +813,6 @@ function MyController(hand) {
this.update = function(deltaTime, timestamp) {
this.updateSmoothedTrigger();
// If both trigger and grip buttons squeezed and nothing is held, rescale my avatar!
if (this.hand === RIGHT_HAND && this.state === STATE_SEARCHING &&
this.getOtherHandController().state === STATE_SEARCHING) {
@ -1178,7 +1177,9 @@ function MyController(hand) {
if (this.handleStylusOnWebOverlay(rayPickInfo)) {
return;
}
}
} else {
this.homeButtonTouched = false;
}
} else {
this.hideStylus();
}