From 336d83fc4991049a453c49d3abcc400d7cf697d0 Mon Sep 17 00:00:00 2001 From: Monty Date: Sun, 6 Jun 2021 19:30:22 +0200 Subject: [PATCH] new bgs --- assets/voxygen/background/bg_1.png | 3 +++ assets/voxygen/background/bg_10.png | 4 ++-- assets/voxygen/background/bg_11.png | 3 +++ assets/voxygen/background/bg_12.png | 4 ++-- assets/voxygen/background/bg_13.png | 4 ++-- assets/voxygen/background/bg_14.png | 3 --- assets/voxygen/background/bg_2.png | 4 ++-- assets/voxygen/background/bg_3.png | 4 ++-- assets/voxygen/background/bg_4.png | 4 ++-- assets/voxygen/background/bg_5.png | 4 ++-- assets/voxygen/background/bg_6.png | 4 ++-- assets/voxygen/background/bg_7.png | 4 ++-- assets/voxygen/background/bg_8.png | 4 ++-- assets/voxygen/background/bg_9.png | 4 ++-- assets/voxygen/background/bg_main.png | 4 ++-- voxygen/src/menu/main/ui/mod.rs | 9 +++------ 16 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 assets/voxygen/background/bg_1.png create mode 100644 assets/voxygen/background/bg_11.png delete mode 100644 assets/voxygen/background/bg_14.png mode change 100644 => 100755 assets/voxygen/background/bg_main.png diff --git a/assets/voxygen/background/bg_1.png b/assets/voxygen/background/bg_1.png new file mode 100644 index 0000000000..48772268ba --- /dev/null +++ b/assets/voxygen/background/bg_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2f501dcf2404832c9f713fc704c62bfa76b20b07b234755adb9198ff3d6893f +size 1042062 diff --git a/assets/voxygen/background/bg_10.png b/assets/voxygen/background/bg_10.png index 879688a703..466e35655c 100644 --- a/assets/voxygen/background/bg_10.png +++ b/assets/voxygen/background/bg_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ce15f179ea21c34f76d01f8722750d12e2fb8d2505fa95a0b67d21179f01550 -size 2072669 +oid sha256:62a1fb6b416664dc346015492f4ed010eed55a4d59da25ea14837165ea5a8020 +size 2878018 diff --git a/assets/voxygen/background/bg_11.png b/assets/voxygen/background/bg_11.png new file mode 100644 index 0000000000..e4bee3831b --- /dev/null +++ b/assets/voxygen/background/bg_11.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9343b6be6caf0099edeac7260bf65103b7d1ec33211629988068b2f1412945d6 +size 3256584 diff --git a/assets/voxygen/background/bg_12.png b/assets/voxygen/background/bg_12.png index 46b915da73..ef49a9452b 100644 --- a/assets/voxygen/background/bg_12.png +++ b/assets/voxygen/background/bg_12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c749107fa64db8f0c2a1a2f52b6b8cddb94dbaea10f28af98ed7063d960a91e -size 1514301 +oid sha256:ae98e12dbdb515556281313ac8d5e93be059aaafbd3f0578c3af58750841d682 +size 505241 diff --git a/assets/voxygen/background/bg_13.png b/assets/voxygen/background/bg_13.png index e5d2d13b54..7b7eccaf52 100644 --- a/assets/voxygen/background/bg_13.png +++ b/assets/voxygen/background/bg_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d1a72735e0fad46410db7c517a80d95ddddf0b76ed798f3bcfc1098bda125c7 -size 1314819 +oid sha256:52edcbfe10dec67d5351d7940059591884f19bbc6acda7ffd3092aa7ed90ccf3 +size 1282505 diff --git a/assets/voxygen/background/bg_14.png b/assets/voxygen/background/bg_14.png deleted file mode 100644 index 466e35655c..0000000000 --- a/assets/voxygen/background/bg_14.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62a1fb6b416664dc346015492f4ed010eed55a4d59da25ea14837165ea5a8020 -size 2878018 diff --git a/assets/voxygen/background/bg_2.png b/assets/voxygen/background/bg_2.png index c078dc9993..a33086f1e9 100644 --- a/assets/voxygen/background/bg_2.png +++ b/assets/voxygen/background/bg_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1729c18f184cea4235362680c61ea36aa74581fd85478db9e6233bbe9bce0f11 -size 2939456 +oid sha256:f6149efbefa2c9acb45a5b20c36aa085e6e413ecd17c66929c2c3e20c62a3171 +size 961708 diff --git a/assets/voxygen/background/bg_3.png b/assets/voxygen/background/bg_3.png index a33086f1e9..89a5200c38 100644 --- a/assets/voxygen/background/bg_3.png +++ b/assets/voxygen/background/bg_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6149efbefa2c9acb45a5b20c36aa085e6e413ecd17c66929c2c3e20c62a3171 -size 961708 +oid sha256:27ab466038b11f3026452e0c3eb4480300a328e31a708c323dc3b0cae89c04e1 +size 2272839 diff --git a/assets/voxygen/background/bg_4.png b/assets/voxygen/background/bg_4.png index af9cf7ac6d..beed1bcbf8 100644 --- a/assets/voxygen/background/bg_4.png +++ b/assets/voxygen/background/bg_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26cddb6e1df00d6fa23437d128b20021f1442960378cd8b78716d9d89be6a4aa -size 2272863 +oid sha256:9ff1f9d09e04ca1343cb481403428d8a604e4090f2e1760caecb1a8aee149caa +size 897858 diff --git a/assets/voxygen/background/bg_5.png b/assets/voxygen/background/bg_5.png index 34705e85cb..3c320bdacb 100644 --- a/assets/voxygen/background/bg_5.png +++ b/assets/voxygen/background/bg_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5e3b6cf6d407ab7437ad79452913b465e368bb8087be829d56f398bd8da1cf5 -size 1532565 +oid sha256:0ccdede73a20ae6355782d9c10b18f868a515a27f8da79013109930b8c39bd8c +size 2044001 diff --git a/assets/voxygen/background/bg_6.png b/assets/voxygen/background/bg_6.png index beed1bcbf8..1bac40b2c7 100644 --- a/assets/voxygen/background/bg_6.png +++ b/assets/voxygen/background/bg_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ff1f9d09e04ca1343cb481403428d8a604e4090f2e1760caecb1a8aee149caa -size 897858 +oid sha256:7ae41c4fac3190e13d1bfdafe6905ede9eeb2f8bdc6b5708d28b82a499aaa5ab +size 2079829 diff --git a/assets/voxygen/background/bg_7.png b/assets/voxygen/background/bg_7.png index 2766bc8ce8..23de419292 100644 --- a/assets/voxygen/background/bg_7.png +++ b/assets/voxygen/background/bg_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43b00fe438061a3c972043d902cfa81638a3a15e6ca957b86a28cb651767a141 -size 1450305 +oid sha256:5f69f880541dbb2962060419c893b0ab061c8e429d2a836b5bdcf9733c10c7d8 +size 1100362 diff --git a/assets/voxygen/background/bg_8.png b/assets/voxygen/background/bg_8.png index d429e5eec4..b7db0e1bbb 100644 --- a/assets/voxygen/background/bg_8.png +++ b/assets/voxygen/background/bg_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd6507de7afa3bbc697fb2867fadc44184298dc9026f30fe91613c06dc72723d -size 906501 +oid sha256:b8945a91805b8c0a6fbb9f7eee972c70a47ca1ac24d25ae9b91a3aa8fff5a336 +size 659820 diff --git a/assets/voxygen/background/bg_9.png b/assets/voxygen/background/bg_9.png index 1bac40b2c7..3067fcb80c 100644 --- a/assets/voxygen/background/bg_9.png +++ b/assets/voxygen/background/bg_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ae41c4fac3190e13d1bfdafe6905ede9eeb2f8bdc6b5708d28b82a499aaa5ab -size 2079829 +oid sha256:e101b354202f8d2fc872808041930b7b683d358b35cfe95203486e175f8cf6eb +size 1585712 diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png old mode 100644 new mode 100755 index e4bee3831b..7696d64216 --- a/assets/voxygen/background/bg_main.png +++ b/assets/voxygen/background/bg_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9343b6be6caf0099edeac7260bf65103b7d1ec33211629988068b2f1412945d6 -size 3256584 +oid sha256:31135eadd773c6846a749e661197c1e95f99808f75e34b74c357476d706a5a7e +size 936308 diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs index 2df020dd57..d17c06309f 100644 --- a/voxygen/src/menu/main/ui/mod.rs +++ b/voxygen/src/menu/main/ui/mod.rs @@ -55,8 +55,8 @@ image_ids_ice! { } // Randomly loaded background images -const BG_IMGS: [&str; 12] = [ - //"voxygen.background.bg_1", +const BG_IMGS: [&str; 13] = [ + "voxygen.background.bg_1", "voxygen.background.bg_2", "voxygen.background.bg_3", "voxygen.background.bg_4", @@ -66,12 +66,9 @@ const BG_IMGS: [&str; 12] = [ "voxygen.background.bg_8", "voxygen.background.bg_9", "voxygen.background.bg_10", - //"voxygen.background.bg_11", + "voxygen.background.bg_11", "voxygen.background.bg_12", "voxygen.background.bg_13", - "voxygen.background.bg_14", - //"voxygen.background.bg_15", - //"voxygen.background.bg_16", ]; pub enum Event {