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 'master' into 'master'

Browse Source 
Minor fixes

See merge request veloren/veloren!47

Former-commit-id: f13bfdc22534ddd900c94ff7e59bb07cca3fbc9c
This commit is contained in:
Joshua Barretto 2019-04-18 13:22:29 +00:00
commit 913bc042be
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,7 +481,7 @@ impl Hud {
fn update_layout(&mut self) -> Vec<Event> {
let mut events = Vec::new();
let ref mut ui_widgets = self.ui.set_widgets();
let version = env!("Cargo_PKG_VERSION");
let version = env!("CARGO_PKG_VERSION");
const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
const HP_COLOR: Color = Color::Rgba(0.33, 0.63, 0.0, 1.0);

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

@ -411,7 +411,7 @@ impl CharSelectionUi {
fn update_layout(&mut self) -> Vec<Event> {
let mut events = Vec::new();
let ref mut ui_widgets = self.ui.set_widgets();
let version = env!("Cargo_PKG_VERSION");
let version = env!("CARGO_PKG_VERSION");
// Character Selection /////////////////
// Supposed functionality:

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

@ -2,6 +2,7 @@ use crate::{
render::Renderer,
ui::{self, ScaleMode, Ui},
window::Window,
DEFAULT_PUBLIC_SERVER,
};
use common::assets;
use conrod_core::{
@ -152,7 +153,7 @@ impl MainMenuUi {
font_metamorph,
font_opensans,
username: "Username".to_string(),
server_address: "veloren.mac94.de".to_string(),
server_address: DEFAULT_PUBLIC_SERVER.to_string(),
login_error: None,
connecting: None,
}
@ -161,7 +162,7 @@ impl MainMenuUi {
fn update_layout(&mut self) -> Vec<Event> {
let mut events = Vec::new();
let ref mut ui_widgets = self.ui.set_widgets();
let version = env!("Cargo_PKG_VERSION");
let version = env!("CARGO_PKG_VERSION");
// Background image, Veloren logo, Alpha-Version Label
Image::new(self.imgs.bg)
.middle_of(ui_widgets.window)