diff --git a/Externals/SDL/SDL b/Externals/SDL/SDL index c9a6709bd217..badbf8da4ee7 160000 --- a/Externals/SDL/SDL +++ b/Externals/SDL/SDL @@ -1 +1 @@ -Subproject commit c9a6709bd21750f1ad9597be21abace78c6378c9 +Subproject commit badbf8da4ee72b3ef599c721ffc9899e8d7c8d90 diff --git a/Externals/bzip2/bzip2 b/Externals/bzip2/bzip2 new file mode 160000 index 000000000000..6a8690fc8d26 --- /dev/null +++ b/Externals/bzip2/bzip2 @@ -0,0 +1 @@ +Subproject commit 6a8690fc8d26c815e798c588f796eabe9d684cf0 diff --git a/Externals/cpp-ipc/cpp-ipc b/Externals/cpp-ipc/cpp-ipc new file mode 160000 index 000000000000..a0c7725a1441 --- /dev/null +++ b/Externals/cpp-ipc/cpp-ipc @@ -0,0 +1 @@ +Subproject commit a0c7725a1441d18bc768d748a93e512a0fa7ab52 diff --git a/Externals/cpp-optparse/cpp-optparse b/Externals/cpp-optparse/cpp-optparse new file mode 160000 index 000000000000..2265d6472322 --- /dev/null +++ b/Externals/cpp-optparse/cpp-optparse @@ -0,0 +1 @@ +Subproject commit 2265d647232249a53a03b411099863ceca35f0d3 diff --git a/Externals/curl/curl b/Externals/curl/curl index 75a2079d5c28..cfbfb65047e8 160000 --- a/Externals/curl/curl +++ b/Externals/curl/curl @@ -1 +1 @@ -Subproject commit 75a2079d5c28debb2eaa848ca9430f1fe0d7844c +Subproject commit cfbfb65047e85e6b08af65fe9cdbcf68e9ad496a diff --git a/Externals/fmt/fmt b/Externals/fmt/fmt index e69e5f977d45..e424e3f2e607 160000 --- a/Externals/fmt/fmt +++ b/Externals/fmt/fmt @@ -1 +1 @@ -Subproject commit e69e5f977d458f2650bb346dadf2ad30c5320281 +Subproject commit e424e3f2e607da02742f73db84873b8084fc714c diff --git a/Externals/glslang/glslang b/Externals/glslang/glslang new file mode 160000 index 000000000000..a57276bf558f --- /dev/null +++ b/Externals/glslang/glslang @@ -0,0 +1 @@ +Subproject commit a57276bf558f5cf94d3a9854ebdf5a2236849a5a diff --git a/Externals/hidapi/hidapi-src b/Externals/hidapi/hidapi-src index 7011fa98af2d..d6b2a974608d 160000 --- a/Externals/hidapi/hidapi-src +++ b/Externals/hidapi/hidapi-src @@ -1 +1 @@ -Subproject commit 7011fa98af2dde00c298105735e470de800288c7 +Subproject commit d6b2a974608dec3b76fb1e36c189f22b9cf3650c diff --git a/Externals/imgui/imgui b/Externals/imgui/imgui new file mode 160000 index 000000000000..45acd5e0e82f --- /dev/null +++ b/Externals/imgui/imgui @@ -0,0 +1 @@ +Subproject commit 45acd5e0e82f4c954432533ae9985ff0e1aad6d5 diff --git a/Externals/libspng/libspng b/Externals/libspng/libspng index dc5b1032c08e..fb768002d428 160000 --- a/Externals/libspng/libspng +++ b/Externals/libspng/libspng @@ -1 +1 @@ -Subproject commit dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9 +Subproject commit fb768002d4288590083a476af628e51c3f1d47cd diff --git a/Externals/libusb/libusb b/Externals/libusb/libusb index ba698478afc3..15a7ebb4d426 160000 --- a/Externals/libusb/libusb +++ b/Externals/libusb/libusb @@ -1 +1 @@ -Subproject commit ba698478afc3d3a72644eef9fc4cd24ce8383a4c +Subproject commit 15a7ebb4d426c5ce196684347d2b7cafad862626 diff --git a/Externals/mGBA/mgba b/Externals/mGBA/mgba index 8739b22fbc90..0b40863f64d0 160000 --- a/Externals/mGBA/mgba +++ b/Externals/mGBA/mgba @@ -1 +1 @@ -Subproject commit 8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 +Subproject commit 0b40863f64d0940f333fa1c638e75f86f8a26a33 diff --git a/Externals/pugixml/pugixml b/Externals/pugixml/pugixml new file mode 160000 index 000000000000..ee86beb30e49 --- /dev/null +++ b/Externals/pugixml/pugixml @@ -0,0 +1 @@ +Subproject commit ee86beb30e4973f5feffe3ce63bfa4fbadf72f38 diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index aceda55201f5..90964d4eef10 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -95,7 +95,7 @@ bool BootCore(Core::System& system, std::unique_ptr boot, Config::AddLayer(ConfigLoaders::GenerateNetPlayConfigLoader(*netplay_settings)); StartUp.bCopyWiiSaveNetplay = netplay_settings->savedata_load; - StartUp.bIsSpectator = netplay_settings->is_spectator; + StartUp.bIsSpectator = netplay_settings->spectator_mode; } // Override out-of-region languages/countries to prevent games from crashing or behaving oddly diff --git a/Source/Core/Core/Config/NetplaySettings.cpp b/Source/Core/Core/Config/NetplaySettings.cpp index 18a16c539d9e..aefa850b0495 100644 --- a/Source/Core/Core/Config/NetplaySettings.cpp +++ b/Source/Core/Core/Config/NetplaySettings.cpp @@ -48,7 +48,7 @@ const Info NETPLAY_PLAYER_BUFFER_SIZE{{System::Main, "NetPlay", "PlayerBuff const Info NETPLAY_CLIENT_BUFFER_SIZE{{System::Main, "NetPlay", "BufferSizeClient"}, 1}; const Info NETPLAY_BRAWL_MUSIC_OFF{{System::Main, "NetPlay", "BrawlMusicOff"}, false}; -const Info NETPLAY_IS_SPECTATOR{{System::Main, "NetPlay", "IsSpectator"}, false}; +const Info NETPLAY_SPECTATOR_MODE{{System::Main, "NetPlay", "IsSpectator"}, false}; const Info NETPLAY_SAVEDATA_LOAD{{System::Main, "NetPlay", "SyncSaves"}, true}; const Info NETPLAY_SAVEDATA_WRITE{{System::Main, "NetPlay", "WriteSaveData"}, false}; diff --git a/Source/Core/Core/Config/NetplaySettings.h b/Source/Core/Core/Config/NetplaySettings.h index f14aa56c54ce..6fa667d3fbd5 100644 --- a/Source/Core/Core/Config/NetplaySettings.h +++ b/Source/Core/Core/Config/NetplaySettings.h @@ -44,7 +44,7 @@ extern const Info NETPLAY_PLAYER_BUFFER_SIZE; extern const Info NETPLAY_CLIENT_BUFFER_SIZE; extern const Info NETPLAY_BRAWL_MUSIC_OFF; -extern const Info NETPLAY_IS_SPECTATOR; +extern const Info NETPLAY_SPECTATOR_MODE; extern const Info NETPLAY_SAVEDATA_LOAD; extern const Info NETPLAY_SAVEDATA_WRITE; diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 33819de3a94c..08c372b692a5 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -915,7 +915,7 @@ void NetPlayClient::OnStartGame(sf::Packet& packet) packet >> m_net_settings.oc_factor; packet >> m_net_settings.vi_oc_enable; packet >> m_net_settings.vi_oc_factor; - packet >> m_net_settings.is_spectator; + packet >> m_net_settings.spectator_mode; for (auto slot : ExpansionInterface::SLOTS) packet >> m_net_settings.exi_device[slot]; diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index bfa43893f67f..390ebcdf5d0c 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -49,7 +49,7 @@ struct NetSettings float oc_factor = 0; bool vi_oc_enable = false; float vi_oc_factor = 0; - bool is_spectator = false; + bool spectator_mode = false; Common::EnumMap exi_device{}; int memcard_size_override = -1; diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index d5b230f2e2cc..0c1a46042159 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -1527,7 +1527,7 @@ bool NetPlayServer::SetupNetSettings() settings.golf_mode = Config::Get(Config::NETPLAY_NETWORK_MODE) == "golf"; settings.use_fma = DoAllPlayersHaveHardwareFMA(); settings.hide_remote_gbas = Config::Get(Config::NETPLAY_HIDE_REMOTE_GBAS); - settings.is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR); + settings.spectator_mode = Config::Get(Config::NETPLAY_SPECTATOR_MODE); // Unload GameINI to restore things to normal Config::RemoveLayer(Config::LayerType::GlobalGame); @@ -1673,7 +1673,7 @@ bool NetPlayServer::StartGame() spac << m_settings.oc_factor; spac << m_settings.vi_oc_enable; spac << m_settings.vi_oc_factor; - spac << m_settings.is_spectator; + spac << m_settings.spectator_mode; for (auto slot : ExpansionInterface::SLOTS) spac << static_cast(m_settings.exi_device[slot]); diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index ef261d0f29c6..008c3460720f 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -138,7 +138,7 @@ void NetPlayDialog::CreateMainLayout() m_player_buffer_label = new QLabel(tr("Player Buffer:")); m_quit_button = new QPushButton(tr("Quit")); m_brawlmusic_off = new QCheckBox(tr("Client Side Music Off")); - m_is_spectator = new QCheckBox(tr("Spectator")); + m_spectator_mode = new QCheckBox(tr("Spectator")); m_splitter = new QSplitter(Qt::Horizontal); m_menu_bar = new QMenuBar(this); @@ -265,7 +265,7 @@ void NetPlayDialog::CreateMainLayout() options_widget->addWidget(m_player_buffer_label, 0, 3, Qt::AlignVCenter); options_widget->addWidget(m_player_buffer_size_box, 0, 4, Qt::AlignVCenter); options_widget->addWidget(m_brawlmusic_off, 0, 5, Qt::AlignVCenter); - options_widget->addWidget(m_is_spectator, 0, 6, Qt::AlignVCenter); + options_widget->addWidget(m_spectator_mode, 0, 6, Qt::AlignVCenter); options_widget->addWidget(m_quit_button, 0, 8, Qt::AlignVCenter | Qt::AlignRight); options_widget->setColumnStretch(7, 1000); @@ -401,7 +401,7 @@ void NetPlayDialog::ConnectWidgets() connect(m_start_button, &QPushButton::clicked, this, &NetPlayDialog::OnStart); connect(m_quit_button, &QPushButton::clicked, this, &NetPlayDialog::reject); - connect(m_is_spectator, &QCheckBox::toggled, this, &NetPlayDialog::IsSpectatorEnabled); + connect(m_spectator_mode, &QCheckBox::toggled, this, &NetPlayDialog::IsSpectatorEnabled); connect(m_game_button, &QPushButton::clicked, [this] { GameListDialog gld(m_game_list_model, this); @@ -449,6 +449,7 @@ void NetPlayDialog::ConnectWidgets() connect(m_fixed_delay_action, &QAction::toggled, this, &NetPlayDialog::SaveSettings); connect(m_hide_remote_gbas_action, &QAction::toggled, this, &NetPlayDialog::SaveSettings); connect(m_brawlmusic_off, &QCheckBox::toggled, this, &NetPlayDialog::SaveSettings); + connect(m_spectator_mode, &QCheckBox::toggled, this, &NetPlayDialog::SaveSettings); } void NetPlayDialog::SendMessage(const std::string& msg) @@ -462,10 +463,10 @@ void NetPlayDialog::SendMessage(const std::string& msg) bool NetPlayDialog::IsSpectator() { - std::optional is_spectator = RunOnObject(m_is_spectator, &QCheckBox::isChecked); - if (is_spectator) - return *is_spectator; - return false; + if (m_spectator_mode->isChecked()) + return true; + else + return false; } void NetPlayDialog::OnChat() @@ -916,7 +917,7 @@ void NetPlayDialog::SetOptionsEnabled(bool enabled) m_golf_mode_action->setEnabled(enabled); m_fixed_delay_action->setEnabled(enabled); m_brawlmusic_off->setEnabled(enabled); - m_is_spectator->setEnabled(enabled); + m_spectator_mode->setEnabled(enabled); } m_record_input_action->setEnabled(enabled); @@ -1204,7 +1205,7 @@ void NetPlayDialog::LoadSettings() const bool golf_mode_overlay = Config::Get(Config::NETPLAY_GOLF_MODE_OVERLAY); const bool hide_remote_gbas = Config::Get(Config::NETPLAY_HIDE_REMOTE_GBAS); const bool brawlmusic_off = Config::Get(Config::NETPLAY_BRAWL_MUSIC_OFF); - const bool is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR); + const bool spectator_mode = Config::Get(Config::NETPLAY_SPECTATOR_MODE); m_minimum_buffer_size_box->setValue(minimum_buffer_size); m_player_buffer_size_box->setValue(player_buffer_size); @@ -1224,7 +1225,7 @@ void NetPlayDialog::LoadSettings() m_hide_remote_gbas_action->setChecked(hide_remote_gbas); m_brawlmusic_off->setChecked(brawlmusic_off); - m_is_spectator->setChecked(is_spectator); + m_spectator_mode->setChecked(spectator_mode); const std::string network_mode = Config::Get(Config::NETPLAY_NETWORK_MODE); @@ -1269,7 +1270,7 @@ void NetPlayDialog::SaveSettings() Config::SetBase(Config::NETPLAY_GOLF_MODE_OVERLAY, m_golf_mode_overlay_action->isChecked()); Config::SetBase(Config::NETPLAY_HIDE_REMOTE_GBAS, m_hide_remote_gbas_action->isChecked()); Config::SetBase(Config::NETPLAY_BRAWL_MUSIC_OFF, m_brawlmusic_off->isChecked()); - Config::SetBase(Config::NETPLAY_IS_SPECTATOR, m_is_spectator->isChecked()); + Config::SetBase(Config::NETPLAY_SPECTATOR_MODE, m_spectator_mode->isChecked()); std::string network_mode; if (m_fixed_delay_action->isChecked()) diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.h b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.h index 3b0e135a42a7..32708ee95d2c 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.h +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.h @@ -166,7 +166,7 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI QAction* m_fixed_delay_action; QAction* m_hide_remote_gbas_action; QCheckBox* m_brawlmusic_off; - QCheckBox* m_is_spectator; + QCheckBox* m_spectator_mode; QPushButton* m_quit_button; QSplitter* m_splitter; QActionGroup* m_network_mode_group; diff --git a/Source/Core/DolphinQt/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp index 1585fdcf47d1..27f5e8b18a92 100644 --- a/Source/Core/DolphinQt/Settings/PathPane.cpp +++ b/Source/Core/DolphinQt/Settings/PathPane.cpp @@ -184,18 +184,13 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_game_edit, 0, 1); layout->addWidget(game_open, 0, 2); - m_launcher_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(D_LAUNCHERS_IDX))); - connect(m_launcher_edit, &QLineEdit::editingFinished, [this] { - Config::SetBase(Config::MAIN_LAUNCHER_PATH, m_launcher_edit->text().toStdString()); - }); - connect(&Settings::Instance(), &Settings::LauncherPathChanged, this, - [this](const QString& path) { m_game_edit->setText(path); }); + m_launcher_edit = new ConfigUserPath(D_LAUNCHERS_IDX, Config::MAIN_LAUNCHER_PATH); QPushButton* launcher_open = new NonDefaultQPushButton(QStringLiteral("...")); connect(launcher_open, &QPushButton::clicked, this, &PathPane::BrowseLauncher); layout->addWidget(new QLabel(tr("Launcher Path:")), 1, 0); layout->addWidget(m_launcher_edit, 1, 1); layout->addWidget(launcher_open, 1, 2); - + m_nand_edit = new ConfigUserPath(D_WIIROOT_IDX, Config::MAIN_FS_PATH); QPushButton* nand_open = new NonDefaultQPushButton(QStringLiteral("...")); connect(nand_open, &QPushButton::clicked, this, &PathPane::BrowseWiiNAND); diff --git a/Source/Core/DolphinQt/Settings/PathPane.h b/Source/Core/DolphinQt/Settings/PathPane.h index c0c8c2347bcd..5653c1cbeb84 100644 --- a/Source/Core/DolphinQt/Settings/PathPane.h +++ b/Source/Core/DolphinQt/Settings/PathPane.h @@ -35,7 +35,7 @@ class PathPane final : public QWidget ConfigText* m_nand_edit; ConfigText* m_dump_edit; ConfigText* m_load_edit; - QLineEdit* m_launcher_edit; + ConfigText* m_launcher_edit; ConfigText* m_resource_pack_edit; ConfigText* m_wfs_edit; diff --git a/Source/Core/VideoCommon/PerformanceMetrics.cpp b/Source/Core/VideoCommon/PerformanceMetrics.cpp index 6f559d4ef949..1bd943ed0c8a 100644 --- a/Source/Core/VideoCommon/PerformanceMetrics.cpp +++ b/Source/Core/VideoCommon/PerformanceMetrics.cpp @@ -113,7 +113,7 @@ void PerformanceMetrics::DrawImGuiStats(const float backbuffer_scale) const bool movable_overlays = Config::Get(Config::GFX_MOVABLE_PERFORMANCE_METRICS); const int movable_flag = movable_overlays ? ImGuiWindowFlags_None : ImGuiWindowFlags_NoMove; - const float bg_alpha = 1.0f; + const float bg_alpha = 0.9f; const auto imgui_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoNav | movable_flag | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing; @@ -272,7 +272,7 @@ void PerformanceMetrics::DrawImGuiStats(const float backbuffer_scale) if (stack_vertically) window_y += ImGui::GetWindowHeight() + window_padding; else - window_x -= ImGui::GetWindowWidth() + window_padding; + window_x += ImGui::GetWindowWidth() + window_padding; clamp_window_position(); ImGui::TextColored(ImVec4(r, g, b, 1.0f), "Speed:%4.0lf%%", 100.0 * speed); ImGui::TextColored(ImVec4(r, g, b, 1.0f), "Max:%6.0lf%%", 100.0 * GetMaxSpeed()); @@ -282,17 +282,17 @@ void PerformanceMetrics::DrawImGuiStats(const float backbuffer_scale) if (g_ActiveConfig.bShowFPS || g_ActiveConfig.bShowFTimes) { - // P+ change: position in the top-right corner of the screen. - ImGui::SetNextWindowPos(ImVec2(window_x, window_y), set_next_position_condition, + // P+ change: Position in the top-left corner of the screen. + ImGui::SetNextWindowPos(ImVec2(window_x_left, window_y_left), set_next_position_condition, ImVec2(0.0f, 0.0f)); ImGui::SetNextWindowBgAlpha(bg_alpha); if (ImGui::Begin("FPSStats", nullptr, imgui_flags)) { - if (stack_vertically) + /* if (stack_vertically) window_y += ImGui::GetWindowHeight() + window_padding; else - window_x -= ImGui::GetWindowWidth() + window_padding; + window_x -= ImGui::GetWindowWidth() + window_padding; */ clamp_window_position(); if (g_ActiveConfig.bShowFPS) ImGui::TextColored(ImVec4(r, g, b, 1.0f), "FPS:%7.2lf", fps); @@ -323,7 +323,7 @@ void PerformanceMetrics::DrawImGuiStats(const float backbuffer_scale) if (stack_vertically) window_y += ImGui::GetWindowHeight() + window_padding; else - window_x -= ImGui::GetWindowWidth() + window_padding; + window_x += ImGui::GetWindowWidth() + window_padding; clamp_window_position(); if (g_ActiveConfig.bShowVPS) ImGui::TextColored(ImVec4(r, g, b, 1.0f), "VPS:%7.2lf", vps);