diff --git a/android/ic_launcher-web.png b/android/ic_launcher-web.png index 658c1fd713..e511ce80dc 100644 Binary files a/android/ic_launcher-web.png and b/android/ic_launcher-web.png differ diff --git a/android/res/drawable/ic_launcher_background.png b/android/res/drawable/ic_launcher_background.png index 8e013ea019..d9a289a404 100644 Binary files a/android/res/drawable/ic_launcher_background.png and b/android/res/drawable/ic_launcher_background.png differ diff --git a/android/res/drawable/ic_launcher_foreground.png b/android/res/drawable/ic_launcher_foreground.png index 7adbf4e2c5..8192c19a30 100644 Binary files a/android/res/drawable/ic_launcher_foreground.png and b/android/res/drawable/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png index f4d594a423..111f1301ff 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher.png and b/android/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher_background.png b/android/res/mipmap-hdpi/ic_launcher_background.png index 4a792ac88c..b590990117 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher_background.png and b/android/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/res/mipmap-hdpi/ic_launcher_foreground.png index f4bace551a..532913af1b 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher_round.png b/android/res/mipmap-hdpi/ic_launcher_round.png index ffd1c7fca6..b294bb71d3 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher_round.png and b/android/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png index 4071a357a3..43a09e4dd3 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher.png and b/android/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher_background.png b/android/res/mipmap-mdpi/ic_launcher_background.png index 50c0775712..aa3687defe 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher_background.png and b/android/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/res/mipmap-mdpi/ic_launcher_foreground.png index 10c2324cba..ef9662943f 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher_round.png b/android/res/mipmap-mdpi/ic_launcher_round.png index 5b314cf65f..b453bff4ea 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher_round.png and b/android/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png index f76fa1cd09..b5624655ab 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher.png and b/android/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_background.png b/android/res/mipmap-xhdpi/ic_launcher_background.png index 6b4646a1c2..67381b3c90 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher_background.png and b/android/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/res/mipmap-xhdpi/ic_launcher_foreground.png index 34f6137a4d..d08ce02845 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_round.png b/android/res/mipmap-xhdpi/ic_launcher_round.png index 260458750c..98a4e2e20f 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher_round.png and b/android/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png index cde10344a7..ea3afe0e17 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher.png and b/android/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_background.png b/android/res/mipmap-xxhdpi/ic_launcher_background.png index bfda7fa416..74f320071a 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher_background.png and b/android/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png index 637925a18a..1f4c911fde 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_round.png b/android/res/mipmap-xxhdpi/ic_launcher_round.png index 8d00a8c395..c7671e3168 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher.png b/android/res/mipmap-xxxhdpi/ic_launcher.png index db23766b64..772c78f87d 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher.png and b/android/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/res/mipmap-xxxhdpi/ic_launcher_background.png index 96b6c95fbd..382e4de2e6 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher_background.png and b/android/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png index e8739f65cf..4da2f6e102 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/res/mipmap-xxxhdpi/ic_launcher_round.png index f3f3aaa547..2979014e5f 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/core/assets/icons/icon.icns b/core/assets/icons/icon.icns index 45b4c89b83..6ad4d97da2 100644 Binary files a/core/assets/icons/icon.icns and b/core/assets/icons/icon.icns differ diff --git a/core/assets/icons/icon.ico b/core/assets/icons/icon.ico index 20d4a3e150..daa38d856c 100644 Binary files a/core/assets/icons/icon.ico and b/core/assets/icons/icon.ico differ diff --git a/core/assets/icons/icon.png b/core/assets/icons/icon.png deleted file mode 100644 index 737f1c4bf7..0000000000 Binary files a/core/assets/icons/icon.png and /dev/null differ diff --git a/core/assets/icons/icon@2x.icns b/core/assets/icons/icon@2x.icns deleted file mode 100644 index 7d3530cefa..0000000000 Binary files a/core/assets/icons/icon@2x.icns and /dev/null differ diff --git a/core/assets/icons/icon_64.png b/core/assets/icons/icon_64.png index 8e9259dc88..a67eae01f3 100644 Binary files a/core/assets/icons/icon_64.png and b/core/assets/icons/icon_64.png differ diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java index 12098e5884..34c421450d 100644 --- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java @@ -88,7 +88,7 @@ public class WaveInfoDialog extends FloatingDialog{ buildGroups(); }).growX().height(70f); }), new Label("$waves.none"){{ - visible(groups::isEmpty); + visible(() -> groups.isEmpty()); touchable(Touchable.disabled); setWrap(true); setAlignment(Align.center, Align.center); diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java index fd2f178337..2832ddaed2 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java @@ -17,11 +17,12 @@ public class MirrorFilter extends GenerateFilter{ { options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45)); + buffered = true; } @Override protected void apply(){ - v1.trns(angle - 90, 1f); + v1.trnsExact(angle - 90, 1f); v2.set(v1).scl(-1f); v1.add(in.width/2f - 0.5f, in.height/2f - 0.5f); diff --git a/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopLauncher.java b/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopLauncher.java index ce4887f27a..f773f0e188 100644 --- a/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopLauncher.java +++ b/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopLauncher.java @@ -21,7 +21,7 @@ public class DesktopLauncher{ stencil = 0; width = 900; height = 700; - setWindowIcon(FileType.Internal, "icons/icon.png"); + setWindowIcon(FileType.Internal, "icons/icon_64.png"); }}); }catch(Throwable e){ DesktopPlatform.handleCrash(e); diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 289f320c0f..d87a547712 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -15,7 +15,7 @@ public class DesktopLauncher{ config.setMaximized(true); config.setBackBufferConfig(8, 8, 8, 8, 0, 0, 0); config.setWindowedMode(900, 600); - config.setWindowIcon("icons/icon.png"); + config.setWindowIcon("icons/icon_64.png"); Platform.instance = new DesktopPlatform(arg);