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 'midge/mouse-sensitivity' into 'master'

Browse Source 
Better Settings

Closes #142 and #132

See merge request veloren/veloren!216
This commit is contained in:
Marcel
2019-06-12 13:12:46 +00:00
parent 99a1f153fb 7b1258dc72
commit 9783ff56e8
9 changed files with 342 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,6 @@ use std::time::Duration;
use ui::{Event as MainMenuEvent, MainMenuUi};
use vek::*;
const FPS: u64 = 60;
pub struct MainMenuState {
main_menu_ui: MainMenuUi,
}
@ -134,7 +132,9 @@ impl PlayState for MainMenuState {
.expect("Failed to swap window buffers!");
// Wait for the next tick
clock.tick(Duration::from_millis(1000 / FPS));
clock.tick(Duration::from_millis(
1000 / (global_state.settings.graphics.max_fps as u64),
));
}
}