Map bugfixes / Sprite tweak / Zone loadout moved to dialog

This commit is contained in:
Anuken
2019-04-29 23:58:16 -04:00
parent 378be0ef86
commit 3c643c917a
25 changed files with 1142 additions and 1145 deletions

View File

@@ -130,7 +130,7 @@ public class DesktopInput extends InputHandler{
player.isShooting = false;
}
if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap)){
if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen()){
if(!ui.minimap.isShown()){
ui.minimap.show();
}else{
@@ -145,8 +145,6 @@ public class DesktopInput extends InputHandler{
renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
}
//renderer.minimap.zoomBy(-Core.input.axisTap(Binding.zoom_minimap));
if(player.isDead()){
cursorType = SystemCursor.arrow;
return;