Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bump version number, add distance notice to receiving item.

Browse source
This commit is contained in:
Kasen IO 2020-05-23 19:13:06 -04:00
parent 0fa5b4e80a
commit 623857c0de
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/inventory/public/inventory.js
View file

@ -85,7 +85,7 @@ function onMessageReceived(channel, message, sender, localOnly) {
// Window.alert("Passed 0 " + messageJSON.recipient + " vs " + MyAvatar.sessionUUID); // Window.alert("Passed 0 " + messageJSON.recipient + " vs " + MyAvatar.sessionUUID);
if (messageJSON.command == "share-item" && messageJSON.recipient == MyAvatar.sessionUUID) { // We are receiving an item. if (messageJSON.command == "share-item" && messageJSON.recipient == MyAvatar.sessionUUID) { // We are receiving an item.
// Window.alert("Passed 1 " + messageJSON.recipient + " vs " + MyAvatar.sessionUUID); // Window.alert("Passed 1 " + messageJSON.recipient + " vs " + MyAvatar.sessionUUID);
pushReceivedItemToQueue(sender, AvatarList.getAvatar(sender).displayName, messageJSON.type, messageJSON.name, messageJSON.url); pushReceivedItemToQueue(sender, messageJSON.type, messageJSON.name, messageJSON.url);
} }
} }
// print("Message received:"); // print("Message received:");
@ -143,10 +143,16 @@ function loadSettings() {
inventorySettings = Settings.getValue(inventorySettingsString); inventorySettings = Settings.getValue(inventorySettingsString);
} }
function pushReceivedItemToQueue(senderUUID, senderName, type, name, url) { function pushReceivedItemToQueue(senderUUID, type, name, url) {
console.info("Receiving an item:", name, "from:", senderUUID);
var getAvatarData = AvatarList.getAvatar(senderUUID);
var senderName = getAvatarData.sessionDisplayName;
var senderDistance = Vec3.distance(MyAvatar.position, getAvatarData.position);
var packageRequest = { var packageRequest = {
"senderUUID": senderUUID, "senderUUID": senderUUID,
"senderName": senderName, "senderName": senderName,
"senderDistance": senderDistance,
"data": { "data": {
"type": type, "type": type,
"name": name, "name": name,

3
scripts/system/inventory/src/App.vue
View file

@ -163,6 +163,7 @@
<v-list-item-content> <v-list-item-content>
<v-list-item-title>{{item.data.name}}</v-list-item-title> <v-list-item-title>{{item.data.name}}</v-list-item-title>
<v-list-item-subtitle>Sent by {{item.senderName}}</v-list-item-subtitle> <v-list-item-subtitle>Sent by {{item.senderName}}</v-list-item-subtitle>
<v-list-item-subtitle>{{item.senderDistance}}m</v-list-item-subtitle>
</v-list-item-content> </v-list-item-content>
<v-btn color="success" @click="acceptReceivingItem(item)"> <v-btn color="success" @click="acceptReceivingItem(item)">
<v-icon>mdi-plus</v-icon> <v-icon>mdi-plus</v-icon>
@ -790,7 +791,7 @@ export default {
], ],
}, },
}, },
appVersion: "2.0", appVersion: "2.0.2",
darkTheme: true, darkTheme: true,
drawer: false, drawer: false,
disabledProp: true, disabledProp: true,