vor 2 Monaten · 2a2cf819bd
--- a/src/App/Osu/Changelog.cpp
+++ b/src/App/Osu/Changelog.cpp
@@ -29,20 +29,25 @@ Changelog::Changelog() : ScreenBackable() {
 
     CHANGELOG latest;
 
     latest.title =
 
         UString::format("%.2f (%s, %s)", convar->getConVarByName("osu_version")->getFloat(), __DATE__, __TIME__);
 
-    latest.changes.push_back("- Added cursor trail customization settings");
 
-    latest.changes.push_back("- Added instafade checkbox");
 
-    latest.changes.push_back("- Added more UI sounds");
 
-    latest.changes.push_back("- Added submit_after_pause convar");
 
-    latest.changes.push_back("- Chat: added support for /me command");
 
-    latest.changes.push_back("- Chat: added support for links");
 
-    latest.changes.push_back("- Chat: added support for map links (auto-downloads)");
 
-    latest.changes.push_back("- Chat: added support for multiplayer invite links");
 
-    latest.changes.push_back("- FPS counter will now display worst frametime instead of current frametime");
 
-    latest.changes.push_back("- Improved song browser performance");
 
-    latest.changes.push_back("- Skins are now sorted alphabetically, ignoring meme characters");
 
-    latest.changes.push_back("- Unlocked osu_drain_kill convar");
 
+    latest.changes.push_back("- Added setting to prevent servers from replacing the main menu logo");
 
     changelogs.push_back(latest);
 
 
 
+    CHANGELOG v35_06;
 
+    v35_06.title = "35.06 (2024-06-17)";
 
+    v35_06.changes.push_back("- Added cursor trail customization settings");
 
+    v35_06.changes.push_back("- Added instafade checkbox");
 
+    v35_06.changes.push_back("- Added more UI sounds");
 
+    v35_06.changes.push_back("- Added submit_after_pause convar");
 
+    v35_06.changes.push_back("- Chat: added support for /me command");
 
+    v35_06.changes.push_back("- Chat: added support for links");
 
+    v35_06.changes.push_back("- Chat: added support for map links (auto-downloads)");
 
+    v35_06.changes.push_back("- Chat: added support for multiplayer invite links");
 
+    v35_06.changes.push_back("- FPS counter will now display worst frametime instead of current frametime");
 
+    v35_06.changes.push_back("- Improved song browser performance");
 
+    v35_06.changes.push_back("- Skins are now sorted alphabetically, ignoring meme characters");
 
+    v35_06.changes.push_back("- Unlocked osu_drain_kill convar");
 
+    changelogs.push_back(v35_06);
 
+
 
     CHANGELOG v35_05;
 
     v35_05.title = "35.05 (2024-06-13)";
 
     v35_05.changes.push_back("- Fixed Artist/Creator/Title sorting to be in A-Z order");
--- a/src/App/Osu/MainMenu.cpp
+++ b/src/App/Osu/MainMenu.cpp
@@ -769,7 +769,7 @@ void MainMenu::draw(Graphics *g) {
 
     // neosu/server logo
 
     {
 
         auto logo = logo_img;
 
-        if(bancho.server_icon != NULL && bancho.server_icon->isReady()) {
 
+        if(bancho.server_icon != NULL && bancho.server_icon->isReady() && convar->getConVarByName("main_menu_use_server_logo")->getBool()) {
 
             logo = bancho.server_icon;
 
         }
 
 
--- a/src/App/Osu/OptionsMenu.cpp
+++ b/src/App/Osu/OptionsMenu.cpp
@@ -1326,6 +1326,9 @@ OptionsMenu::OptionsMenu() : ScreenBackable() {
 
     logInButton->setColor(0xff00ff00);
 
     logInButton->setTextColor(0xffffffff);
 
 
 
+    addSubSection("Detail settings");
 
+    addCheckbox("Replace main menu logo with server logo", convar->getConVarByName("main_menu_use_server_logo"));
 
+
 
     addSubSection("Integration");
 
     addCheckbox("Rich Presence (Discord + Steam)",
 
                 "Shows your current game state in your friends' friendslists.\ne.g.: Playing Gavin G - Reach Out "
--- a/src/App/Osu/Osu.cpp
+++ b/src/App/Osu/Osu.cpp
@@ -59,7 +59,7 @@ Osu *osu = NULL;
 
 
 
 // release configuration
 
 ConVar auto_update("auto_update", true, FCVAR_DEFAULT);
 
-ConVar osu_version("osu_version", 35.06f, FCVAR_DEFAULT | FCVAR_HIDDEN);
 
+ConVar osu_version("osu_version", 35.07f, FCVAR_DEFAULT | FCVAR_HIDDEN);
 
 
 
 #ifdef _DEBUG
 
 ConVar osu_debug("osu_debug", true, FCVAR_DEFAULT);
@@ -136,6 +136,7 @@ ConVar flashlight_follow_delay("flashlight_follow_delay", 0.120f, FCVAR_LOCKED);
 
 ConVar flashlight_always_hard("flashlight_always_hard", false, FCVAR_DEFAULT,
 
                               "always use 200+ combo flashlight radius");
 
 
 
+ConVar main_menu_use_server_logo("main_menu_use_server_logo", true, FCVAR_DEFAULT);
 
 ConVar start_first_main_menu_song_at_preview_point("start_first_main_menu_song_at_preview_point", false, FCVAR_DEFAULT);
 
 ConVar nightcore_enjoyer("nightcore_enjoyer", false, FCVAR_DEFAULT,
 
                          "automatically select nightcore when speed modifying");