More difficulty tweaks, made sandbox work properly

2017-12-03 15:29:49 -05:00
parent 19a4dd41e3
commit 9dd2bfaeeb
42 changed files with 249 additions and 149 deletions
--- a/core/src/io/anuke/mindustry/input/Input.java
+++ b/core/src/io/anuke/mindustry/input/Input.java
@@ -25,7 +25,7 @@ public class Input{
 		//player is dead
 		if(player.health <= 0) return;
 		
-		if(Inputs.scrolled() && GameState.is(State.playing)){
+		if(Inputs.scrolled() && !GameState.is(State.menu) && !Vars.ui.onDialog()){
 			Vars.renderer.scaleCamera(Inputs.scroll());
 		}