From 731c6057de3c359eb4b20d545472d5bbcd5dc8f9 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Sun, 13 Oct 2024 14:46:12 -0700 Subject: [PATCH] Canaryize Co-Authored-By: illusion0001 <37698908+illusion0001@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/bug_report.yaml | 12 ++++++------ README.md | 22 +++++++++++----------- src/xenia/app/emulator_window.cc | 12 ++++++------ src/xenia/emulator.cc | 2 +- xenia-build | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 14a9a23c9..9c58cb5d8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -8,21 +8,21 @@ body: value: | Try to create a very concise title that's straight to the point. - **THIS IS NOT A SUPPORT FORUM!** For support, first read the wiki: https://github.com/xenia-project/xenia/wiki + **THIS IS NOT A SUPPORT FORUM!** For support, first read the wiki: https://github.com/xenia-canary/xenia-canary/wiki If your question wasn't answered there or you need help, proceed to #help in the Discord server: https://discord.gg/Q9mxZf9 DO NOT CREATE ISSUES ABOUT SPECIFIC GAMES IN THIS REPOSITORY! A game specific issue would be e.g. "Game X crashes after you hit a character a certain way" A Xenia issue would be e.g. "Kernel export NtDoSomething does nothing" - For specific games, visit https://github.com/xenia-project/game-compatibility#game-compatibility + For specific games, visit https://github.com/xenia-canary/game-compatibility#game-compatibility - id: validation type: checkboxes attributes: label: Validation options: - - label: I've read the [FAQ](https://github.com/xenia-project/xenia/wiki/FAQ). + - label: I've read the [FAQ](https://github.com/xenia-canary/xenia-canary/wiki/FAQ). required: true - - label: The Xenia build used is from the master branch (not MLBS/AlexVS/Canary/pull requests, etc.) + - label: The Xenia build used is from a Canary branch. (not UWP/MLBS/AlexVS/master/pull requests, etc) required: true - label: This issue isn't for tech support (help with Xenia). required: true @@ -30,9 +30,9 @@ body: required: true - label: I've checked if this issue hasn't already been reported. required: true - - label: 'My device meets the minimum requirements: https://github.com/xenia-project/xenia/wiki/Quickstart#system-requirements' + - label: 'My device meets the minimum requirements: https://github.com/xenia-canary/xenia-canary/wiki/Quickstart#system-requirements' required: true - - label: '(If building) I have read the building doc: https://github.com/xenia-project/xenia/blob/master/docs/building.md' + - label: '(If building) I have read the building doc: https://github.com/xenia-canary/xenia-canary/blob/master/docs/building.md' - id: problem type: textarea attributes: diff --git a/README.md b/README.md index d39350df6..f0effcdce 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@

Xenia Canary - Xbox 360 Emulator

-Xenia is an experimental emulator for the Xbox 360. For more information, see the -[Xenia wiki](https://github.com/xenia-canary/xenia-canary/wiki). +Xenia Canary is an experimental fork of the Xenia emulator. For more information, see the +[Xenia Canary wiki](https://github.com/xenia-canary/xenia-canary/wiki). Come chat with us about **emulator-related topics** on [Discord](https://discord.gg/Q9mxZf9). For developer chat join `#dev` but stay on topic. Lurking is not only fine, but encouraged! -Please check the [FAQ](https://github.com/xenia-project/xenia/wiki/FAQ) page before asking questions. +Please check the [FAQ](https://github.com/xenia-canary/xenia-canary/wiki/FAQ) page before asking questions. We've got jobs/lives/etc, so don't expect instant answers. Discussing illegal activities will get you banned. @@ -26,17 +26,17 @@ Netplay Build | | [Latest](https://github.com/AdrianCassar/xenia-canary/releases ## Quickstart -See the [Quickstart](https://github.com/xenia-project/xenia/wiki/Quickstart) page. +See the [Quickstart](https://github.com/xenia-canary/xenia-canary/wiki/Quickstart) page. ## FAQ -See the [frequently asked questions](https://github.com/xenia-project/xenia/wiki/FAQ) page. +See the [frequently asked questions](https://github.com/xenia-canary/xenia-canary/wiki/FAQ) page. ## Game Compatibility -See the [Game compatibility list](https://github.com/xenia-project/game-compatibility/issues) +See the [Game compatibility list](https://github.com/xenia-canary/game-compatibility/issues) for currently tracked games, and feel free to contribute your own updates, -screenshots, and information there following the [existing conventions](https://github.com/xenia-project/game-compatibility/blob/master/README.md). +screenshots, and information there following the [existing conventions](https://github.com/xenia-canary/game-compatibility/blob/master/README.md). ## Building @@ -55,11 +55,11 @@ is wide open greenfield fun. Fixes and optimizations are always welcome (please!), but in addition to that there are some major work areas still untouched: -* Help work through [missing functionality/bugs in games](https://github.com/xenia-project/xenia/labels/compat) -* Reduce the size of Xenia's [huge log files](https://github.com/xenia-project/xenia/issues/1526) -* Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/xenia-project/xenia/labels/platform-linux) +* Help work through [missing functionality/bugs in games](https://github.com/xenia-canary/xenia-canary/labels/compat) +* Reduce the size of Xenia's [huge log files](https://github.com/xenia-canary/xenia-canary/issues/1526) +* Skilled with Linux? A strong contributor is needed to [help with porting](https://github.com/xenia-canary/xenia-canary/labels/platform-linux) -See more projects [good for contributors](https://github.com/xenia-project/xenia/labels/good%20first%20issue). It's a good idea to ask on Discord and check the issues page before beginning work on +See more projects [good for contributors](https://github.com/xenia-canary/xenia-canary/labels/good%20first%20issue). It's a good idea to ask on Discord and check the issues page before beginning work on something. ## Disclaimer diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index c2bf77867..916c2bd1d 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -716,8 +716,8 @@ bool EmulatorWindow::Initialize() { help_menu->AddChild(MenuItem::Create( MenuItem::Type::kString, "Recent changes on GitHub...", []() { LaunchWebBrowser( - "https://github.com/xenia-project/xenia/compare/" XE_BUILD_COMMIT - "..." XE_BUILD_BRANCH); + "https://github.com/xenia-canary/xenia-canary/" + "compare/" XE_BUILD_COMMIT "..." XE_BUILD_BRANCH); })); help_menu->AddChild(MenuItem::Create(MenuItem::Type::kSeparator)); help_menu->AddChild(MenuItem::Create( @@ -1430,7 +1430,7 @@ void EmulatorWindow::ToggleControllerVibration() { void EmulatorWindow::ShowCompatibility() { const std::string_view base_url = - "https://github.com/xenia-project/game-compatibility/issues"; + "https://github.com/xenia-canary/game-compatibility/issues"; std::string url; // Avoid searching for a title ID of "00000000". uint32_t title_id = emulator_->title_id(); @@ -1443,16 +1443,16 @@ void EmulatorWindow::ShowCompatibility() { } void EmulatorWindow::ShowFAQ() { - LaunchWebBrowser("https://github.com/xenia-project/xenia/wiki/FAQ"); + LaunchWebBrowser("https://github.com/xenia-canary/xenia-canary/wiki/FAQ"); } void EmulatorWindow::ShowBuildCommit() { #ifdef XE_BUILD_IS_PR LaunchWebBrowser( - "https://github.com/xenia-project/xenia/pull/" XE_BUILD_PR_NUMBER); + "https://github.com/xenia-canary/xenia-canary/pull/" XE_BUILD_PR_NUMBER); #else LaunchWebBrowser( - "https://github.com/xenia-project/xenia/commit/" XE_BUILD_COMMIT); + "https://github.com/xenia-canary/xenia-canary/commit/" XE_BUILD_COMMIT); #endif } diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc index 376088f8f..952e28de1 100644 --- a/src/xenia/emulator.cc +++ b/src/xenia/emulator.cc @@ -140,7 +140,7 @@ Emulator::Emulator(const std::filesystem::path& command_line, "to open it?", L"Xenia", MB_YESNO | MB_ICONQUESTION) == IDYES)) { LaunchWebBrowser( - "https://github.com/xenia-project/xenia/wiki/" + "https://github.com/xenia-canary/xenia-canary/wiki/" "Quickstart#how-to-rip-games"); } SetPersistentEmulatorFlags(persistent_flags | diff --git a/xenia-build b/xenia-build index ed11a138f..c55b64721 100755 --- a/xenia-build +++ b/xenia-build @@ -147,7 +147,7 @@ def main(): print('WARNING: Visual Studio not found!') print('Building for Windows will not be supported.') print('Please refer to the building guide:') - print('https://github.com/xenia-project/xenia/blob/master/docs/building.md') + print('https://github.com/xenia-canary/xenia-canary/blob/canary_experimental/docs/building.md') # Setup main argument parser and common arguments. parser = argparse.ArgumentParser(prog='xenia-build')