diff --git a/build.gradle b/build.gradle index ffdbefc4bd..018859d28f 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '1d353d76e9' + uCoreVersion = 'e492954e86' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index e3e938a7b0..8aacb8fdf7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -357,9 +357,9 @@ setting.sfxvol.name=SFX Volume setting.mutesound.name=Mute Sound text.keybind.title=Rebind Keys -section.general.name=General -section.view.name=View -section.multiplayer.name=Multiplayer +category.general.name=Generalff +category.view.name=View +category.multiplayer.name=Multiplayer keybind.move_x.name=Move x keybind.move_y.name=Move y @@ -375,6 +375,12 @@ keybind.chat.name=Chat keybind.player_list.name=Player list keybind.console.name=Console keybind.rotate.name=Rotate +keybind.toggle_menus.name=Toggle menus +keybind.chat_history_prev.name=Chat history prev +keybind.chat_history_next.name=Chat history next +keybind.chat_scroll.name=Chat scroll +keybind.drop_unit.name=drop unit +keybind.zoom_minimap.name=Zoom minimap mode.text.help.title=Description of modes mode.waves.name=waves diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java index 94e07bf924..7df23aeff6 100644 --- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java +++ b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java @@ -16,7 +16,7 @@ public class DefaultKeybinds{ for(String section : sections){ KeyBinds.defaultSection(section, DeviceType.keyboard, - new Category("General"), + new Category("general"), "move_x", new Axis(Input.A, Input.D), "move_y", new Axis(Input.S, Input.W), //"select", Input.MOUSE_LEFT, @@ -25,14 +25,14 @@ public class DefaultKeybinds{ "rotate", new Axis(Input.SCROLL), "dash", Input.SHIFT_LEFT, "drop_unit", Input.SHIFT_LEFT, - new Category("View"), + new Category("view"), "zoom_hold", Input.CONTROL_LEFT, "zoom", new Axis(Input.SCROLL), "zoom_minimap", new Axis(Input.MINUS, Input.PLUS), "menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, "pause", Input.SPACE, "toggle_menus", Input.C, - new Category("Multiplayer"), + new Category("multiplayer"), "player_list", Input.TAB, "chat", Input.ENTER, "chat_history_prev", Input.UP, @@ -42,7 +42,7 @@ public class DefaultKeybinds{ ); KeyBinds.defaultSection(section, DeviceType.controller, - new Category("General"), + new Category("general"), "move_x", new Axis(Input.CONTROLLER_L_STICK_HORIZONTAL_AXIS), "move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS), "cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS), @@ -53,12 +53,12 @@ public class DefaultKeybinds{ "dash", Input.CONTROLLER_Y, "rotate_alt", new Axis(Input.CONTROLLER_DPAD_RIGHT, Input.CONTROLLER_DPAD_LEFT), "rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B), - new Category("View"), + new Category("view"), "zoom_hold", Input.ANY_KEY, "zoom", new Axis(Input.CONTROLLER_DPAD_DOWN, Input.CONTROLLER_DPAD_UP), "menu", Input.CONTROLLER_X, "pause", Input.CONTROLLER_L_TRIGGER, - new Category("Multiplayer"), + new Category("multiplayer"), "player_list", Input.CONTROLLER_START );