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

switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0

Browse Source
This commit is contained in:
Marcel Märtens 2020-09-22 12:04:07 +02:00
parent 8eec46424f
commit b7dc17c11f
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/util/mod.rs
View File

@ -4,6 +4,7 @@ mod option;
pub const GIT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/githash")); pub const GIT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/githash"));
pub const GIT_TAG: &str = include_str!(concat!(env!("OUT_DIR"), "/gittag")); pub const GIT_TAG: &str = include_str!(concat!(env!("OUT_DIR"), "/gittag"));
pub const VELOREN_VERSION_STAGE: &str = "Pre-Alpha";
lazy_static::lazy_static! { lazy_static::lazy_static! {
pub static ref GIT_HASH: &'static str = GIT_VERSION.split('/').next().expect("failed to retrieve git_hash!"); pub static ref GIT_HASH: &'static str = GIT_VERSION.split('/').next().expect("failed to retrieve git_hash!");
@ -11,9 +12,9 @@ lazy_static::lazy_static! {
pub static ref GIT_DATE: String = GIT_DATETIME.split('-').take(3).collect::<Vec<&str>>().join("-"); pub static ref GIT_DATE: String = GIT_DATETIME.split('-').take(3).collect::<Vec<&str>>().join("-");
pub static ref GIT_TIME: &'static str = GIT_DATETIME.split('-').nth(3).expect("failed to retrieve git_time!"); pub static ref GIT_TIME: &'static str = GIT_DATETIME.split('-').nth(3).expect("failed to retrieve git_time!");
pub static ref DISPLAY_VERSION: String = if GIT_TAG == "" { pub static ref DISPLAY_VERSION: String = if GIT_TAG == "" {
format!("nightly-{}", GIT_DATE.to_string()) format!("{}-{}", VELOREN_VERSION_STAGE, GIT_DATE.to_string())
} else { } else {
format!("stable-{}", GIT_TAG.to_string()) format!("{}-{}", VELOREN_VERSION_STAGE, GIT_TAG.to_string())
}; };
pub static ref DISPLAY_VERSION_LONG: String = if GIT_TAG == "" { pub static ref DISPLAY_VERSION_LONG: String = if GIT_TAG == "" {
format!("{} ({})", DISPLAY_VERSION.as_str(), GIT_HASH.to_string()) format!("{} ({})", DISPLAY_VERSION.as_str(), GIT_HASH.to_string())

2
voxygen/src/hud/mod.rs
View File

@ -732,7 +732,7 @@ impl Hud {
.set(self.ids.hurt_bg, ui_widgets); .set(self.ids.hurt_bg, ui_widgets);
} }
// Alpha Disclaimer // Alpha Disclaimer
Text::new(&format!("Veloren Pre-Alpha {}", &version)) Text::new(&format!("Veloren {}", &version))
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.font_size(self.fonts.cyri.scale(10)) .font_size(self.fonts.cyri.scale(10))
.color(TEXT_COLOR) .color(TEXT_COLOR)

2
voxygen/src/menu/char_selection/ui.rs
View File

@ -717,7 +717,7 @@ impl CharSelectionUi {
.set(self.ids.version, ui_widgets); .set(self.ids.version, ui_widgets);
// Alpha Disclaimer // Alpha Disclaimer
Text::new(&format!( Text::new(&format!(
"Veloren Pre-Alpha {}", "Veloren {}",
common::util::DISPLAY_VERSION.as_str() common::util::DISPLAY_VERSION.as_str()
)) ))
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)

2
voxygen/src/menu/main/ui.rs
View File

@ -361,7 +361,7 @@ impl<'a> MainMenuUi {
.set(self.ids.version, ui_widgets); .set(self.ids.version, ui_widgets);
// Alpha Disclaimer // Alpha Disclaimer
Text::new(&format!( Text::new(&format!(
"Veloren Pre-Alpha {}", "Veloren {}",
common::util::DISPLAY_VERSION.as_str() common::util::DISPLAY_VERSION.as_str()
)) ))
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)