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

Improve controller keybindings

Browse Source
This commit is contained in:
AdaLovegirls 2021-02-14 18:51:49 -06:00
parent 0da363e420
commit 390812f54e
4 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed crafting recipes involving shiny gems to use diamonds instead. - Changed crafting recipes involving shiny gems to use diamonds instead.
- Cave scatter now includes all 6 gems. - Cave scatter now includes all 6 gems.
- Adjusted Stonework Defender loot table to remove mindflayer drops (bag, staff, glider). - Adjusted Stonework Defender loot table to remove mindflayer drops (bag, staff, glider).
- Changed default controller key bindings
### Removed ### Removed
@ -61,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
one of them active at the same time one of them active at the same time
- Made zooming work on wayland - Made zooming work on wayland
- Fixed AI behavior so only humanoids will attempt to roll - Fixed AI behavior so only humanoids will attempt to roll
- Fixed missing GameInputs (sneak, swimup, swimdown) in controller mapping
## [0.8.0] - 2020-11-28 ## [0.8.0] - 2020-11-28

9
voxygen/src/controller.rs
View File

@ -104,6 +104,15 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
map.entry(settings.game_buttons.climb_down) map.entry(settings.game_buttons.climb_down)
.or_default() .or_default()
.push(GameInput::ClimbDown); .push(GameInput::ClimbDown);
map.entry(settings.game_buttons.swimup)
.or_default()
.push(GameInput::SwimUp);
map.entry(settings.game_buttons.swimdown)
.or_default()
.push(GameInput::SwimDown);
map.entry(settings.game_buttons.sneak)
.or_default()
.push(GameInput::Sneak);
/*map.entry(settings.game_buttons.wall_leap) /*map.entry(settings.game_buttons.wall_leap)
.or_default() .or_default()
.push(GameInput::WallLeap);*/ .push(GameInput::WallLeap);*/

30
voxygen/src/settings.rs
View File

@ -393,8 +393,8 @@ pub mod con_settings {
Self { Self {
primary: Button::Simple(GilButton::RightTrigger2), primary: Button::Simple(GilButton::RightTrigger2),
secondary: Button::Simple(GilButton::LeftTrigger2), secondary: Button::Simple(GilButton::LeftTrigger2),
toggle_cursor: Button::Simple(GilButton::Select), toggle_cursor: Button::Simple(GilButton::Unknown),
escape: Button::Simple(GilButton::Mode), escape: Button::Simple(GilButton::Start),
enter: Button::Simple(GilButton::Unknown), enter: Button::Simple(GilButton::Unknown),
command: Button::Simple(GilButton::Unknown), command: Button::Simple(GilButton::Unknown),
move_forward: Button::Simple(GilButton::Unknown), move_forward: Button::Simple(GilButton::Unknown),
@ -402,36 +402,36 @@ pub mod con_settings {
move_back: Button::Simple(GilButton::Unknown), move_back: Button::Simple(GilButton::Unknown),
move_right: Button::Simple(GilButton::Unknown), move_right: Button::Simple(GilButton::Unknown),
jump: Button::Simple(GilButton::South), jump: Button::Simple(GilButton::South),
sit: Button::Simple(GilButton::West), sit: Button::Simple(GilButton::Unknown),
dance: Button::Simple(GilButton::Unknown), dance: Button::Simple(GilButton::Unknown),
glide: Button::Simple(GilButton::LeftTrigger), glide: Button::Simple(GilButton::LeftTrigger),
climb: Button::Simple(GilButton::South), climb: Button::Simple(GilButton::South),
climb_down: Button::Simple(GilButton::Unknown), climb_down: Button::Simple(GilButton::East),
swimup: Button::Simple(GilButton::South), swimup: Button::Simple(GilButton::South),
swimdown: Button::Simple(GilButton::Unknown), swimdown: Button::Simple(GilButton::East),
sneak: Button::Simple(GilButton::Unknown), sneak: Button::Simple(GilButton::East),
//wall_leap: Button::Simple(GilButton::Unknown), //wall_leap: Button::Simple(GilButton::Unknown),
toggle_lantern: Button::Simple(GilButton::East), toggle_lantern: Button::Simple(GilButton::DPadLeft),
mount: Button::Simple(GilButton::North), mount: Button::Simple(GilButton::North),
map: Button::Simple(GilButton::DPadRight), map: Button::Simple(GilButton::Select),
bag: Button::Simple(GilButton::DPadDown), bag: Button::Simple(GilButton::DPadRight),
quest_log: Button::Simple(GilButton::Unknown), quest_log: Button::Simple(GilButton::Unknown),
character_window: Button::Simple(GilButton::Unknown), character_window: Button::Simple(GilButton::Unknown),
social: Button::Simple(GilButton::Unknown), social: Button::Simple(GilButton::Unknown),
crafting: Button::Simple(GilButton::Unknown), crafting: Button::Simple(GilButton::DPadDown),
spellbook: Button::Simple(GilButton::Unknown), spellbook: Button::Simple(GilButton::Unknown),
settings: Button::Simple(GilButton::Unknown), settings: Button::Simple(GilButton::Unknown),
help: Button::Simple(GilButton::Unknown), help: Button::Simple(GilButton::Unknown),
toggle_interface: Button::Simple(GilButton::Unknown), toggle_interface: Button::Simple(GilButton::Unknown),
toggle_debug: Button::Simple(GilButton::Unknown), toggle_debug: Button::Simple(GilButton::Unknown),
fullscreen: Button::Simple(GilButton::Unknown), fullscreen: Button::Simple(GilButton::Unknown),
screenshot: Button::Simple(GilButton::DPadUp), screenshot: Button::Simple(GilButton::Unknown),
toggle_ingame_ui: Button::Simple(GilButton::Unknown), toggle_ingame_ui: Button::Simple(GilButton::Unknown),
roll: Button::Simple(GilButton::RightTrigger), roll: Button::Simple(GilButton::RightTrigger),
respawn: Button::Simple(GilButton::RightTrigger2), respawn: Button::Simple(GilButton::South),
interact: Button::Simple(GilButton::LeftTrigger2), interact: Button::Simple(GilButton::North),
toggle_wield: Button::Simple(GilButton::DPadLeft), toggle_wield: Button::Simple(GilButton::West),
swap_loadout: Button::Simple(GilButton::Unknown), swap_loadout: Button::Simple(GilButton::LeftThumb),
//charge: Button::Simple(GilButton::Unknown), //charge: Button::Simple(GilButton::Unknown),
} }
} }

4
voxygen/src/window.rs
View File

@ -778,7 +778,9 @@ impl Window {
AxisGameAction::CameraY => { AxisGameAction::CameraY => {
self.events.push(Event::AnalogGameInput( self.events.push(Event::AnalogGameInput(
AnalogGameInput::CameraY( AnalogGameInput::CameraY(
value // TODO: Use pan_invert_y here. Remove - in
// front of `value` as well
-value
* self.controller_settings.pan_sensitivity * self.controller_settings.pan_sensitivity
as f32 as f32
/ 100.0, / 100.0,