Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pfau/loading_screen_bgs' into 'master'

Browse Source 
Add 0.10 login background and new loading screens

See merge request veloren/veloren!2386
This commit is contained in:
Marcel 2021-06-06 18:17:42 +00:00
commit bb0bb38108
16 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/background/bg_1.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_10.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_11.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_12.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_13.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_14.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_2.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_3.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_4.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_5.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_6.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_7.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_8.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_9.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_main.png (Stored with Git LFS) Normal file → Executable file
View File

Binary file not shown.

9
voxygen/src/menu/main/ui/mod.rs
View File

@ -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 {