diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/io/anuke/mindustry/entities/Predict.java index 25bb2aea84..4b26f87091 100644 --- a/core/src/io/anuke/mindustry/entities/Predict.java +++ b/core/src/io/anuke/mindustry/entities/Predict.java @@ -1,9 +1,8 @@ package io.anuke.mindustry.entities; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.math.geom.Vector2; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.entities.traits.TargetTrait; +import io.anuke.arc.math.*; +import io.anuke.arc.math.geom.*; +import io.anuke.mindustry.entities.traits.*; /** * Class for predicting shoot angles based on velocities of targets. @@ -24,8 +23,8 @@ public class Predict{ * @return the intercept location */ public static Vector2 intercept(float srcx, float srcy, float dstx, float dsty, float dstvx, float dstvy, float v){ - dstvx /= Time.delta(); - dstvy /= Time.delta(); + //dstvx /= Time.delta(); + //dstvy /= Time.delta(); float tx = dstx - srcx, ty = dsty - srcy; diff --git a/ios/data/Default-568h@2x~iphone.png b/ios/data/Default-568h@2x~iphone.png new file mode 100644 index 0000000000..f557df3353 Binary files /dev/null and b/ios/data/Default-568h@2x~iphone.png differ diff --git a/ios/data/Default-667h.png b/ios/data/Default-667h.png new file mode 100644 index 0000000000..53540c0bee Binary files /dev/null and b/ios/data/Default-667h.png differ diff --git a/ios/data/Default-736h.png b/ios/data/Default-736h.png new file mode 100644 index 0000000000..93870ef71e Binary files /dev/null and b/ios/data/Default-736h.png differ diff --git a/ios/data/Default-Landscape-736h.png b/ios/data/Default-Landscape-736h.png new file mode 100644 index 0000000000..f7e12aa617 Binary files /dev/null and b/ios/data/Default-Landscape-736h.png differ diff --git a/ios/data/Default-Landscape@2x~ipad.png b/ios/data/Default-Landscape@2x~ipad.png new file mode 100644 index 0000000000..303312fd8a Binary files /dev/null and b/ios/data/Default-Landscape@2x~ipad.png differ diff --git a/ios/data/Default-Landscape~ipad.png b/ios/data/Default-Landscape~ipad.png new file mode 100644 index 0000000000..a454227fe4 Binary files /dev/null and b/ios/data/Default-Landscape~ipad.png differ diff --git a/ios/data/Default-Portrait@2x~ipad.png b/ios/data/Default-Portrait@2x~ipad.png new file mode 100644 index 0000000000..d37ccb0ee8 Binary files /dev/null and b/ios/data/Default-Portrait@2x~ipad.png differ diff --git a/ios/data/Default-Portrait~ipad.png b/ios/data/Default-Portrait~ipad.png new file mode 100644 index 0000000000..2a421f9359 Binary files /dev/null and b/ios/data/Default-Portrait~ipad.png differ diff --git a/ios/data/Default@2x~ipad~anyany.png b/ios/data/Default@2x~ipad~anyany.png deleted file mode 100644 index 76e1f11e96..0000000000 Binary files a/ios/data/Default@2x~ipad~anyany.png and /dev/null differ diff --git a/ios/data/Default@2x~ipad~comany.png b/ios/data/Default@2x~ipad~comany.png deleted file mode 100644 index e4da687643..0000000000 Binary files a/ios/data/Default@2x~ipad~comany.png and /dev/null differ diff --git a/ios/data/Default@2x~iphone.png b/ios/data/Default@2x~iphone.png new file mode 100644 index 0000000000..3071d29ad1 Binary files /dev/null and b/ios/data/Default@2x~iphone.png differ diff --git a/ios/data/Default@2x~iphone~anyany.png b/ios/data/Default@2x~iphone~anyany.png deleted file mode 100644 index c13f403ec2..0000000000 Binary files a/ios/data/Default@2x~iphone~anyany.png and /dev/null differ diff --git a/ios/data/Default@2x~iphone~comany.png b/ios/data/Default@2x~iphone~comany.png deleted file mode 100644 index 3e4aa173c7..0000000000 Binary files a/ios/data/Default@2x~iphone~comany.png and /dev/null differ diff --git a/ios/data/Default@3x~iphone~anyany.png b/ios/data/Default@3x~iphone~anyany.png deleted file mode 100644 index 43a8e929f1..0000000000 Binary files a/ios/data/Default@3x~iphone~anyany.png and /dev/null differ diff --git a/ios/data/Default@3x~iphone~comany.png b/ios/data/Default@3x~iphone~comany.png deleted file mode 100644 index be96b99066..0000000000 Binary files a/ios/data/Default@3x~iphone~comany.png and /dev/null differ diff --git a/ios/data/Default~iphone.png b/ios/data/Default~iphone.png new file mode 100644 index 0000000000..9f3ae021da Binary files /dev/null and b/ios/data/Default~iphone.png differ