Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 00:03:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11999 from luiscuenca/laserScaleFix

Browse source 
Make lasers scale with avatar
This commit is contained in:
Brad Hefta-Gaub 2017-12-15 15:21:01 -08:00 committed by GitHub
commit 6aebfd61c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/controllers/controllerDispatcher.js
View file

@ -412,6 +412,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
triggers: [{action: Controller.Standard.LTClick, button: "Focus"}, {action: Controller.Standard.LTClick, button: "Primary"}],
posOffset: getGrabPointSphereOffset(Controller.Standard.LeftHand, true),
hover: true,
scaleWithAvatar: true,
distanceScaleEnd: true,
hand: LEFT_HAND
});
@ -421,6 +422,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
triggers: [{action: Controller.Standard.RTClick, button: "Focus"}, {action: Controller.Standard.RTClick, button: "Primary"}],
posOffset: getGrabPointSphereOffset(Controller.Standard.RightHand, true),
hover: true,
scaleWithAvatar: true,
distanceScaleEnd: true,
hand: RIGHT_HAND
});
@ -431,6 +433,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
posOffset: getGrabPointSphereOffset(Controller.Standard.LeftHand, true),
triggers: [{action: Controller.Standard.LTClick, button: "Focus"}, {action: Controller.Standard.LTClick, button: "Primary"}],
hover: true,
scaleWithAvatar: true,
distanceScaleEnd: true,
hand: LEFT_HAND
});
@ -441,6 +444,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
posOffset: getGrabPointSphereOffset(Controller.Standard.RightHand, true),
triggers: [{action: Controller.Standard.RTClick, button: "Focus"}, {action: Controller.Standard.RTClick, button: "Primary"}],
hover: true,
scaleWithAvatar: true,
distanceScaleEnd: true,
hand: RIGHT_HAND
});

1
scripts/system/controllers/grab.js
View file

@ -269,6 +269,7 @@ function Grabber() {
joint: "Mouse",
filter: Picks.PICK_ENTITIES,
faceAvatar: true,
scaleWithAvatar: true,
enabled: true,
renderStates: renderStates
});