Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-10-31 13:03:22 -04:00
commit 4d34f16fcd

View File

@ -345,6 +345,10 @@ public class DesktopInput extends InputHandler{
ui.schematics.show();
}).tooltip("@schematics");
table.button(Icon.book, Styles.clearPartiali, () -> {
ui.database.show();
}).tooltip("@database");
table.button(Icon.tree, Styles.clearPartiali, () -> {
ui.research.show();
}).visible(() -> state.isCampaign()).tooltip("@research");
@ -352,8 +356,6 @@ public class DesktopInput extends InputHandler{
table.button(Icon.map, Styles.clearPartiali, () -> {
ui.planet.show();
}).visible(() -> state.isCampaign()).tooltip("@planetmap");
table.add();
}
void pollInput(){