Merge branch 'cherry-pick-2ef5fb90' into 'master'

Fix missing controller actions

See merge request veloren/veloren!1786

CHANGELOG.md

@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Made zooming work on wayland
 - Fixed AI behavior so only humanoids will attempt to roll
 - Fixed missing GameInputs (sneak, swimup, swimdown) in controller mapping
+- Fixed missing controller actions (dance and crafting)
 - Fixed a bug where the stairs to the boss floor in dungeons would sometimes not spawn
 - Fixed waypoints being placed underwater
 

voxygen/src/controller.rs

@@ -95,6 +95,9 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
                 map.entry(settings.game_buttons.sit)
                     .or_default()
                     .push(GameInput::Sit);
+                map.entry(settings.game_buttons.dance)
+                    .or_default()
+                    .push(GameInput::Dance);
                 map.entry(settings.game_buttons.glide)
                     .or_default()
                     .push(GameInput::Glide);
@@ -131,6 +134,9 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
                 map.entry(settings.game_buttons.social)
                     .or_default()
                     .push(GameInput::Social);
+                map.entry(settings.game_buttons.crafting)
+                    .or_default()
+                    .push(GameInput::Crafting);
                 map.entry(settings.game_buttons.spellbook)
                     .or_default()
                     .push(GameInput::Spellbook);