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

Fixed #1402 / Fixed #1404

Browse Source
This commit is contained in:
Anuken
2020-01-20 14:13:20 -05:00
parent 85cf7e9d5c
commit b5258cd809
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/entities/effect/RubbleDecal.java
+5
View File
@@ -38,4 +38,9 @@ public class RubbleDecal extends Decal{
} }
Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90); Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90);
} }
@Override
public float drawSize(){
return region.getWidth() * 3f;
}
} }
core/src/mindustry/input/InputHandler.java
+1 -1
View File
@@ -704,7 +704,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
public void add(){ public void add(){
Core.input.addProcessor(detector = new GestureDetector(20, 0.5f, 0.4f, 0.15f, this)); Core.input.addProcessor(detector = new GestureDetector(20, 0.5f, 0.3f, 0.15f, this));
Core.input.addProcessor(this); Core.input.addProcessor(this);
if(Core.scene != null){ if(Core.scene != null){
Table table = (Table)Core.scene.find("inputTable"); Table table = (Table)Core.scene.find("inputTable");
core/src/mindustry/mod/Scripts.java
+2 -1
View File
@@ -11,7 +11,8 @@ import org.mozilla.javascript.*;
public class Scripts implements Disposable{ public class Scripts implements Disposable{
private final Array<String> blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk", private final Array<String> blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk",
"runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system", ".awt", "socket"); "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system",
".awt", "socket", "mod.scripts", "classloader");
private final Array<String> whitelist = Array.with("mindustry.net"); private final Array<String> whitelist = Array.with("mindustry.net");
private final Context context; private final Context context;
private final String wrapper; private final String wrapper;
gradle.properties
+1 -1
View File
@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=43de3406deffdbeca22a2ff320362cd0129e2da6 archash=85e020b1565d7f6490d2281411b810916046e5ee