From 95a799cf85d147207085e49a1c436819d4133c8d Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Fri, 3 Jul 2020 12:17:55 +0200 Subject: [PATCH] fix artifacts, cleanup --- assets/voxygen/element/buttons/arrow_down.png | 3 + .../element/buttons/arrow_down_hover.png | 3 + .../element/buttons/arrow_down_press.png | 3 + assets/voxygen/element/buttons/grid.vox | 3 - assets/voxygen/element/buttons/inv_tab.vox | 3 - .../element/buttons/settings_button.png | 3 + .../element/buttons/settings_button.vox | 3 - .../element/buttons/settings_button_hover.png | 3 + .../element/buttons/settings_button_hover.vox | 3 - .../element/buttons/settings_button_press.png | 3 + .../element/buttons/settings_button_press.vox | 3 - .../buttons/settings_button_pressed.png | 3 + .../buttons/settings_button_pressed.vox | 3 - assets/voxygen/element/buttons/social_tab.png | 3 + assets/voxygen/element/buttons/social_tab.vox | 3 - .../element/buttons/social_tab_hover.png | 3 + .../element/buttons/social_tab_hover.vox | 3 - .../element/buttons/social_tab_press.png | 3 + .../element/buttons/social_tab_press.vox | 3 - .../element/buttons/social_tab_pressed.png | 3 + .../element/buttons/social_tab_pressed.vox | 3 - assets/voxygen/element/frames/bag.vox | 3 - assets/voxygen/element/frames/banner.vox | 3 - .../voxygen/element/frames/banner_bottom.vox | 3 - assets/voxygen/element/frames/banner_top.vox | 3 - assets/voxygen/element/frames/esc menu.vox | 3 - assets/voxygen/element/frames/esc_menu.png | 3 + assets/voxygen/element/frames/esc_menu.vox | 3 - assets/voxygen/element/frames/inv_grid.vox | 3 - assets/voxygen/element/frames/settings_l.png | 3 + assets/voxygen/element/frames/settings_l.vox | 3 - assets/voxygen/element/frames/settings_r.png | 3 + assets/voxygen/element/frames/settings_r.vox | 3 - .../voxygen/element/frames/social_frame.png | 3 + .../voxygen/element/frames/social_frame.vox | 3 - assets/voxygen/element/frames/tab_bg.vox | 3 - .../element/frames/tab_small_closed.vox | 3 - .../voxygen/element/frames/tab_small_open.vox | 3 - assets/voxygen/element/frames/window.vox | 3 - assets/voxygen/element/frames/window2.vox | 3 - assets/voxygen/element/frames/window_3.png | 3 + assets/voxygen/element/frames/window_3.vox | 3 - assets/voxygen/element/frames/window_4.vox | 4 +- voxygen/src/hud/img_ids.rs | 98 +++++++++---------- 44 files changed, 94 insertions(+), 134 deletions(-) create mode 100644 assets/voxygen/element/buttons/arrow_down.png create mode 100644 assets/voxygen/element/buttons/arrow_down_hover.png create mode 100644 assets/voxygen/element/buttons/arrow_down_press.png delete mode 100644 assets/voxygen/element/buttons/grid.vox delete mode 100644 assets/voxygen/element/buttons/inv_tab.vox create mode 100644 assets/voxygen/element/buttons/settings_button.png delete mode 100644 assets/voxygen/element/buttons/settings_button.vox create mode 100644 assets/voxygen/element/buttons/settings_button_hover.png delete mode 100644 assets/voxygen/element/buttons/settings_button_hover.vox create mode 100644 assets/voxygen/element/buttons/settings_button_press.png delete mode 100644 assets/voxygen/element/buttons/settings_button_press.vox create mode 100644 assets/voxygen/element/buttons/settings_button_pressed.png delete mode 100644 assets/voxygen/element/buttons/settings_button_pressed.vox create mode 100644 assets/voxygen/element/buttons/social_tab.png delete mode 100644 assets/voxygen/element/buttons/social_tab.vox create mode 100644 assets/voxygen/element/buttons/social_tab_hover.png delete mode 100644 assets/voxygen/element/buttons/social_tab_hover.vox create mode 100644 assets/voxygen/element/buttons/social_tab_press.png delete mode 100644 assets/voxygen/element/buttons/social_tab_press.vox create mode 100644 assets/voxygen/element/buttons/social_tab_pressed.png delete mode 100644 assets/voxygen/element/buttons/social_tab_pressed.vox delete mode 100644 assets/voxygen/element/frames/bag.vox delete mode 100644 assets/voxygen/element/frames/banner.vox delete mode 100644 assets/voxygen/element/frames/banner_bottom.vox delete mode 100644 assets/voxygen/element/frames/banner_top.vox delete mode 100644 assets/voxygen/element/frames/esc menu.vox create mode 100644 assets/voxygen/element/frames/esc_menu.png delete mode 100644 assets/voxygen/element/frames/esc_menu.vox delete mode 100644 assets/voxygen/element/frames/inv_grid.vox create mode 100644 assets/voxygen/element/frames/settings_l.png delete mode 100644 assets/voxygen/element/frames/settings_l.vox create mode 100644 assets/voxygen/element/frames/settings_r.png delete mode 100644 assets/voxygen/element/frames/settings_r.vox create mode 100644 assets/voxygen/element/frames/social_frame.png delete mode 100644 assets/voxygen/element/frames/social_frame.vox delete mode 100644 assets/voxygen/element/frames/tab_bg.vox delete mode 100644 assets/voxygen/element/frames/tab_small_closed.vox delete mode 100644 assets/voxygen/element/frames/tab_small_open.vox delete mode 100644 assets/voxygen/element/frames/window.vox delete mode 100644 assets/voxygen/element/frames/window2.vox create mode 100644 assets/voxygen/element/frames/window_3.png delete mode 100644 assets/voxygen/element/frames/window_3.vox diff --git a/assets/voxygen/element/buttons/arrow_down.png b/assets/voxygen/element/buttons/arrow_down.png new file mode 100644 index 0000000000..c8cbb0e5ba --- /dev/null +++ b/assets/voxygen/element/buttons/arrow_down.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51fa6fe5a7c20d02dc7487f003cbd20c6ef717d56bfe70d3ddec0981baba7357 +size 213 diff --git a/assets/voxygen/element/buttons/arrow_down_hover.png b/assets/voxygen/element/buttons/arrow_down_hover.png new file mode 100644 index 0000000000..74dc1caf81 --- /dev/null +++ b/assets/voxygen/element/buttons/arrow_down_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6963319880d4ebfd7b8177ca820d125b9176bf97f0f248c723c875dc040a253b +size 223 diff --git a/assets/voxygen/element/buttons/arrow_down_press.png b/assets/voxygen/element/buttons/arrow_down_press.png new file mode 100644 index 0000000000..4f6fa85d1f --- /dev/null +++ b/assets/voxygen/element/buttons/arrow_down_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7c4685f6a2166454aa321a1e06b083731ea4e2d92c4dae6129a0b5d59f4d18c +size 226 diff --git a/assets/voxygen/element/buttons/grid.vox b/assets/voxygen/element/buttons/grid.vox deleted file mode 100644 index ed50eae910..0000000000 --- a/assets/voxygen/element/buttons/grid.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8fbdc3f10eb9c1710259ea3e304a418fee8d176af850350016c1be256798462 -size 45134 diff --git a/assets/voxygen/element/buttons/inv_tab.vox b/assets/voxygen/element/buttons/inv_tab.vox deleted file mode 100644 index dc60c1323b..0000000000 --- a/assets/voxygen/element/buttons/inv_tab.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab46da914aa73fd0a7aff023883cd5392d01f0609383d4c143d5c3680b65250a -size 57195 diff --git a/assets/voxygen/element/buttons/settings_button.png b/assets/voxygen/element/buttons/settings_button.png new file mode 100644 index 0000000000..84bcca559a --- /dev/null +++ b/assets/voxygen/element/buttons/settings_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:758c2604a3c14da72e48e4696376062f83414173526857838590e20294d9bb7c +size 146 diff --git a/assets/voxygen/element/buttons/settings_button.vox b/assets/voxygen/element/buttons/settings_button.vox deleted file mode 100644 index d1ef8159d4..0000000000 --- a/assets/voxygen/element/buttons/settings_button.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6753e1e0ed55b5737960a05af603f3329f21610416a356448c92ecf070e2344 -size 5676 diff --git a/assets/voxygen/element/buttons/settings_button_hover.png b/assets/voxygen/element/buttons/settings_button_hover.png new file mode 100644 index 0000000000..d536857ad7 --- /dev/null +++ b/assets/voxygen/element/buttons/settings_button_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86a9eb1cc71a23697877fc90d5598ce50e28a59687e2d71c8bf33109547a9826 +size 193 diff --git a/assets/voxygen/element/buttons/settings_button_hover.vox b/assets/voxygen/element/buttons/settings_button_hover.vox deleted file mode 100644 index 3929d7279a..0000000000 --- a/assets/voxygen/element/buttons/settings_button_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b90b3c3254f3116ff755af1fd5d677391f565abbd4a5e256df9f648a1a1816ef -size 5676 diff --git a/assets/voxygen/element/buttons/settings_button_press.png b/assets/voxygen/element/buttons/settings_button_press.png new file mode 100644 index 0000000000..9aeeed727b --- /dev/null +++ b/assets/voxygen/element/buttons/settings_button_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a492fcc1dd85a0b9912f2a98e4f2d18471b2008c36549202c181ab31876aa38a +size 161 diff --git a/assets/voxygen/element/buttons/settings_button_press.vox b/assets/voxygen/element/buttons/settings_button_press.vox deleted file mode 100644 index 3c6ef84a0f..0000000000 --- a/assets/voxygen/element/buttons/settings_button_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b258cceeddd311f3d4590568deba0ecd20a8357c9fd566c43dc281b53cdb724 -size 3652 diff --git a/assets/voxygen/element/buttons/settings_button_pressed.png b/assets/voxygen/element/buttons/settings_button_pressed.png new file mode 100644 index 0000000000..1c1d0c0d5a --- /dev/null +++ b/assets/voxygen/element/buttons/settings_button_pressed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecaedca34a47acc21be8a74588fef406ca5dcf23846cf04f38220ea6256da16e +size 129 diff --git a/assets/voxygen/element/buttons/settings_button_pressed.vox b/assets/voxygen/element/buttons/settings_button_pressed.vox deleted file mode 100644 index 69ea91e107..0000000000 --- a/assets/voxygen/element/buttons/settings_button_pressed.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4b72716beed6e09099509b44cb9799fe336d9b20a526b8d14c2dff92e99657f -size 50359 diff --git a/assets/voxygen/element/buttons/social_tab.png b/assets/voxygen/element/buttons/social_tab.png new file mode 100644 index 0000000000..bd778be483 --- /dev/null +++ b/assets/voxygen/element/buttons/social_tab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e30786d526a5d51b5b8b7803ea06f4f8ab6cdfd9abae9d73dc6d03cc0ded279 +size 146 diff --git a/assets/voxygen/element/buttons/social_tab.vox b/assets/voxygen/element/buttons/social_tab.vox deleted file mode 100644 index 9cf9ce4319..0000000000 --- a/assets/voxygen/element/buttons/social_tab.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e7b8fa60b1f44ba2f4c3bd2af4ac96ca0c77224f0539cb82ff55c01b558fb48 -size 5528 diff --git a/assets/voxygen/element/buttons/social_tab_hover.png b/assets/voxygen/element/buttons/social_tab_hover.png new file mode 100644 index 0000000000..9bc655c891 --- /dev/null +++ b/assets/voxygen/element/buttons/social_tab_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:259504971cb3556ac8ff9334948f86aadd2802ccd11cd0312111311f91594889 +size 190 diff --git a/assets/voxygen/element/buttons/social_tab_hover.vox b/assets/voxygen/element/buttons/social_tab_hover.vox deleted file mode 100644 index e69ea03317..0000000000 --- a/assets/voxygen/element/buttons/social_tab_hover.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b4aa1df2ce98140c9fa79a518df1f9c66e6528a8a7e7346a6371ba9a87199c3 -size 5528 diff --git a/assets/voxygen/element/buttons/social_tab_press.png b/assets/voxygen/element/buttons/social_tab_press.png new file mode 100644 index 0000000000..55a860b6ea --- /dev/null +++ b/assets/voxygen/element/buttons/social_tab_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4cf97702ed6bda6816e3db9c73e4d79edb80ff3b36f46a6655aa4ec2b8f799a +size 161 diff --git a/assets/voxygen/element/buttons/social_tab_press.vox b/assets/voxygen/element/buttons/social_tab_press.vox deleted file mode 100644 index 7c164ce849..0000000000 --- a/assets/voxygen/element/buttons/social_tab_press.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b2cc35617c963a4b76483c9fdda82a94c545bf2c9c2fd23a8a6efa53830338b -size 3576 diff --git a/assets/voxygen/element/buttons/social_tab_pressed.png b/assets/voxygen/element/buttons/social_tab_pressed.png new file mode 100644 index 0000000000..f08a6d844c --- /dev/null +++ b/assets/voxygen/element/buttons/social_tab_pressed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39f0f6f47134cebd56389348843bd632dd33c2955d03d4ec36a5afe4bbfed5c3 +size 128 diff --git a/assets/voxygen/element/buttons/social_tab_pressed.vox b/assets/voxygen/element/buttons/social_tab_pressed.vox deleted file mode 100644 index 3f35488cbb..0000000000 --- a/assets/voxygen/element/buttons/social_tab_pressed.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ecc52840a6a478fb58e4d6cd171932386bf426ea67e2fd6d8f70c7fc2496e87 -size 7056 diff --git a/assets/voxygen/element/frames/bag.vox b/assets/voxygen/element/frames/bag.vox deleted file mode 100644 index 524db58df9..0000000000 --- a/assets/voxygen/element/frames/bag.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9976b08c1b352ceae1770b37bf58c9b803420311839b0fa3b8077f9bc4351afb -size 103536 diff --git a/assets/voxygen/element/frames/banner.vox b/assets/voxygen/element/frames/banner.vox deleted file mode 100644 index c22657d78e..0000000000 --- a/assets/voxygen/element/frames/banner.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a6975e66ab8b86e71d5e8a4014674242128aa1b1015f32d0552d3f229051927 -size 78932 diff --git a/assets/voxygen/element/frames/banner_bottom.vox b/assets/voxygen/element/frames/banner_bottom.vox deleted file mode 100644 index 3f31382c48..0000000000 --- a/assets/voxygen/element/frames/banner_bottom.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f09ccdb5d99fbfc0cdf37b386bf50f872123cdc32a91a80e8a2daf1fc992096 -size 62420 diff --git a/assets/voxygen/element/frames/banner_top.vox b/assets/voxygen/element/frames/banner_top.vox deleted file mode 100644 index a8f77722ac..0000000000 --- a/assets/voxygen/element/frames/banner_top.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69bef51fe28d1428b7564bfa1c28c88641b7770d75745b491b0ae7e12eb2d6ee -size 55820 diff --git a/assets/voxygen/element/frames/esc menu.vox b/assets/voxygen/element/frames/esc menu.vox deleted file mode 100644 index f8c42e5ccc..0000000000 --- a/assets/voxygen/element/frames/esc menu.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:184cc4eb64493aae944fa3265acd739f4c79cd2bf15d047da2698af4d1088cd0 -size 79928 diff --git a/assets/voxygen/element/frames/esc_menu.png b/assets/voxygen/element/frames/esc_menu.png new file mode 100644 index 0000000000..00e793c849 --- /dev/null +++ b/assets/voxygen/element/frames/esc_menu.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb602785e700e309f4fd0788bff49d9afdbb5ed7f6f4cde9f0cc03db0aac32d7 +size 276 diff --git a/assets/voxygen/element/frames/esc_menu.vox b/assets/voxygen/element/frames/esc_menu.vox deleted file mode 100644 index de72424efe..0000000000 --- a/assets/voxygen/element/frames/esc_menu.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b588ad596f31ccdc3826a5a59c45601c81c8916c56c5b266f5d82bf87f18ace -size 75292 diff --git a/assets/voxygen/element/frames/inv_grid.vox b/assets/voxygen/element/frames/inv_grid.vox deleted file mode 100644 index d279cc5128..0000000000 --- a/assets/voxygen/element/frames/inv_grid.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac0457fb29642d553de63897e289fe6f314e0fd54670df0a49a00604fddcb97e -size 83816 diff --git a/assets/voxygen/element/frames/settings_l.png b/assets/voxygen/element/frames/settings_l.png new file mode 100644 index 0000000000..c62f856974 --- /dev/null +++ b/assets/voxygen/element/frames/settings_l.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:428ff7b46ac5743f8534c11cad93c89a6e5df416019c1ff36d6701a97c2199e8 +size 531 diff --git a/assets/voxygen/element/frames/settings_l.vox b/assets/voxygen/element/frames/settings_l.vox deleted file mode 100644 index 8a19bcbc12..0000000000 --- a/assets/voxygen/element/frames/settings_l.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:779e62e6e00c57ddc1c1b26da93a636b69befccb9f1e4a5c61b7c8eb5265491a -size 235456 diff --git a/assets/voxygen/element/frames/settings_r.png b/assets/voxygen/element/frames/settings_r.png new file mode 100644 index 0000000000..b0916979f5 --- /dev/null +++ b/assets/voxygen/element/frames/settings_r.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdefc30dabafb2b844bf0ae6361270a00fc3a1faa6cc6f032261e426c99362d1 +size 560 diff --git a/assets/voxygen/element/frames/settings_r.vox b/assets/voxygen/element/frames/settings_r.vox deleted file mode 100644 index 0497bfa70a..0000000000 --- a/assets/voxygen/element/frames/settings_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:138e6f4105eab2f37a42145a108dbf5d5f998bbbce39125d822869694299500d -size 195996 diff --git a/assets/voxygen/element/frames/social_frame.png b/assets/voxygen/element/frames/social_frame.png new file mode 100644 index 0000000000..6eae35c0c5 --- /dev/null +++ b/assets/voxygen/element/frames/social_frame.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39f08dfd2f9bf36d2c35649ee61be87e78cc284aac5259581d11d529dc99cf69 +size 378 diff --git a/assets/voxygen/element/frames/social_frame.vox b/assets/voxygen/element/frames/social_frame.vox deleted file mode 100644 index 0f4e305b0e..0000000000 --- a/assets/voxygen/element/frames/social_frame.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:277cec8316a95763e12c82e1a301b3340a11e46e059d81fddcaf4ba28da14ae6 -size 89525 diff --git a/assets/voxygen/element/frames/tab_bg.vox b/assets/voxygen/element/frames/tab_bg.vox deleted file mode 100644 index 25ee6a6d31..0000000000 --- a/assets/voxygen/element/frames/tab_bg.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:472e5b6b123a61e9462b487d95608961dd5375497d505c973a5bfabd69574938 -size 70424 diff --git a/assets/voxygen/element/frames/tab_small_closed.vox b/assets/voxygen/element/frames/tab_small_closed.vox deleted file mode 100644 index 3e318262d9..0000000000 --- a/assets/voxygen/element/frames/tab_small_closed.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d39eb0235217529f28f60172f1d5df9c5e5285a1bb23f3bb80482d9a692a86f5 -size 1408 diff --git a/assets/voxygen/element/frames/tab_small_open.vox b/assets/voxygen/element/frames/tab_small_open.vox deleted file mode 100644 index 834ed2d131..0000000000 --- a/assets/voxygen/element/frames/tab_small_open.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cd222b358e97e6ada43f9473543423e4266f248f72c490c8b9d660e2840200c -size 1388 diff --git a/assets/voxygen/element/frames/window.vox b/assets/voxygen/element/frames/window.vox deleted file mode 100644 index cc1ec0d0e2..0000000000 --- a/assets/voxygen/element/frames/window.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e00dce196b1454d243126fca7ce2b5ea3c1f23391a4debec2bd774cff6dc22d -size 208320 diff --git a/assets/voxygen/element/frames/window2.vox b/assets/voxygen/element/frames/window2.vox deleted file mode 100644 index 0f7a118d72..0000000000 --- a/assets/voxygen/element/frames/window2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c26453e1da7b3f4f32f3016f0456cbc4864298abb12d714db3c08a1f867c52fb -size 267279 diff --git a/assets/voxygen/element/frames/window_3.png b/assets/voxygen/element/frames/window_3.png new file mode 100644 index 0000000000..4e04d080b0 --- /dev/null +++ b/assets/voxygen/element/frames/window_3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:166610f316fb89a672a8e97548d467758436c903a0e929eccdfaf914b656d04f +size 500 diff --git a/assets/voxygen/element/frames/window_3.vox b/assets/voxygen/element/frames/window_3.vox deleted file mode 100644 index 534f4fe15e..0000000000 --- a/assets/voxygen/element/frames/window_3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:502eb49272f79935ccd309a53c67db691f64736e2aa18814e51f75e86a83e6cd -size 252692 diff --git a/assets/voxygen/element/frames/window_4.vox b/assets/voxygen/element/frames/window_4.vox index 5ef43b401e..ff4e167cb1 100644 --- a/assets/voxygen/element/frames/window_4.vox +++ b/assets/voxygen/element/frames/window_4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1fd9cf331ae3bf6a45de507b5e28072fac2566a65086334dc0de7e1932ba5f8 -size 56924 +oid sha256:2df7f5b338e39c3618352a19a16ba7548e712eb456b2a90826d5d8a61fd9b0b2 +size 2440 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 3a47770581..4421fb5cf1 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -20,43 +20,9 @@ rotation_image_ids! { image_ids! { pub struct Imgs { - // Window Parts - window_3: "voxygen.element.frames.window_3", - tab_bg: "voxygen.element.frames.tab_bg", - tab_small_open: "voxygen.element.frames.tab_small_open", - tab_small_closed: "voxygen.element.frames.tab_small_closed", - // Missing: Buff Frame Animation .gif ?! we could do animation in ui.maintain, or in shader? - window_frame: "voxygen.element.frames.window2", - - // Social Window - social_button: "voxygen.element.buttons.social_tab", - social_button_pressed: "voxygen.element.buttons.social_tab_pressed", - social_button_hover: "voxygen.element.buttons.social_tab_hover", - social_button_press: "voxygen.element.buttons.social_tab_press", - social_frame: "voxygen.element.frames.social_frame", - - - // Settings Window - settings_frame_r: "voxygen.element.frames.settings_r", - settings_frame_l: "voxygen.element.frames.settings_l", - settings_button: "voxygen.element.buttons.settings_button", - settings_button_pressed: "voxygen.element.buttons.settings_button_pressed", - settings_button_hover: "voxygen.element.buttons.settings_button_hover", - settings_button_press: "voxygen.element.buttons.settings_button_press", - esc_frame: "voxygen.element.frames.esc_menu", - - // Chat-Arrows - chat_arrow: "voxygen.element.buttons.arrow_down", - chat_arrow_mo: "voxygen.element.buttons.arrow_down_hover", - chat_arrow_press: "voxygen.element.buttons.arrow_down_press", - - //////////////////////////////////////////////////////////////////////// - - // Skill Icons - // Icons flower: "voxygen.element.icons.item_flower", grass: "voxygen.element.icons.item_grass", @@ -73,12 +39,10 @@ image_ids! { checkbox_checked: "voxygen.element.buttons.checkbox.active", checkbox_checked_mo: "voxygen.element.buttons.checkbox.hover", - // Charwindow xp_charwindow: "voxygen.element.frames.xp_charwindow", divider: "voxygen.element.frames.divider_charwindow", - // Items potion_red: "voxygen.voxel.object.potion_red", potion_green: "voxygen.voxel.object.potion_green", @@ -91,6 +55,24 @@ image_ids! { + // Social Window + social_button: "voxygen.element.buttons.social_tab", + social_button_pressed: "voxygen.element.buttons.social_tab_pressed", + social_button_hover: "voxygen.element.buttons.social_tab_hover", + social_button_press: "voxygen.element.buttons.social_tab_press", + social_frame: "voxygen.element.frames.social_frame", + + // Chat-Arrows + chat_arrow: "voxygen.element.buttons.arrow_down", + chat_arrow_mo: "voxygen.element.buttons.arrow_down_hover", + chat_arrow_press: "voxygen.element.buttons.arrow_down_press", + + // Settings Window + settings_button: "voxygen.element.buttons.settings_button", + settings_button_pressed: "voxygen.element.buttons.settings_button_pressed", + settings_button_hover: "voxygen.element.buttons.settings_button_hover", + settings_button_press: "voxygen.element.buttons.settings_button_press", + quest_bg: "voxygen.element.misc_bg.temp_quest_bg", // Slider @@ -116,6 +98,25 @@ image_ids! { spellbook_hover: "voxygen.element.buttons.spellbook_hover", spellbook_press: "voxygen.element.buttons.spellbook_press", + // Skill Icons + twohsword_m1: "voxygen.element.icons.2hsword_m1", + twohsword_m2: "voxygen.element.icons.2hsword_m2", + onehdagger_m1: "voxygen.element.icons.daggers", + onehdagger_m2: "voxygen.element.icons.skill_slice_2", + onehshield_m1: "voxygen.element.icons.swordshield", + onehshield_m2: "voxygen.element.icons.character", + twohhammer_m1: "voxygen.element.icons.2hhammer_m1", + twohhammer_m2: "voxygen.element.icons.2hhammer_m2", + twohaxe_m1: "voxygen.element.icons.2haxe_m1", + twohaxe_m2: "voxygen.element.icons.2haxe_m2", + bow_m1: "voxygen.element.icons.bow_m1", + bow_m2: "voxygen.element.icons.bow_m2", + staff_m1: "voxygen.element.icons.staff_m1", + staff_m2: "voxygen.element.icons.staff_m2", + flyingrod_m1: "voxygen.element.icons.debug_wand_m1", + flyingrod_m2: "voxygen.element.icons.debug_wand_m2", + charge: "voxygen.element.icons.skill_charge_3", + // Skillbar level_up: "voxygen.element.misc_bg.level_up", level_down:"voxygen.element.misc_bg.level_down", @@ -135,24 +136,6 @@ image_ids! { skillbar_slot_l_act: "voxygen.element.skillbar.skillbar_slot_l_active", skillbar_slot_r_act: "voxygen.element.skillbar.skillbar_slot_r_active", - // Skill Icons - twohsword_m1: "voxygen.element.icons.2hsword_m1", - twohsword_m2: "voxygen.element.icons.2hsword_m2", - onehdagger_m1: "voxygen.element.icons.daggers", - onehdagger_m2: "voxygen.element.icons.skill_slice_2", - onehshield_m1: "voxygen.element.icons.swordshield", - onehshield_m2: "voxygen.element.icons.character", - twohhammer_m1: "voxygen.element.icons.2hhammer_m1", - twohhammer_m2: "voxygen.element.icons.2hhammer_m2", - twohaxe_m1: "voxygen.element.icons.2haxe_m1", - twohaxe_m2: "voxygen.element.icons.2haxe_m2", - bow_m1: "voxygen.element.icons.bow_m1", - bow_m2: "voxygen.element.icons.bow_m2", - staff_m1: "voxygen.element.icons.staff_m1", - staff_m2: "voxygen.element.icons.staff_m2", - flyingrod_m1: "voxygen.element.icons.debug_wand_m1", - flyingrod_m2: "voxygen.element.icons.debug_wand_m2", - charge: "voxygen.element.icons.skill_charge_3", // Other Icons/Art skull: "voxygen.element.icons.skull", @@ -194,6 +177,13 @@ image_ids! { mmap_minus_hover: "voxygen.element.buttons.min_plus.mmap_button-min_hover", mmap_minus_press: "voxygen.element.buttons.min_plus.mmap_button-min_press", + // Window Parts + window_3: "voxygen.element.frames.window_3", + esc_frame: "voxygen.element.frames.esc_menu", + // Settings + settings_frame_r: "voxygen.element.frames.settings_r", + settings_frame_l: "voxygen.element.frames.settings_l", + // Close-Button close_btn: "voxygen.element.buttons.close_btn", close_btn_hover: "voxygen.element.buttons.close_btn_hover",