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 
Changed default server address to 'server.veloren.net'

See merge request veloren/veloren!43

Former-commit-id: 60cfa39be80cbe2fc4a1f6db21b19c5850aa65e6
This commit is contained in:
Joshua Barretto 2019-04-17 15:08:56 +00:00
commit f44b05f9d3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
voxygen/src/main.rs
View File

@ -31,6 +31,9 @@ use crate::{
settings::Settings settings::Settings
}; };
/// The URL of the default public server that Voxygen will connect to
const DEFAULT_PUBLIC_SERVER: &'static str = "server.veloren.net";
/// A type used to store state that is shared between all play states /// A type used to store state that is shared between all play states
pub struct GlobalState { pub struct GlobalState {
settings: Settings, settings: Settings,

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

@ -1,4 +1,5 @@
use crate::{ use crate::{
DEFAULT_PUBLIC_SERVER,
render::Renderer, render::Renderer,
ui::{self, ScaleMode, Ui}, ui::{self, ScaleMode, Ui},
window::Window, window::Window,
@ -137,7 +138,7 @@ impl MainMenuUi {
font_metamorph, font_metamorph,
font_opensans, font_opensans,
username: "Username".to_string(), username: "Username".to_string(),
server_address: "veloren.mac94.de".to_string(), server_address: DEFAULT_PUBLIC_SERVER.to_string(),
login_error: None, login_error: None,
connecting: None, connecting: None,
} }