Merge branch 'pfau/loading_screen_bgs' into 'master'
Add 0.10 login background and new loading screens See merge request veloren/veloren!2386
Marcel
BIN
assets/voxygen/background/bg_1.png
Normal file
|
After Width: | Height: | Size: 1018 KiB |
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 2.7 MiB |
BIN
assets/voxygen/background/bg_11.png
Normal file
|
After Width: | Height: | Size: 3.1 MiB |
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 493 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 2.7 MiB |
|
Before Width: | Height: | Size: 2.8 MiB After Width: | Height: | Size: 939 KiB |
|
Before Width: | Height: | Size: 939 KiB After Width: | Height: | Size: 2.2 MiB |
|
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 877 KiB |
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 1.9 MiB |
|
Before Width: | Height: | Size: 877 KiB After Width: | Height: | Size: 2.0 MiB |
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 885 KiB After Width: | Height: | Size: 644 KiB |
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 1.5 MiB |
BIN
assets/voxygen/background/bg_main.png
Normal file → Executable file
|
Before Width: | Height: | Size: 3.1 MiB After Width: | Height: | Size: 914 KiB |
@ -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 {
|
||||
|
||||