From eda80fb36fe5cea974f3ab4d9c94cb74cc8e38ed Mon Sep 17 00:00:00 2001 From: Alexia Mandeville Date: Thu, 2 Aug 2018 13:26:08 -0700 Subject: [PATCH 1/5] updating emote app icon --- .../icons/tablet-icons/EmoteAppIcon.svg | 54 ++++++++++++++----- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg index 340f0fcd2f..382f61467f 100644 --- a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg +++ b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg @@ -1,21 +1,47 @@ - + - - - - + + + + + + + + + + + + + + + + + + + From c58322387a9cb1bb976d85ea9e581917cfdf80b8 Mon Sep 17 00:00:00 2001 From: Alexia Mandeville Date: Fri, 3 Aug 2018 13:05:20 -0700 Subject: [PATCH 2/5] Increase stroke width on icon --- .../icons/tablet-icons/EmoteAppIcon.svg | 132 ++++++++++++++---- 1 file changed, 102 insertions(+), 30 deletions(-) diff --git a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg index 382f61467f..4882337358 100644 --- a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg +++ b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg @@ -1,5 +1,5 @@ - + From b3426f695bb4a8a371322c8834a13d6d6330cb4e Mon Sep 17 00:00:00 2001 From: Alexia Mandeville Date: Fri, 3 Aug 2018 15:12:18 -0700 Subject: [PATCH 3/5] Making icon bigger --- .../icons/tablet-icons/EmoteAppIcon.svg | 142 ++++-------------- 1 file changed, 31 insertions(+), 111 deletions(-) diff --git a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg index 4882337358..cef6e8771b 100644 --- a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg +++ b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg @@ -5,115 +5,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + From 38973f0840441148e4a1dfded2ddd30b86df003a Mon Sep 17 00:00:00 2001 From: Alexia Mandeville Date: Thu, 9 Aug 2018 16:00:36 -0700 Subject: [PATCH 4/5] Adding icon states to emote app, active state --- .../icons/tablet-icons/EmoteAppIcon.svg | 39 ------------------- .../resources/icons/tablet-icons/emote-a.svg | 30 ++++++++++++++ .../resources/icons/tablet-icons/emote-i.svg | 33 ++++++++++++++++ scripts/system/emote.js | 3 +- 4 files changed, 65 insertions(+), 40 deletions(-) delete mode 100644 interface/resources/icons/tablet-icons/EmoteAppIcon.svg create mode 100644 interface/resources/icons/tablet-icons/emote-a.svg create mode 100644 interface/resources/icons/tablet-icons/emote-i.svg diff --git a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg b/interface/resources/icons/tablet-icons/EmoteAppIcon.svg deleted file mode 100644 index cef6e8771b..0000000000 --- a/interface/resources/icons/tablet-icons/EmoteAppIcon.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - diff --git a/interface/resources/icons/tablet-icons/emote-a.svg b/interface/resources/icons/tablet-icons/emote-a.svg new file mode 100644 index 0000000000..981bb77566 --- /dev/null +++ b/interface/resources/icons/tablet-icons/emote-a.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/interface/resources/icons/tablet-icons/emote-i.svg b/interface/resources/icons/tablet-icons/emote-i.svg new file mode 100644 index 0000000000..57a957052e --- /dev/null +++ b/interface/resources/icons/tablet-icons/emote-i.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + diff --git a/scripts/system/emote.js b/scripts/system/emote.js index d484078b7b..6dfd1ae1ef 100644 --- a/scripts/system/emote.js +++ b/scripts/system/emote.js @@ -46,7 +46,8 @@ var activeTimer = false; // Used to cancel active timer if a user plays an anima var activeEmote = false; // To keep track of the currently playing emote button = tablet.addButton({ - icon: "icons/tablet-icons/EmoteAppIcon.svg", + icon: "icons/tablet-icons/emote-i.svg", + activeIcon: "icons/tablet-icons/emote-a.svg", text: EMOTE_LABEL, sortOrder: EMOTE_APP_SORT_ORDER }); From 91365aeff4453ffe83780a3e1a2f94cae0d31bfa Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 10 Aug 2018 11:31:17 -0700 Subject: [PATCH 5/5] make avatar kill packets from mixer reliable --- assignment-client/src/avatars/AvatarMixer.cpp | 13 ++++++++----- .../src/avatars/AvatarMixerClientData.cpp | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index bbc774eea6..8f1df9c321 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -447,18 +447,21 @@ void AvatarMixer::handleAvatarKilled(SharedNodePointer avatarNode) { // send a kill packet for it to our other nodes nodeList->eachMatchingNode([&](const SharedNodePointer& node) { // we relay avatar kill packets to agents that are not upstream - // and downstream avatar mixers, if the node that was just killed was being replicated - return (node->getType() == NodeType::Agent && !node->isUpstream()) || - (avatarNode->isReplicated() && shouldReplicateTo(*avatarNode, *node)); + // and downstream avatar mixers, if the node that was just killed was being replicatedConnectedAgent + return node->getActiveSocket() && + ((node->getType() == NodeType::Agent && !node->isUpstream()) || + (avatarNode->isReplicated() && shouldReplicateTo(*avatarNode, *node))); }, [&](const SharedNodePointer& node) { if (node->getType() == NodeType::Agent) { if (!killPacket) { - killPacket = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID + sizeof(KillAvatarReason)); + killPacket = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID + sizeof(KillAvatarReason), true); killPacket->write(avatarNode->getUUID().toRfc4122()); killPacket->writePrimitive(KillAvatarReason::AvatarDisconnected); } - nodeList->sendUnreliablePacket(*killPacket, *node); + auto killPacketCopy = NLPacket::createCopy(*killPacket); + + nodeList->sendPacket(std::move(killPacketCopy), *node); } else { // send a replicated kill packet to the downstream avatar mixer if (!replicatedKillPacket) { diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index e185fe9167..9aa3e88b52 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -108,7 +108,7 @@ uint16_t AvatarMixerClientData::getLastBroadcastSequenceNumber(const QUuid& node void AvatarMixerClientData::ignoreOther(SharedNodePointer self, SharedNodePointer other) { if (!isRadiusIgnoring(other->getUUID())) { addToRadiusIgnoringSet(other->getUUID()); - auto killPacket = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID + sizeof(KillAvatarReason)); + auto killPacket = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID + sizeof(KillAvatarReason), true); killPacket->write(other->getUUID().toRfc4122()); if (self->isIgnoreRadiusEnabled()) { killPacket->writePrimitive(KillAvatarReason::TheirAvatarEnteredYourBubble); @@ -116,7 +116,7 @@ void AvatarMixerClientData::ignoreOther(SharedNodePointer self, SharedNodePointe killPacket->writePrimitive(KillAvatarReason::YourAvatarEnteredTheirBubble); } setLastBroadcastTime(other->getUUID(), 0); - DependencyManager::get()->sendUnreliablePacket(*killPacket, *self); + DependencyManager::get()->sendPacket(std::move(killPacket), *self); } }