Fixed category bundle properties missing

This commit is contained in:
Anuken
2018-08-17 14:51:18 -04:00
parent fb8becca99
commit 25051980ce
3 changed files with 16 additions and 10 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '1d353d76e9' uCoreVersion = 'e492954e86'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()
+9 -3
View File
@@ -357,9 +357,9 @@ setting.sfxvol.name=SFX Volume
setting.mutesound.name=Mute Sound setting.mutesound.name=Mute Sound
text.keybind.title=Rebind Keys text.keybind.title=Rebind Keys
section.general.name=General category.general.name=Generalff
section.view.name=View category.view.name=View
section.multiplayer.name=Multiplayer category.multiplayer.name=Multiplayer
keybind.move_x.name=Move x keybind.move_x.name=Move x
keybind.move_y.name=Move y keybind.move_y.name=Move y
@@ -375,6 +375,12 @@ keybind.chat.name=Chat
keybind.player_list.name=Player list keybind.player_list.name=Player list
keybind.console.name=Console keybind.console.name=Console
keybind.rotate.name=Rotate 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.text.help.title=Description of modes
mode.waves.name=waves mode.waves.name=waves
@@ -16,7 +16,7 @@ public class DefaultKeybinds{
for(String section : sections){ for(String section : sections){
KeyBinds.defaultSection(section, DeviceType.keyboard, KeyBinds.defaultSection(section, DeviceType.keyboard,
new Category("General"), new Category("general"),
"move_x", new Axis(Input.A, Input.D), "move_x", new Axis(Input.A, Input.D),
"move_y", new Axis(Input.S, Input.W), "move_y", new Axis(Input.S, Input.W),
//"select", Input.MOUSE_LEFT, //"select", Input.MOUSE_LEFT,
@@ -25,14 +25,14 @@ public class DefaultKeybinds{
"rotate", new Axis(Input.SCROLL), "rotate", new Axis(Input.SCROLL),
"dash", Input.SHIFT_LEFT, "dash", Input.SHIFT_LEFT,
"drop_unit", Input.SHIFT_LEFT, "drop_unit", Input.SHIFT_LEFT,
new Category("View"), new Category("view"),
"zoom_hold", Input.CONTROL_LEFT, "zoom_hold", Input.CONTROL_LEFT,
"zoom", new Axis(Input.SCROLL), "zoom", new Axis(Input.SCROLL),
"zoom_minimap", new Axis(Input.MINUS, Input.PLUS), "zoom_minimap", new Axis(Input.MINUS, Input.PLUS),
"menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, "menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
"pause", Input.SPACE, "pause", Input.SPACE,
"toggle_menus", Input.C, "toggle_menus", Input.C,
new Category("Multiplayer"), new Category("multiplayer"),
"player_list", Input.TAB, "player_list", Input.TAB,
"chat", Input.ENTER, "chat", Input.ENTER,
"chat_history_prev", Input.UP, "chat_history_prev", Input.UP,
@@ -42,7 +42,7 @@ public class DefaultKeybinds{
); );
KeyBinds.defaultSection(section, DeviceType.controller, KeyBinds.defaultSection(section, DeviceType.controller,
new Category("General"), new Category("general"),
"move_x", new Axis(Input.CONTROLLER_L_STICK_HORIZONTAL_AXIS), "move_x", new Axis(Input.CONTROLLER_L_STICK_HORIZONTAL_AXIS),
"move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS), "move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS),
"cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS), "cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS),
@@ -53,12 +53,12 @@ public class DefaultKeybinds{
"dash", Input.CONTROLLER_Y, "dash", Input.CONTROLLER_Y,
"rotate_alt", new Axis(Input.CONTROLLER_DPAD_RIGHT, Input.CONTROLLER_DPAD_LEFT), "rotate_alt", new Axis(Input.CONTROLLER_DPAD_RIGHT, Input.CONTROLLER_DPAD_LEFT),
"rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B), "rotate", new Axis(Input.CONTROLLER_A, Input.CONTROLLER_B),
new Category("View"), new Category("view"),
"zoom_hold", Input.ANY_KEY, "zoom_hold", Input.ANY_KEY,
"zoom", new Axis(Input.CONTROLLER_DPAD_DOWN, Input.CONTROLLER_DPAD_UP), "zoom", new Axis(Input.CONTROLLER_DPAD_DOWN, Input.CONTROLLER_DPAD_UP),
"menu", Input.CONTROLLER_X, "menu", Input.CONTROLLER_X,
"pause", Input.CONTROLLER_L_TRIGGER, "pause", Input.CONTROLLER_L_TRIGGER,
new Category("Multiplayer"), new Category("multiplayer"),
"player_list", Input.CONTROLLER_START "player_list", Input.CONTROLLER_START
); );