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

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

Browse source
This commit is contained in:
Cain Kilgore 2017-09-20 23:25:26 +01:00
commit a4655b9c73
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/controllers/standard.json
View file

@ -25,7 +25,7 @@
}, },
{ "from": "Standard.RX", { "from": "Standard.RX",
"when": [ "Application.InHMD", "Application.SnapTurn" ], "when": [ "Application.SnapTurn" ],
"to": "Actions.StepYaw", "to": "Actions.StepYaw",
"filters": "filters":
[ [
@ -128,4 +128,4 @@
{ "from": "Standard.TrackedObject14", "to" : "Actions.TrackedObject14" }, { "from": "Standard.TrackedObject14", "to" : "Actions.TrackedObject14" },
{ "from": "Standard.TrackedObject15", "to" : "Actions.TrackedObject15" } { "from": "Standard.TrackedObject15", "to" : "Actions.TrackedObject15" }
] ]
} }

2
scripts/system/libraries/WebTablet.js
View file

@ -51,7 +51,7 @@ function calcSpawnInfo(hand, landscape) {
var forward = Quat.getForward(headRot); var forward = Quat.getForward(headRot);
var FORWARD_OFFSET = 0.6 * MyAvatar.sensorToWorldScale; var FORWARD_OFFSET = 0.6 * MyAvatar.sensorToWorldScale;
finalPosition = Vec3.sum(headPos, Vec3.multiply(FORWARD_OFFSET, forward)); finalPosition = Vec3.sum(headPos, Vec3.multiply(FORWARD_OFFSET, forward));
var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, {x: 0, y: 1, z: 0}); var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, Vec3.multiplyQbyV(MyAvatar.orientation, Vec3.UNIT_Y));
return { return {
position: finalPosition, position: finalPosition,
rotation: landscape ? Quat.multiply(orientation, ROT_LANDSCAPE) : Quat.multiply(orientation, ROT_Y_180) rotation: landscape ? Quat.multiply(orientation, ROT_LANDSCAPE) : Quat.multiply(orientation, ROT_Y_180)

2
unpublishedScripts/marketplace/record/record.js
View file

@ -571,7 +571,7 @@
function onTabletScreenChanged(type, url) { function onTabletScreenChanged(type, url) {
// Opened/closed dialog in tablet or window. // Opened/closed dialog in tablet or window.
var RECORD_URL = "/scripts/system/html/record.html"; var RECORD_URL = "/html/record.html";
if (type === "Web" && url.slice(-RECORD_URL.length) === RECORD_URL) { if (type === "Web" && url.slice(-RECORD_URL.length) === RECORD_URL) {
if (Dialog.finishOnOpen()) { if (Dialog.finishOnOpen()) {