diff --git a/core/assets/saves/settings.bin b/core/assets/saves/settings.bin new file mode 100644 index 0000000000..44231e7b88 Binary files /dev/null and b/core/assets/saves/settings.bin differ diff --git a/core/assets/saves/settings_backup.bin b/core/assets/saves/settings_backup.bin new file mode 100644 index 0000000000..44231e7b88 Binary files /dev/null and b/core/assets/saves/settings_backup.bin differ diff --git a/core/assets/steam_appid.txt b/core/assets/steam_appid.txt new file mode 100644 index 0000000000..8ba324483e --- /dev/null +++ b/core/assets/steam_appid.txt @@ -0,0 +1 @@ +1127400 diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index dbc26c34fb..6d0ab81cc5 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -527,7 +527,9 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ spawner = null; } - avoidOthers(); + if(isLocal || Net.server()){ + avoidOthers(); + } Tile tile = world.tileWorld(x, y); diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index e2360e16e5..aebe5859b0 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -214,7 +214,12 @@ public class Maps implements Disposable{ return filters; }else{ - return JsonIO.read(Array.class, str); + try{ + return JsonIO.read(Array.class, str); + }catch(Exception e){ + e.printStackTrace(); + return readFilters(""); + } } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 6c6b0beaaf..72a01f3070 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -242,9 +242,9 @@ public class HudFragment extends Fragment{ IntFormat fps = new IntFormat("fps"); IntFormat ping = new IntFormat("ping"); - info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left(); + info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left().style("outline"); info.row(); - info.label(() -> ping.get(Net.getPing())).visible(Net::client).left(); + info.label(() -> ping.get(Net.getPing())).visible(Net::client).left().style("outline"); }).top().left(); }); diff --git a/ios/data/Default-568h@2x~iphone.png b/ios/data/Default-568h@2x~iphone.png index 153c6efdf4..9a0e377f65 100644 Binary files a/ios/data/Default-568h@2x~iphone.png and b/ios/data/Default-568h@2x~iphone.png differ diff --git a/ios/data/Default-667h.png b/ios/data/Default-667h.png index b3acc10e67..b5a4b57681 100644 Binary files a/ios/data/Default-667h.png and b/ios/data/Default-667h.png differ diff --git a/ios/data/Default-736h.png b/ios/data/Default-736h.png index f5a22468a3..8d05a25f44 100644 Binary files a/ios/data/Default-736h.png and b/ios/data/Default-736h.png differ diff --git a/ios/data/Default-Landscape-736h.png b/ios/data/Default-Landscape-736h.png index 04e32d4d7e..70badabb86 100644 Binary files a/ios/data/Default-Landscape-736h.png 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 index 239e218934..da2884cfd1 100644 Binary files a/ios/data/Default-Landscape@2x~ipad.png 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 index 7374a80f75..3b101edc7e 100644 Binary files a/ios/data/Default-Landscape~ipad.png 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 index c00e06f4e4..0989e62081 100644 Binary files a/ios/data/Default-Portrait@2x~ipad.png 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 index 030e88c898..9f980c961a 100644 Binary files a/ios/data/Default-Portrait~ipad.png and b/ios/data/Default-Portrait~ipad.png differ diff --git a/ios/data/Default@2x~iphone.png b/ios/data/Default@2x~iphone.png index 5724809f89..710599b407 100644 Binary files a/ios/data/Default@2x~iphone.png and b/ios/data/Default@2x~iphone.png differ diff --git a/ios/data/Default~iphone.png b/ios/data/Default~iphone.png index fa72316347..527d691cc0 100644 Binary files a/ios/data/Default~iphone.png and b/ios/data/Default~iphone.png differ diff --git a/ios/data/LaunchImage-1125@3x~iphoneX-portrait_1125x2436.png b/ios/data/LaunchImage-1125@3x~iphoneX-portrait_1125x2436.png new file mode 100644 index 0000000000..30becfa864 Binary files /dev/null and b/ios/data/LaunchImage-1125@3x~iphoneX-portrait_1125x2436.png differ diff --git a/ios/data/LaunchImage-1242@3x~iphoneXsMax-portrait_1242x2688.png b/ios/data/LaunchImage-1242@3x~iphoneXsMax-portrait_1242x2688.png new file mode 100644 index 0000000000..589d99310d Binary files /dev/null and b/ios/data/LaunchImage-1242@3x~iphoneXsMax-portrait_1242x2688.png differ diff --git a/ios/data/LaunchImage-1792@2x~iphoneXr-landscape_1792x828.png b/ios/data/LaunchImage-1792@2x~iphoneXr-landscape_1792x828.png new file mode 100644 index 0000000000..00606ad968 Binary files /dev/null and b/ios/data/LaunchImage-1792@2x~iphoneXr-landscape_1792x828.png differ diff --git a/ios/data/LaunchImage-2436@3x~iphoneX-landscape_2436x1125.png b/ios/data/LaunchImage-2436@3x~iphoneX-landscape_2436x1125.png new file mode 100644 index 0000000000..8139855a3d Binary files /dev/null and b/ios/data/LaunchImage-2436@3x~iphoneX-landscape_2436x1125.png differ diff --git a/ios/data/LaunchImage-2688@3x~iphoneXsMax-landscape_2688x1242.png b/ios/data/LaunchImage-2688@3x~iphoneXsMax-landscape_2688x1242.png new file mode 100644 index 0000000000..375095171a Binary files /dev/null and b/ios/data/LaunchImage-2688@3x~iphoneXsMax-landscape_2688x1242.png differ diff --git a/ios/data/LaunchImage-828@2x~iphoneXr-portrait_828x1792.png b/ios/data/LaunchImage-828@2x~iphoneXr-portrait_828x1792.png new file mode 100644 index 0000000000..c1c1d28ed1 Binary files /dev/null and b/ios/data/LaunchImage-828@2x~iphoneXr-portrait_828x1792.png differ