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

Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged

Browse source
This commit is contained in:
Wayne Chen 2018-09-05 11:54:21 -07:00
commit 841080ea72
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
interface/resources/serverless/redirect.json
View file

@ -9,39 +9,39 @@
"clientOnly": false, "clientOnly": false,
"collidesWith": "static,dynamic,kinematic,otherAvatar,", "collidesWith": "static,dynamic,kinematic,otherAvatar,",
"collisionMask": 23, "collisionMask": 23,
"created": "2018-09-05T00:40:03Z", "created": "2018-09-05T18:13:00Z",
"dimensions": { "dimensions": {
"blue": 0.8660923838615417, "blue": 1.159199833869934,
"green": 1.921838402748108, "green": 2.8062009811401367,
"red": 1.2744625806808472, "red": 1.6216505765914917,
"x": 1.2744625806808472, "x": 1.6216505765914917,
"y": 1.921838402748108, "y": 2.8062009811401367,
"z": 0.8660923838615417 "z": 1.159199833869934
}, },
"id": "{781e26c7-ecfa-44b2-b7ef-4e3278787fbc}", "id": "{d0ed60b8-9174-4c56-8e78-2c5399329ae0}",
"lastEdited": 1536108183362142, "lastEdited": 1536171372916208,
"lastEditedBy": "{4656d4a8-5e61-4230-ab34-2888d7945bd6}", "lastEditedBy": "{151cb20e-715a-4c80-aa0d-5b58b1c8a0c9}",
"locked": true, "locked": true,
"name": "Try Again Zone", "name": "Try Again Zone",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"position": { "position": {
"blue": 4.225754737854004, "blue":4.015342712402344,
"green": 1.7677892446517944, "green":1.649999976158142,
"red": 2.778148889541626, "red":2.00921893119812,
"x": 2.778148889541626, "x":2.00921893119812,
"y": 1.7677892446517944, "y":1.649999976158142,
"z": 4.225754737854004 "z":4.015342712402344
}, },
"queryAACube": { "queryAACube": {
"scale": 2.4632973670959473, "scale": 3.4421300888061523,
"x": 1.5465002059936523, "x": 1.6001315116882324,
"y": 0.5361405611038208, "y": -0.07100248336791992,
"z": 2.9941060543060303 "z": 0.14220571517944336
}, },
"rotation": { "rotation": {
"w": 0.9743700623512268, "w": 0.9914448857307434,
"x": 0, "x": 0,
"y": -0.22495104372501373, "y": -0.13052619993686676,
"z": 0 "z": 0
}, },
"script": "https://hifi-content.s3.amazonaws.com/wayne/404redirectionScripts/zoneTryAgainEntityScript.js", "script": "https://hifi-content.s3.amazonaws.com/wayne/404redirectionScripts/zoneTryAgainEntityScript.js",

4
libraries/networking/src/AddressManager.cpp
View file

@ -259,8 +259,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
UserActivityLogger::getInstance().wentTo(trigger, URL_TYPE_USER, lookupUrl.toString()); UserActivityLogger::getInstance().wentTo(trigger, URL_TYPE_USER, lookupUrl.toString());
// save the last visited domain URL. // save the last visited domain URL.
_lastVisitedURL = lookupUrl; _lastVisitedURL = lookupUrl;
// in case we're failing to connect to where we thought this user was // in case we're failing to connect to where we thought this user was
// store their username as previous lookup so we can refresh their location via API // store their username as previous lookup so we can refresh their location via API