Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16506 from ctrlaltdavid/DEV-2764

Browse source 
DEV-2764, DEV-2113: Remove Avatar app links to AvatarIsland and BodyMart
This commit is contained in:
Brad Hefta-Gaub 2019-11-19 12:05:10 -08:00 committed by GitHub
commit 63b21af562
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/images/avatarapp/AvatarIsland.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
interface/resources/images/avatarapp/BodyMart.PNG
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 125 KiB

4
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -777,9 +777,7 @@ Rectangle {
hoverEnabled: true
onClicked: {
popup.showBuyAvatars(function() {
emitSendToScript({'method' : 'navigate', 'url' : 'hifi://BodyMart'})
}, function(link) {
popup.showBuyAvatars(null, function(link) {
emitSendToScript({'method' : 'navigate', 'url' : link})
});
}

4
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -245,9 +245,7 @@ Rectangle {
linkColor: hifi.colors.blueHighlight
Layout.alignment: Qt.AlignVCenter
onLinkActivated: {
popup.showGetWearables(function() {
emitSendToScript({'method' : 'navigate', 'url' : 'hifi://AvatarIsland/11.5848,-8.10862,-2.80195'})
}, function(link) {
popup.showGetWearables(null, function(link) {
emitSendToScript({'method' : 'navigate', 'url' : link})
});
}

34
interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
View file

@ -56,25 +56,12 @@ MessageBox {
popup.inputText.forceActiveFocus();
}
property url getWearablesUrl: '../../../images/avatarapp/AvatarIsland.jpg'
function showGetWearables(callback, linkCallback) {
popup.button2text = 'AvatarIsland'
popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.dialogButtons.yesButton.visible = false;
popup.button1text = 'CANCEL'
popup.titleText = 'Get Wearables'
popup.bodyText = 'Get wearables from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
'Wear wearable from <b><a href="app://purchases">Inventory.</a></b>' + '<br/>' + '<br/>' +
'Visit “AvatarIsland” to get wearables'
popup.imageSource = getWearablesUrl;
popup.onButton2Clicked = function() {
popup.close();
if (callback) {
callback();
}
}
'Wear wearable from <b><a href="app://purchases">Inventory.</a></b>'
popup.onLinkClicked = function(link) {
popup.close();
@ -120,26 +107,13 @@ MessageBox {
popup.open();
}
property url getAvatarsUrl: '../../../images/avatarapp/BodyMart.PNG'
function showBuyAvatars(callback, linkCallback) {
popup.button2text = 'BodyMart'
popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.dialogButtons.yesButton.visible = false;
popup.button1text = 'CANCEL'
popup.titleText = 'Get Avatars'
popup.bodyText = 'Get avatars from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
'Wear avatars in <b><a href="app://purchases">Inventory.</a></b>' + '<br/>' + '<br/>' +
'Visit “BodyMart” to get free avatars.'
popup.imageSource = getAvatarsUrl;
popup.onButton2Clicked = function() {
popup.close();
if (callback) {
callback();
}
}
'Wear avatars in <b><a href="app://purchases">Inventory.</a></b>'
popup.onLinkClicked = function(link) {
popup.close();

6
libraries/networking/src/AddressManager.h
View file

@ -49,10 +49,10 @@ const QString GET_PLACE = "/api/v1/places/%1";
* @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid(0)|Uuid.NULL} if you're not
* connected to the domain or are in a serverless domain.
* <em>Read-only.</em>
* @property {string} hostname - The name of the domain for your current metaverse address (e.g., <code>"AvatarIsland"</code>,
* @property {string} hostname - The name of the domain for your current metaverse address (e.g., <code>"DomainName"</code>,
* <code>localhost</code>, or an IP address). Is blank if you're in a serverless domain.
* <em>Read-only.</em>
* @property {string} href - Your current metaverse address (e.g., <code>"hifi://avatarisland/15,-10,26/0,0,0,1"</code>)
* @property {string} href - Your current metaverse address (e.g., <code>"hifi://domainname/15,-10,26/0,0,0,1"</code>)
* regardless of whether or not you're connected to the domain. Starts with <code>"file:///"</code> if you're in a
* serverless domain.
* <em>Read-only.</em>
@ -62,7 +62,7 @@ const QString GET_PLACE = "/api/v1/places/%1";
* (e.g., <code>"/15,-10,26/0,0,0,1"</code>).
* <em>Read-only.</em>
* @property {string} placename - The place name in your current <code>href</code> metaverse address
* (e.g., <code>"AvatarIsland"</code>). Is blank if your <code>hostname</code> is an IP address.
* (e.g., <code>"DomainName"</code>). Is blank if your <code>hostname</code> is an IP address.
* <em>Read-only.</em>
* @property {string} protocol - The protocol of your current <code>href</code> metaverse address (e.g., <code>"hifi"</code>).
* <em>Read-only.</em>

1
scripts/system/interstitialPage.js
View file

@ -48,7 +48,6 @@
"Tip: Don't want others invading your personal space? Turn on the Bubble!",
"Tip: Want to make a friend? Shake hands with them in VR!",
"Tip: Enjoy live music? Visit Rust to dance your heart out!",
"Tip: Have you visited BodyMart to check out the new avatars recently?",
"Tip: Use the Create app to import models and create custom entities.",
"Tip: We're open source! Feel free to contribute to our code on GitHub!",
"Tip: What emotes have you used in the Emote app?",