From 01a9f493ccd1860b58e0111118078449ba580fe9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 24 May 2017 22:06:54 -0400 Subject: [PATCH] Fixed issues with pixelation on zooming out; removed extra side projects --- build.gradle | 2 +- core/src/io/anuke/mindustry/UI.java | 4 ++++ core/src/io/anuke/mindustry/ui/UpgradeDialog.java | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e1292c36c7..b4e088bfc4 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ project(":core") { apply plugin: "java" dependencies { - compile fileTree(dir: '../core/lib', include: '*.jar') + // compile fileTree(dir: '../core/lib', include: '*.jar') compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-ai:1.8.1" } diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index a60f2e0b89..6de20e1636 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -349,6 +349,8 @@ public class UI extends SceneModule{ if(control.cameraScale < 4){ control.cameraScale = 4; control.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + Draw.getSurface("pixel").setScale(control.cameraScale); + Draw.getSurface("shadow").setScale(control.cameraScale); } }).size(40); @@ -356,6 +358,8 @@ public class UI extends SceneModule{ if(control.cameraScale > 3){ control.cameraScale = 3; control.resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + Draw.getSurface("pixel").setScale(control.cameraScale); + Draw.getSurface("shadow").setScale(control.cameraScale); } }).size(40); diff --git a/core/src/io/anuke/mindustry/ui/UpgradeDialog.java b/core/src/io/anuke/mindustry/ui/UpgradeDialog.java index abc1ef18b8..3004410b44 100644 --- a/core/src/io/anuke/mindustry/ui/UpgradeDialog.java +++ b/core/src/io/anuke/mindustry/ui/UpgradeDialog.java @@ -109,6 +109,8 @@ public class UpgradeDialog extends Dialog{ button.addListener(tip); button.clicked(()->{ + if(button.isDisabled()) return; + Inventory.removeItems(weapon.requirements); weapons.put(weapon, true); ui.updateWeapons();