Merge remote-tracking branch 'upstream/master' into auto-center-menu

Fix one conflict.
2026-01-30 01:48:15 +03:00 · 2020-06-29 23:40:10 +02:00
parent 803d0f45de ebd381c228
commit cc538a0965
12 changed files with 298 additions and 93 deletions
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -405,6 +405,7 @@ public:
    }

    bool over30mode;
+    bool glitchrunnermode; // Have fun speedrunners! <3 Misa

    bool ingame_titlemode;