From a497fb92d3f0a1963447f074440f9920c1a4c99f Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Fri, 12 Jun 2020 00:39:57 +0200 Subject: [PATCH] icons --- .../voxygen/element/icons/chat/broadcast_offline.png | 3 +++ .../voxygen/element/icons/chat/broadcast_small.png | 4 ++-- assets/voxygen/element/icons/chat/faction.png | 4 ++-- assets/voxygen/element/icons/chat/faction_small.png | 4 ++-- assets/voxygen/element/icons/chat/group.png | 4 ++-- assets/voxygen/element/icons/chat/group_small.png | 4 ++-- assets/voxygen/element/icons/chat/kill_small.png | 4 ++-- assets/voxygen/element/icons/chat/private_small.png | 4 ++-- assets/voxygen/element/icons/chat/say.png | 4 ++-- assets/voxygen/element/icons/chat/say_small.png | 4 ++-- assets/voxygen/element/icons/chat/tell.png | 4 ++-- assets/voxygen/element/icons/chat/tell_small.png | 4 ++-- assets/voxygen/element/icons/chat/world.png | 4 ++-- assets/voxygen/element/icons/chat/world_small.png | 4 ++-- common/src/comp/chat.rs | 12 ++++++------ voxygen/src/hud/overhead.rs | 2 +- 16 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 assets/voxygen/element/icons/chat/broadcast_offline.png diff --git a/assets/voxygen/element/icons/chat/broadcast_offline.png b/assets/voxygen/element/icons/chat/broadcast_offline.png new file mode 100644 index 0000000000..5a86dd3e40 --- /dev/null +++ b/assets/voxygen/element/icons/chat/broadcast_offline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1697809c1aa4c9e23c66cbfe3bc32ea677a8ae06c518dcce1aa46cadb042d21b +size 325 diff --git a/assets/voxygen/element/icons/chat/broadcast_small.png b/assets/voxygen/element/icons/chat/broadcast_small.png index f4e11ee581..0cb8dee4d9 100644 --- a/assets/voxygen/element/icons/chat/broadcast_small.png +++ b/assets/voxygen/element/icons/chat/broadcast_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fecd03a12311c4e8123a6586983f41b97c77de2d31a4ab9fb4ff036f95756b62 -size 281 +oid sha256:08f602016c1df956106a0dbc649f90eda796510bcfe887b5d9be5d384729c906 +size 326 diff --git a/assets/voxygen/element/icons/chat/faction.png b/assets/voxygen/element/icons/chat/faction.png index 322729d7f6..86c01d1004 100644 --- a/assets/voxygen/element/icons/chat/faction.png +++ b/assets/voxygen/element/icons/chat/faction.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:315924a9a46e3387c1dc844df167032b7b5ac01cb1e9dc0d9336d0642c3829a8 -size 368 +oid sha256:6bfefbde76613e95d5ee030e95748fa7dddfd1bb75e04079f3ce8d855e4ae3e8 +size 337 diff --git a/assets/voxygen/element/icons/chat/faction_small.png b/assets/voxygen/element/icons/chat/faction_small.png index 992c9f1dd9..c9ee209a48 100644 --- a/assets/voxygen/element/icons/chat/faction_small.png +++ b/assets/voxygen/element/icons/chat/faction_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f038ad259bce5e47a321761ae6c3e721b69e07d5564de0ecf5c4b512c51f7f1 -size 240 +oid sha256:b6633c24ac73d34e5a906a64a0b981578aa663fed6968aee7d2afeb162ac8ba0 +size 303 diff --git a/assets/voxygen/element/icons/chat/group.png b/assets/voxygen/element/icons/chat/group.png index b109d4dd8f..0a2ce80139 100644 --- a/assets/voxygen/element/icons/chat/group.png +++ b/assets/voxygen/element/icons/chat/group.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f0a15259682f60dfa8ae1a8de52f2246743e6b06b8eab25fe7d5a416ae5498c -size 234 +oid sha256:0d6e217fca654ff4ca13327bdc9a78f2eea730bc51629d79978e11501e08a32e +size 362 diff --git a/assets/voxygen/element/icons/chat/group_small.png b/assets/voxygen/element/icons/chat/group_small.png index 6c2637ae1c..b2f4a547bd 100644 --- a/assets/voxygen/element/icons/chat/group_small.png +++ b/assets/voxygen/element/icons/chat/group_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6908780b4fe40303cef95338b82e72d380d03f0b2e5d4bb6cc31ce18946a0bc5 -size 263 +oid sha256:87b395adfaa16102718b6b609a317965e9fe36555d5aae4d0c7089c4f8f02f7e +size 324 diff --git a/assets/voxygen/element/icons/chat/kill_small.png b/assets/voxygen/element/icons/chat/kill_small.png index 925a6866d0..8eb20e966d 100644 --- a/assets/voxygen/element/icons/chat/kill_small.png +++ b/assets/voxygen/element/icons/chat/kill_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a07ac4a0a435a14847e28dda7d4447e56f3b4b7db3cbb478e4cc71bd2b2e5338 -size 359 +oid sha256:19d7393ee3e666b2da9728971621563b3e0513100da6de7377df2a369bb87009 +size 327 diff --git a/assets/voxygen/element/icons/chat/private_small.png b/assets/voxygen/element/icons/chat/private_small.png index c7d4877bdd..493bb76ffc 100644 --- a/assets/voxygen/element/icons/chat/private_small.png +++ b/assets/voxygen/element/icons/chat/private_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59a12c3ab7f409b49df84003a8a2efd3929feb187e6e8124438f2ef19a0b09a9 -size 238 +oid sha256:d7de5292690c23e68cb906ac1e2fe5d121552819c49fd2484b831306278e86fc +size 261 diff --git a/assets/voxygen/element/icons/chat/say.png b/assets/voxygen/element/icons/chat/say.png index 22572696f4..998246d2bf 100644 --- a/assets/voxygen/element/icons/chat/say.png +++ b/assets/voxygen/element/icons/chat/say.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eed0d46a6b45f1bbea3cc377a92437b12b2638267529942065489ddeaf3b146 -size 523 +oid sha256:fee452d32ea482ed7d9930e34e7ba7cbf5ef1d557606c616a11b0b811bd253a1 +size 356 diff --git a/assets/voxygen/element/icons/chat/say_small.png b/assets/voxygen/element/icons/chat/say_small.png index 98bf8a1bd1..180da15be0 100644 --- a/assets/voxygen/element/icons/chat/say_small.png +++ b/assets/voxygen/element/icons/chat/say_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44e9e5b592c5ece4ae4e73bc7436ae859691fc5990f8ed55690d0ebdde2eb474 -size 357 +oid sha256:acdd19fbbeddef3ae3227a82196698a8b3d599e4c932e56dc3d090847385d956 +size 353 diff --git a/assets/voxygen/element/icons/chat/tell.png b/assets/voxygen/element/icons/chat/tell.png index 60cb01ff01..fec012bcbb 100644 --- a/assets/voxygen/element/icons/chat/tell.png +++ b/assets/voxygen/element/icons/chat/tell.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ea8ee46472a2ca7cf7a7d56b7763ad81de3a8b5b84ba7d884853c042cd90c49 -size 431 +oid sha256:c664e56b2853b06ba4f55b8c6f76e5c3542a7fbd3781baef3348f309d60abda2 +size 304 diff --git a/assets/voxygen/element/icons/chat/tell_small.png b/assets/voxygen/element/icons/chat/tell_small.png index 46e922693d..f45501e030 100644 --- a/assets/voxygen/element/icons/chat/tell_small.png +++ b/assets/voxygen/element/icons/chat/tell_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d48cb6b41f752d7696de7a5fbae32233a69c9138724ba914dbe09360e0f8e6b -size 319 +oid sha256:48133a0303b822b101344d7e83c27d07048fb856bd60b6bdcfaf8dd0a62f16c2 +size 279 diff --git a/assets/voxygen/element/icons/chat/world.png b/assets/voxygen/element/icons/chat/world.png index 7dda8f8d6e..88fcdbee73 100644 --- a/assets/voxygen/element/icons/chat/world.png +++ b/assets/voxygen/element/icons/chat/world.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:317e46dfc0c7cd990dc24e436a2d57fcfd8858b8d6f2cffcbabda0601a03f24a -size 406 +oid sha256:73e648047706ea98715e86144679ddafe57f2e73f4a5d2fb8c4b1396d0de97e9 +size 415 diff --git a/assets/voxygen/element/icons/chat/world_small.png b/assets/voxygen/element/icons/chat/world_small.png index b5d7c70dca..6631bee343 100644 --- a/assets/voxygen/element/icons/chat/world_small.png +++ b/assets/voxygen/element/icons/chat/world_small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:305149ed08d99176a7449f73baf826e3d54af161af5053d65e20a35ba5ce5424 -size 287 +oid sha256:175ffdbaabf7c49ce4e86695ebf9552cdcc90cb1b3446b7373bf87f406c86bbc +size 377 diff --git a/common/src/comp/chat.rs b/common/src/comp/chat.rs index 383de9e0fa..bf4b0539ac 100644 --- a/common/src/comp/chat.rs +++ b/common/src/comp/chat.rs @@ -108,12 +108,12 @@ impl ChatMsg { ChatType::Broadcast => SpeechBubbleType::None, ChatType::Private => SpeechBubbleType::None, ChatType::Kill => SpeechBubbleType::None, - ChatType::Tell(_u, _) => SpeechBubbleType::None, - ChatType::Say(_u) => SpeechBubbleType::None, - ChatType::Group(_u, _s) => SpeechBubbleType::None, - ChatType::Faction(_u, _s) => SpeechBubbleType::None, - ChatType::Region(_u) => SpeechBubbleType::None, - ChatType::World(_u) => SpeechBubbleType::None, + ChatType::Tell(_u, _) => SpeechBubbleType::Tell, + ChatType::Say(_u) => SpeechBubbleType::Say, + ChatType::Group(_u, _s) => SpeechBubbleType::Group, + ChatType::Faction(_u, _s) => SpeechBubbleType::Faction, + ChatType::Region(_u) => SpeechBubbleType::Region, + ChatType::World(_u) => SpeechBubbleType::World, ChatType::Npc(_u, _r) => SpeechBubbleType::None, } } diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs index cd6c11e28c..0d05cfc2a3 100644 --- a/voxygen/src/hud/overhead.rs +++ b/voxygen/src/hud/overhead.rs @@ -59,7 +59,7 @@ pub struct Overhead<'a> { voxygen_i18n: &'a std::sync::Arc, imgs: &'a Imgs, fonts: &'a ConrodVoxygenFonts, - bubble_type: &SpeechBubbleType, + bubble_type: &'a SpeechBubbleType, #[conrod(common_builder)] common: widget::CommonBuilder, }