diff --git a/.gitignore b/.gitignore index 51cb7c3442..3eaf3083aa 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ CMakeLists.txt.user /.vscode/ /Source/Core/DolphinQt/hack_config.ini /Source/Core/DolphinQt/.sav +/cmake-build*/ diff --git a/Source/.idea/.idea.dolphin-emu/.idea/.gitignore b/Source/.idea/.idea.dolphin-emu/.idea/.gitignore new file mode 100644 index 0000000000..d070718fa6 --- /dev/null +++ b/Source/.idea/.idea.dolphin-emu/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/.idea.dolphin-emu.iml +/projectSettingsUpdater.xml +/modules.xml +/contentModel.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Source/.idea/.idea.dolphin-emu/.idea/.name b/Source/.idea/.idea.dolphin-emu/.idea/.name new file mode 100644 index 0000000000..1dad188c5e --- /dev/null +++ b/Source/.idea/.idea.dolphin-emu/.idea/.name @@ -0,0 +1 @@ +dolphin-emu \ No newline at end of file diff --git a/Source/.idea/.idea.dolphin-emu/.idea/encodings.xml b/Source/.idea/.idea.dolphin-emu/.idea/encodings.xml new file mode 100644 index 0000000000..df87cf951f --- /dev/null +++ b/Source/.idea/.idea.dolphin-emu/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Source/.idea/.idea.dolphin-emu/.idea/indexLayout.xml b/Source/.idea/.idea.dolphin-emu/.idea/indexLayout.xml new file mode 100644 index 0000000000..7b08163ceb --- /dev/null +++ b/Source/.idea/.idea.dolphin-emu/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Source/.idea/.idea.dolphin-emu/.idea/misc.xml b/Source/.idea/.idea.dolphin-emu/.idea/misc.xml new file mode 100644 index 0000000000..1d8c84d0af --- /dev/null +++ b/Source/.idea/.idea.dolphin-emu/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Source/.idea/.idea.dolphin-emu/.idea/vcs.xml b/Source/.idea/.idea.dolphin-emu/.idea/vcs.xml new file mode 100644 index 0000000000..6c0b863585 --- /dev/null +++ b/Source/.idea/.idea.dolphin-emu/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Source/Core/UICommon/DiscordPresence.cpp b/Source/Core/UICommon/DiscordPresence.cpp index 25f6f21864..1234e954b8 100644 --- a/Source/Core/UICommon/DiscordPresence.cpp +++ b/Source/Core/UICommon/DiscordPresence.cpp @@ -277,7 +277,6 @@ void UpdateDiscordPresence(int party_size, SecretType type, const std::string& s UpdateClientID(DEFAULT_CLIENT_ID); const std::string& title = "v" + Common::GetScmRevStr() + " (Dolphin Emulator Fork)"; - std::string game_artwork = ArtworkForGameId(SConfig::GetInstance().GetGameID()); DiscordRichPresence discord_presence = {}; discord_presence.largeImageKey = "primehack_logo";