diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index bdf02f8053..832b2faed0 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -177,7 +177,7 @@ public class NetServer extends Module{ if(!Timers.get("fastshoot-" + id + "-" + weapon.id, wtrc)){ info.fastShots.getAndIncrement(weapon.id, 0, 1); - if(info.fastShots.get(weapon.id, 0) > (int)(wtrc / (weapon.getReload() / 2f)) + 6){ + if(info.fastShots.get(weapon.id, 0) > (int)(wtrc / (weapon.getReload() / 2f)) + 8){ kick(id, KickReason.kick); } }else{ diff --git a/ios/data/Default-1024w-1366h@2x~ipad.png b/ios/data/Default-1024w-1366h@2x~ipad.png deleted file mode 100644 index b175eaab6d..0000000000 Binary files a/ios/data/Default-1024w-1366h@2x~ipad.png and /dev/null differ diff --git a/ios/data/Default-375w-667h@2x.png b/ios/data/Default-375w-667h@2x.png deleted file mode 100644 index f213ce60df..0000000000 Binary files a/ios/data/Default-375w-667h@2x.png and /dev/null differ diff --git a/ios/data/Default-414w-736h@3x.png b/ios/data/Default-414w-736h@3x.png deleted file mode 100644 index 685ba51fcb..0000000000 Binary files a/ios/data/Default-414w-736h@3x.png and /dev/null differ diff --git a/ios/data/Default-568h@2x.png b/ios/data/Default-568h@2x.png deleted file mode 100644 index 101752fe77..0000000000 Binary files a/ios/data/Default-568h@2x.png and /dev/null differ 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.png b/ios/data/Default.png deleted file mode 100644 index f1a5582a01..0000000000 Binary files a/ios/data/Default.png and /dev/null differ diff --git a/ios/data/Default@2x.png b/ios/data/Default@2x.png deleted file mode 100644 index ca32f62fc2..0000000000 Binary files a/ios/data/Default@2x.png and /dev/null differ diff --git a/ios/data/Default@2x~ipad.png b/ios/data/Default@2x~ipad.png deleted file mode 100644 index bb77ef073e..0000000000 Binary files a/ios/data/Default@2x~ipad.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~ipad.png b/ios/data/Default~ipad.png deleted file mode 100644 index 855e4f2ad9..0000000000 Binary files a/ios/data/Default~ipad.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 diff --git a/ios/data/Icon-72.png b/ios/data/Icon-72.png deleted file mode 100644 index 8cc575912f..0000000000 Binary files a/ios/data/Icon-72.png and /dev/null differ diff --git a/ios/data/Icon-72@2x.png b/ios/data/Icon-72@2x.png deleted file mode 100644 index ec5e3803fa..0000000000 Binary files a/ios/data/Icon-72@2x.png and /dev/null differ diff --git a/ios/data/Icon.png b/ios/data/Icon.png deleted file mode 100644 index 7f4bf36359..0000000000 Binary files a/ios/data/Icon.png and /dev/null differ diff --git a/ios/data/Icon@2x.png b/ios/data/Icon@2x.png deleted file mode 100644 index eddc17c575..0000000000 Binary files a/ios/data/Icon@2x.png and /dev/null differ diff --git a/ios/data/icon-72.png b/ios/data/icon-72.png new file mode 100644 index 0000000000..b5ac036c98 Binary files /dev/null and b/ios/data/icon-72.png differ diff --git a/ios/data/icon-72@2x.png b/ios/data/icon-72@2x.png new file mode 100644 index 0000000000..b58b93d117 Binary files /dev/null and b/ios/data/icon-72@2x.png differ diff --git a/ios/data/icon.png b/ios/data/icon.png new file mode 100644 index 0000000000..7a00e2b46a Binary files /dev/null and b/ios/data/icon.png differ diff --git a/ios/data/icon@2x.png b/ios/data/icon@2x.png new file mode 100644 index 0000000000..1b76170cd0 Binary files /dev/null and b/ios/data/icon@2x.png differ diff --git a/ios/src/io/anuke/mindustry/TextFieldDialogListener.java b/ios/src/io/anuke/mindustry/TextFieldDialogListener.java index fb09244b81..527e45c6ef 100644 --- a/ios/src/io/anuke/mindustry/TextFieldDialogListener.java +++ b/ios/src/io/anuke/mindustry/TextFieldDialogListener.java @@ -72,7 +72,6 @@ public class TextFieldDialogListener { public boolean shouldEnableFirstOtherButton(UIAlertView alertView) { return false; } - }; String[] otherButtons = new String[1];