mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Make gitlab hightlight syntax for ron files (using rust syntax highlighting). Update changelog for credits addition. Fix clippy large variant issue.
This commit is contained in:
parent
691b61e22d
commit
ee42eaa515
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -8,3 +8,5 @@
|
|||||||
*.ico filter=lfs diff=lfs merge=lfs -text
|
*.ico filter=lfs diff=lfs merge=lfs -text
|
||||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||||
assets/world/map/*.bin filter=lfs diff=lfs merge=lfs -text
|
assets/world/map/*.bin filter=lfs diff=lfs merge=lfs -text
|
||||||
|
|
||||||
|
*.ron gitlab-language=rust
|
||||||
|
@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Added a setting to always show health and energy bars
|
- Added a setting to always show health and energy bars
|
||||||
- Added a crafting station icon to the crafting menu sidebar for items that could be crafted at a crafting station
|
- Added a crafting station icon to the crafting menu sidebar for items that could be crafted at a crafting station
|
||||||
- Added a setting to disable the hotkey hints
|
- Added a setting to disable the hotkey hints
|
||||||
|
- Added a credits screen in the main menu which shows attributions for assets
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ enum Screen {
|
|||||||
screen: credits::Screen,
|
screen: credits::Screen,
|
||||||
},
|
},
|
||||||
Login {
|
Login {
|
||||||
screen: login::Screen,
|
screen: Box<login::Screen>, // boxed to avoid large variant
|
||||||
// Error to display in a box
|
// Error to display in a box
|
||||||
error: Option<String>,
|
error: Option<String>,
|
||||||
},
|
},
|
||||||
@ -186,7 +186,7 @@ impl Controls {
|
|||||||
}
|
}
|
||||||
} else { */
|
} else { */
|
||||||
Screen::Login {
|
Screen::Login {
|
||||||
screen: login::Screen::new(),
|
screen: Box::new(login::Screen::new()),
|
||||||
error: None,
|
error: None,
|
||||||
};
|
};
|
||||||
//};
|
//};
|
||||||
@ -334,7 +334,7 @@ impl Controls {
|
|||||||
Message::Quit => events.push(Event::Quit),
|
Message::Quit => events.push(Event::Quit),
|
||||||
Message::Back => {
|
Message::Back => {
|
||||||
self.screen = Screen::Login {
|
self.screen = Screen::Login {
|
||||||
screen: login::Screen::new(),
|
screen: Box::new(login::Screen::new()),
|
||||||
error: None,
|
error: None,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -431,7 +431,7 @@ impl Controls {
|
|||||||
fn exit_connect_screen(&mut self) {
|
fn exit_connect_screen(&mut self) {
|
||||||
if matches!(&self.screen, Screen::Connecting { .. }) {
|
if matches!(&self.screen, Screen::Connecting { .. }) {
|
||||||
self.screen = Screen::Login {
|
self.screen = Screen::Login {
|
||||||
screen: login::Screen::new(),
|
screen: Box::new(login::Screen::new()),
|
||||||
error: None,
|
error: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -457,7 +457,7 @@ impl Controls {
|
|||||||
fn connection_error(&mut self, error: String) {
|
fn connection_error(&mut self, error: String) {
|
||||||
if matches!(&self.screen, Screen::Connecting { .. }) {
|
if matches!(&self.screen, Screen::Connecting { .. }) {
|
||||||
self.screen = Screen::Login {
|
self.screen = Screen::Login {
|
||||||
screen: login::Screen::new(),
|
screen: Box::new(login::Screen::new()),
|
||||||
error: Some(error),
|
error: Some(error),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user