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

one painful merge later

Browse Source
This commit is contained in:
Anuken
2018-06-02 00:46:40 -04:00
parent 89d8aa99ac ca3bfa2239
commit ba805739b0
14 changed files with 290 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,8 @@ public class DefaultKeybinds {
"chat_history_prev", Input.UP,
"chat_history_next", Input.DOWN,
"chat_scroll", new Axis(Input.SCROLL),
"console", Input.GRAVE
"console", Input.GRAVE,
"block_logs", Input.I,
);
KeyBinds.defaultSection(section, DeviceType.controller,

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

@@ -151,7 +151,7 @@ public class DesktopInput extends InputHandler{
renderer.minimap().zoomBy(-(int)Inputs.getAxisTapped(section,"zoom_minimap"));
rotation = Mathf.mod(rotation + (int)Inputs.getAxisTapped(section,"rotate"), 4);
Tile cursor = tileAt(control.gdxInput().getX(), control.gdxInput().getY());
if(cursor != null){
@@ -165,6 +165,16 @@ public class DesktopInput extends InputHandler{
&& cursor.block() == Blocks.air){
cursorType = drill;
}
if(recipe == null && !ui.hasMouse() && Inputs.keyDown("block_info")
&& cursor.block().fullDescription != null){
cursorType = hand;
if(Inputs.keyTap("select")){
ui.hudfrag.blockfrag.showBlockInfo(cursor.block());
Cursors.restoreCursor();
cursorType = normal;
}
}
}
if(!ui.hasMouse()) {