Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Massive amount of bugfixes, too many to list in commit log

Browse Source
This commit is contained in:
Anuken
2018-07-05 12:05:53 -04:00
parent 4a32706c5a
commit b9ef88951e
33 changed files with 278 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
View File

@@ -19,9 +19,9 @@ public class DefaultKeybinds {
new Category("General"),
"move_x", new Axis(Input.A, Input.D),
"move_y", new Axis(Input.S, Input.W),
"select", Input.MOUSE_LEFT,
"break", Input.MOUSE_RIGHT,
"shoot", Input.MOUSE_LEFT,
//"select", Input.MOUSE_LEFT,
//"break", Input.MOUSE_RIGHT,
//"shoot", Input.MOUSE_LEFT,
"rotate", new Axis(Input.SCROLL),
"dash", Input.SHIFT_LEFT,
"drop_unit", Input.SHIFT_LEFT,
@@ -39,8 +39,7 @@ public class DefaultKeybinds {
"chat_history_prev", Input.UP,
"chat_history_next", Input.DOWN,
"chat_scroll", new Axis(Input.SCROLL),
"console", Input.GRAVE,
"block_logs", Input.I
"console", Input.GRAVE
);
KeyBinds.defaultSection(section, DeviceType.controller,
@@ -49,9 +48,9 @@ public class DefaultKeybinds {
"move_y", new Axis(Input.CONTROLLER_L_STICK_VERTICAL_AXIS),
"cursor_x", new Axis(Input.CONTROLLER_R_STICK_HORIZONTAL_AXIS),
"cursor_y", new Axis(Input.CONTROLLER_R_STICK_VERTICAL_AXIS),
"select", Input.CONTROLLER_R_BUMPER,
"break", Input.CONTROLLER_L_BUMPER,
"shoot", Input.CONTROLLER_R_TRIGGER,
//"select", Input.CONTROLLER_R_BUMPER,
//"break", Input.CONTROLLER_L_BUMPER,
//"shoot", Input.CONTROLLER_R_TRIGGER,
"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),

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -300,14 +300,14 @@ public class DesktopInput extends InputHandler{
if(player.playerIndex > 0){
controlling = true;
}
/*
if(Inputs.keyTap(section,"select")){
Inputs.getProcessor().touchDown((int)getMouseX(), (int)getMouseY(), player.playerIndex, Buttons.LEFT);
}
if(Inputs.keyRelease(section,"select")){
Inputs.getProcessor().touchUp((int)getMouseX(), (int)getMouseY(), player.playerIndex, Buttons.LEFT);
}
}*/
float xa = Inputs.getAxis(section, "cursor_x");
float ya = Inputs.getAxis(section, "cursor_y");