mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Removed logging, added the changes to the changelog and fixed the logout button
This commit is contained in:
parent
f13314e3da
commit
6f6b8986b6
@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Added sfx for collecting, dropping and using inventory items
|
- Added sfx for collecting, dropping and using inventory items
|
||||||
- New attack animation
|
- New attack animation
|
||||||
- weapon control system
|
- weapon control system
|
||||||
|
- Game pauses when in singleplayer and pause menu
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
@ -1934,6 +1934,11 @@ impl Hud {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
Some(esc_menu::Event::Logout) => {
|
Some(esc_menu::Event::Logout) => {
|
||||||
|
// Unpause the game if we are on singleplayer so that we can logout
|
||||||
|
if let Some(singleplayer) = global_state.singleplayer.as_ref() {
|
||||||
|
singleplayer.pause(false);
|
||||||
|
};
|
||||||
|
|
||||||
events.push(Event::Logout);
|
events.push(Event::Logout);
|
||||||
},
|
},
|
||||||
Some(esc_menu::Event::Quit) => events.push(Event::Quit),
|
Some(esc_menu::Event::Quit) => events.push(Event::Quit),
|
||||||
|
@ -383,10 +383,6 @@ impl PlayState for SessionState {
|
|||||||
if global_state.singleplayer.is_none()
|
if global_state.singleplayer.is_none()
|
||||||
|| !global_state.singleplayer.as_ref().unwrap().is_paused()
|
|| !global_state.singleplayer.as_ref().unwrap().is_paused()
|
||||||
{
|
{
|
||||||
log::warn!(
|
|
||||||
"{}",
|
|
||||||
global_state.singleplayer.as_ref().unwrap().is_paused()
|
|
||||||
);
|
|
||||||
// Perform an in-game tick.
|
// Perform an in-game tick.
|
||||||
if let Err(err) = self.tick(clock.get_avg_delta()) {
|
if let Err(err) = self.tick(clock.get_avg_delta()) {
|
||||||
global_state.info_message =
|
global_state.info_message =
|
||||||
|
Loading…
Reference in New Issue
Block a user