Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-05 23:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make scripts use the default scaleWithParent when creating ray/parabola

Browse source 
picks
This commit is contained in:
sabrina-shanman 2018-09-27 17:14:30 -07:00
parent e7c70705b2
commit 411dbbbad3
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -408,7 +408,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,
scaleWithParent: true,
distanceScaleEnd: true,
hand: LEFT_HAND
});
@ -418,7 +418,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,
scaleWithParent: true,
distanceScaleEnd: true,
hand: RIGHT_HAND
});
@ -429,7 +429,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,
scaleWithParent: true,
distanceScaleEnd: true,
hand: LEFT_HAND
});
@ -440,7 +440,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,
scaleWithParent: true,
distanceScaleEnd: true,
hand: RIGHT_HAND
});

8
scripts/system/controllers/controllerModules/teleport.js
View file

@ -169,7 +169,7 @@ Script.include("/~/system/libraries/controllers.js");
posOffset: { x: (_this.hand === RIGHT_HAND) ? 0.03 : -0.03, y: 0.2, z: 0.02 },
filter: Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_INVISIBLE,
faceAvatar: true,
scaleWithAvatar: true,
scaleWithParent: true,
centerEndY: false,
speed: speed,
accelerationAxis: accelerationAxis,
@ -185,7 +185,7 @@ Script.include("/~/system/libraries/controllers.js");
posOffset: { x: (_this.hand === RIGHT_HAND) ? 0.03 : -0.03, y: 0.2, z: 0.02 },
filter: Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_INVISIBLE,
faceAvatar: true,
scaleWithAvatar: true,
scaleWithParent: true,
centerEndY: false,
speed: speed,
accelerationAxis: accelerationAxis,
@ -198,7 +198,7 @@ Script.include("/~/system/libraries/controllers.js");
joint: "Avatar",
filter: Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_INVISIBLE,
faceAvatar: true,
scaleWithAvatar: true,
scaleWithParent: true,
centerEndY: false,
speed: speed,
accelerationAxis: accelerationAxis,
@ -212,7 +212,7 @@ Script.include("/~/system/libraries/controllers.js");
joint: "Avatar",
filter: Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_INVISIBLE,
faceAvatar: true,
scaleWithAvatar: true,
scaleWithParent: true,
centerEndY: false,
speed: speed,
accelerationAxis: accelerationAxis,

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

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