VERY experimental Nintendo Switch 2 emulator
C++
[meta] remove stale/dead links in help/about (#3064)
lizziefe13539d722e
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.ymlindex 52faafad34..d4f68f053d 100644--- a/.github/ISSUE_TEMPLATE/config.yml+++ b/.github/ISSUE_TEMPLATE/config.yml@@ -1,8 +1,4 @@blank_issues_enabled: falsecontact_links:- - name: yuzu Discord- url: https://discord.com/invite/u77vRWY- about: If you are experiencing an issue with yuzu, and you need tech support, or if you have a general question, try asking in the official yuzu Discord linked here. Piracy is not allowed.- - name: Community forums- url: https://community.citra-emu.org- about: This is an alternative place for tech support, however helpers there are not as active.+ - name: Eden Discord+ url: https://discord.gg/HstXbPch7Xdiff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex 1860f8cffc..f6851a2c65 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -1,6 +1,5 @@-<!---SPDX-FileCopyrightText: 2018 yuzu Emulator Project-SPDX-License-Identifier: GPL-2.0-or-later--->+# Contributing-**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).**+You want to contribute? Please consult [the development guide](./docs/Development.md).++Don't forget to [get a git account](./docs/SIGNUP.md) - not a requirement per se but it's highly recommended.diff --git a/README.md b/README.mdindex c5aa17ad1e..bdaba06ade 100644--- a/README.md+++ b/README.md@@ -21,7 +21,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f<p align="center"></a>- <a href="https://discord.gg/kXAmGCXBGD">+ <a href="https://discord.gg/HstXbPch7X"><img src="https://img.shields.io/discord/1367654015269339267?color=5865F2&label=Eden&logo=discord&logoColor=white"alt="Discord"></a>@@ -52,8 +52,8 @@ Check out our [website](https://eden-emu.dev) for the latest news on exciting fe## Development-Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/kXAmGCXBGD) or [Revolt](https://rvlt.gg/qKgFEAbH).-You can also follow us on [X (Twitter)](https://x.com/edenemuofficial) for updates and announcements.+Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/HstXbPch7X) or [Revolt](https://rvlt.gg/qKgFEAbH).+You can also follow us on [X (Twitter)](https://nitter.poast.org/edenemuofficial) for updates and announcements.If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented. You can also contact any of the developers on Discord or Revolt to learn more about the current state of the emulator.@@ -82,7 +82,7 @@ Any donations received will go towards things such as:* Additional hardware (e.g. GPUs as needed to improve rendering support, other peripherals to add support for, etc.)* CI Infrastructure-If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/edenemu) and talk to Camille or any of our other developers.+If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/HstXbPch7X) and talk to Camille or any of our other developers.## Licensediff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex 9daf3642e8..2d071b45d5 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -448,9 +448,9 @@<string name="user_data_import_success">User data imported successfully</string><string name="user_data_export_cancelled">Export cancelled</string><string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string>- <string name="discord_link" translatable="false">https://discord.gg/kXAmGCXBGD</string>+ <string name="discord_link" translatable="false">https://discord.gg/HstXbPch7X</string><string name="revolt_link" translatable="false">https://rvlt.gg/qKgFEAbH</string>- <string name="x_link" translatable="false">https://x.com/edenemuofficial</string>+ <string name="x_link" translatable="false">https://nitter.poast.org/edenemuofficial</string><string name="website_link" translatable="false">https://eden-emu.dev</string><string name="github_link" translatable="false">https://git.eden-emu.dev/eden-emu</string>diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.uiindex 5c60a6237d..60fde95601 100644--- a/src/yuzu/aboutdialog.ui+++ b/src/yuzu/aboutdialog.ui@@ -128,7 +128,7 @@ li.checked::marker { content: "\2612"; }<item><widget class="QLabel" name="labelLinks"><property name="text">- <string><html><head/><body><p><a href="https://eden-emulator.github.io/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://git.eden-emu.dev"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://git.eden-emu.dev/eden-emu/eden/activity/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://discord.gg/kXAmGCXBGD"><span style=" text-decoration: underline; color:#039be5;">Discord</span></a> | <a href="https://rvlt.gg/qKgFEAbH"><span style=" text-decoration: underline; color:#039be5;">Revolt</span></a> | <a href="https://nitter.poast.org/edenemuofficial"><span style=" text-decoration: underline; color:#039be5;">Twitter</span></a> | <a href="https://git.eden-emu.dev/eden-emu/eden/src/branch/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html></string>+ <string><html><head/><body><p><a href="https://eden-emulator.github.io/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://git.eden-emu.dev"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://git.eden-emu.dev/eden-emu/eden/activity/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://discord.gg/HstXbPch7X"><span style=" text-decoration: underline; color:#039be5;">Discord</span></a> | <a href="https://rvlt.gg/qKgFEAbH"><span style=" text-decoration: underline; color:#039be5;">Revolt</span></a> | <a href="https://nitter.poast.org/edenemuofficial"><span style=" text-decoration: underline; color:#039be5;">Twitter</span></a> | <a href="https://git.eden-emu.dev/eden-emu/eden/src/branch/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html></string></property><property name="openExternalLinks"><bool>true</bool>diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cppindex a726a422d6..79a367258f 100644--- a/src/yuzu/configuration/configure_motion_touch.cpp+++ b/src/yuzu/configuration/configure_motion_touch.cpp@@ -83,14 +83,6 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent,: QDialog(parent), input_subsystem{input_subsystem_},ui(std::make_unique<Ui::ConfigureMotionTouch>()) {ui->setupUi(this);-- ui->udp_learn_more->setOpenExternalLinks(true);- ui->udp_learn_more->setText(- tr("<a "- "href='https://eden-emulator.github.io/wiki/"- "using-a-controller-or-android-phone-for-motion-or-touch-input'><span "- "style=\"text-decoration: underline; color:#039be5;\">Learn More</span></a>"));-SetConfiguration();UpdateUiDisplay();ConnectEvents();diff --git a/src/yuzu/configuration/configure_motion_touch.ui b/src/yuzu/configuration/configure_motion_touch.uiindex 0237fae54a..9667f677e7 100644--- a/src/yuzu/configuration/configure_motion_touch.ui+++ b/src/yuzu/configuration/configure_motion_touch.ui@@ -182,13 +182,6 @@<property name="rightMargin"><number>0</number></property>- <item>- <widget class="QLabel" name="udp_learn_more">- <property name="text">- <string>Learn More</string>- </property>- </widget>- </item><item><widget class="QPushButton" name="udp_test"><property name="sizePolicy">diff --git a/src/yuzu/configuration/configure_tas.ui b/src/yuzu/configuration/configure_tas.uiindex b0d0a39d8b..da8f2a86c5 100644--- a/src/yuzu/configuration/configure_tas.ui+++ b/src/yuzu/configuration/configure_tas.ui@@ -14,7 +14,7 @@<item row="0" column="0" colspan="4"><widget class="QLabel" name="label_1"><property name="text">- <string><html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://eden-emulator.github.io/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the Eden website.</p></body></html></string>+ <string><html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the user handbook.</p></body></html></string></property><property name="openExternalLinks"><bool>true</bool>diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cppindex a2ff5422ad..92741bd328 100644--- a/src/yuzu/main_window.cpp+++ b/src/yuzu/main_window.cpp@@ -577,10 +577,7 @@ MainWindow::MainWindow(bool has_broken_vulkan)UISettings::values.has_broken_vulkan = true;QMessageBox::warning(this, tr("Broken Vulkan Installation Detected"),- tr("Vulkan initialization failed during boot.<br><br>Click <a "- "href='https://eden-emulator.github.io/wiki/faq/"- "#yuzu-starts-with-the-error-broken-vulkan-installation-detected'>"- "here for instructions to fix the issue</a>."));+ tr("Vulkan initialization failed during boot."));#ifdef HAS_OPENGLSettings::values.renderer_backend = Settings::RendererBackend::OpenGL;@@ -1913,10 +1910,8 @@ bool MainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPartr("You are using the deconstructed ROM directory format for this game, which is an ""outdated format that has been superseded by others such as NCA, NAX, XCI, or ""NSP. Deconstructed ROM directories lack icons, metadata, and update "- "support.<br><br>For an explanation of the various Switch formats Eden supports, <a "- "href='https://eden-emulator.github.io/wiki/overview-of-switch-game-formats'>check "- "out our "- "wiki</a>. This message will not be shown again."));+ "support.<br>For an explanation of the various Switch formats Eden supports, "+ "out our user handbook. This message will not be shown again."));}if (result != Core::SystemResultStatus::Success) {@@ -2738,13 +2733,12 @@ void MainWindow::OnGameListNavigateToGamedbEntry(u64 program_id,directory = it->second.second;}- QDesktopServices::openUrl(- QUrl(QStringLiteral("https://eden-emulator.github.io/game/") + directory));+ QDesktopServices::openUrl(QUrl(QStringLiteral("https://www.emuready.com/listings?emulatorIds=43bfc023-ec22-422d-8324-048a8ec9f28f") + directory));}void MainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path,const QtCommon::Game::ShortcutTarget target) {- // Create shortcut+ // Create shortcustd::string arguments = fmt::format("-g \"{:s}\"", game_path);QtCommon::Game::CreateShortcut(game_path, program_id, "", target, arguments, true);