From 14c943adfe3a947ae2414209402fa6691608d235 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 21 Aug 2019 19:04:26 -0400 Subject: [PATCH 1/4] fix of uninteresting variety --- core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index 124b90df6d..62b4f24a79 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -106,7 +106,7 @@ public class PausedDialog extends FloatingDialog{ return; } - if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || Net.client()){ + if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial || wasClient){ state.set(State.menu); logic.reset(); return; From a1ea393f352292ca4685d0e089316728349d6ca5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 22 Aug 2019 15:45:14 -0400 Subject: [PATCH 2/4] Update MirrorFilter.java --- core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java index 2832ddaed2..f3c9062b5e 100644 --- a/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/MirrorFilter.java @@ -17,7 +17,6 @@ public class MirrorFilter extends GenerateFilter{ { options(new SliderOption("angle", () -> angle, f -> angle = (int)f, 0, 360, 45)); - buffered = true; } @Override From a33fd451365c9a003d3b178c19894433f5893e6a Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 22 Aug 2019 21:51:56 -0400 Subject: [PATCH 3/4] bugfixes --- android/build.gradle | 2 +- core/src/io/anuke/mindustry/maps/Maps.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b1b9ef5628..5dba2016c9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript{ } dependencies{ - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.4.1' } } diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index aebe5859b0..111142e76f 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -215,7 +215,7 @@ public class Maps implements Disposable{ return filters; }else{ try{ - return JsonIO.read(Array.class, str); + return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry")); }catch(Exception e){ e.printStackTrace(); return readFilters(""); From d1e07ec0a27762aa622d8312f54f6f1b99ba62c7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Aug 2019 17:17:45 -0600 Subject: [PATCH 4/4] Fixed OpenAL not loading correctly --- desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index ec202d3c78..6692ec6486 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -31,7 +31,8 @@ public class DesktopPlatform extends Platform{ if(useDiscord){ try{ DiscordEventHandlers handlers = new DiscordEventHandlers(); - DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, ""); + DiscordRPC.INSTANCE.Discord_Initialize(applicationId, handlers, true, "1127400"); + Log.info("Initialized Discord rich presence."); Runtime.getRuntime().addShutdownHook(new Thread(DiscordRPC.INSTANCE::Discord_Shutdown)); }catch(Throwable t){ @@ -71,8 +72,8 @@ public class DesktopPlatform extends Platform{ @Override public void updateRPC(){ - if(!useDiscord) return; + Log.info("Updating discord RPC status."); DiscordRichPresence presence = new DiscordRichPresence();