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

review comments

Browse Source
This commit is contained in:
Maxicarlos08 2023-10-02 22:39:30 +02:00
parent 7734b653e7
commit a3be68930e
No known key found for this signature in database
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/i18n/en/common.ftl
View File

@ -2,8 +2,6 @@ common-username = username
common-singleplayer = Singleplayer common-singleplayer = Singleplayer
common-multiplayer = Multiplayer common-multiplayer = Multiplayer
common-servers = Servers common-servers = Servers
common-server = Server
common-client = Client
common-quit = Quit common-quit = Quit
common-settings = Settings common-settings = Settings
common-languages = Languages common-languages = Languages

29
assets/voxygen/i18n/en/hud/misc.ftl
View File

@ -60,19 +60,22 @@ hud-stay= Stay
hud-sit = Sit hud-sit = Sit
hud-steer = Steer hud-steer = Steer
hud-portal = Portal hud-portal = Portal
-server = Server
-client = Client
hud-init-stage-singleplayer = Starting singleplayer server... hud-init-stage-singleplayer = Starting singleplayer server...
hud-init-stage-server-db-migrations = [{ common-server }]: Applying database migrations... hud-init-stage-server-db-migrations = [{ -server }]: Applying database migrations...
hud-init-stage-server-db-vacuum = [{ common-server }]: Cleaning up database... hud-init-stage-server-db-vacuum = [{ -server }]: Cleaning up database...
hud-init-stage-server-worldsim-erosion = [{ common-server }]: Erosion { $percentage }% hud-init-stage-server-worldsim-erosion = [{ -server }]: Erosion { $percentage }%
hud-init-stage-server-worldciv-civcreate = [{ common-server }]: Generated { $generated } out of { $total } civilizations hud-init-stage-server-worldciv-civcreate = [{ -server }]: Generated { $generated } out of { $total } civilizations
hud-init-stage-server-worldciv-site = [{ common-server }]: Generating sites... hud-init-stage-server-worldciv-site = [{ -server }]: Generating sites...
hud-init-stage-server-economysim = [{ common-server }]: Simulating economy... hud-init-stage-server-economysim = [{ -server }]: Simulating economy...
hud-init-stage-server-spotgen = [{ common-server }]: Generating spots... hud-init-stage-server-spotgen = [{ -server }]: Generating spots...
hud-init-stage-server-starting = [{ common-server }]: Starting server... hud-init-stage-server-starting = [{ -server }]: Starting server...
hud-init-stage-multiplayer = Starting multiplayer hud-init-stage-multiplayer = Starting multiplayer
hud-init-stage-client-connection-establish = [{ common-client }]: Establishing connection to server... hud-init-stage-client-connection-establish = [{ -client }]: Establishing connection to server...
hud-init-stage-client-request-server-version = [{ common-client }]: Waiting for server version... hud-init-stage-client-request-server-version = [{ -client }]: Waiting for server version...
hud-init-stage-client-authentication = [{ common-client }]: Authenticating... hud-init-stage-client-authentication = [{ -client }]: Authenticating...
hud-init-stage-client-load-init-data = [{ common-client }]: Loading initialization data from server... hud-init-stage-client-load-init-data = [{ -client }]: Loading initialization data from server...
hud-init-stage-client-starting-client = [{ common-client }]: Preparing Client... hud-init-stage-client-starting-client = [{ -client }]: Preparing Client...
hud-init-stage-render-pipeline = Creating render pipeline ({ $done }/{ $total }) hud-init-stage-render-pipeline = Creating render pipeline ({ $done }/{ $total })

1
client/examples/chat-cli/main.rs
View File

@ -64,6 +64,7 @@ fn main() {
&username, &username,
&password, &password,
|provider| provider == "https://auth.veloren.net", |provider| provider == "https://auth.veloren.net",
&|_| {},
)) ))
.expect("Failed to create client instance"); .expect("Failed to create client instance");

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

@ -36,8 +36,6 @@ pub enum DetailedInitializationStage {
CreatingRenderPipeline(usize, usize), CreatingRenderPipeline(usize, usize),
} }
// TODO: show status messages for waiting on server creation, client init, and
// pipeline creation (we can show progress of pipeline creation)
enum InitState { enum InitState {
None, None,
// Waiting on the client initialization // Waiting on the client initialization

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

@ -636,7 +636,7 @@ impl Controls {
} }
} }
fn init_stage(&mut self, stage: DetailedInitializationStage) { fn update_init_stage(&mut self, stage: DetailedInitializationStage) {
if let Screen::Connecting { init_stage, .. } = &mut self.screen { if let Screen::Connecting { init_stage, .. } = &mut self.screen {
*init_stage = stage *init_stage = stage
} }
@ -729,7 +729,7 @@ impl MainMenuUi {
pub fn update_stage(&mut self, stage: DetailedInitializationStage) { pub fn update_stage(&mut self, stage: DetailedInitializationStage) {
tracing::trace!(?stage, "Updating stage"); tracing::trace!(?stage, "Updating stage");
self.controls.init_stage(stage); self.controls.update_init_stage(stage);
} }
pub fn connected(&mut self) { self.controls.exit_connect_screen(); } pub fn connected(&mut self) { self.controls.exit_connect_screen(); }