UI: Add randomized splash text to loading screen #7

Open
RecursiveMemory wants to merge 2 commits from RecursiveMemory/Ryulynx:YetAnotherSplashText into master

Hey. Fixed version of PR5 that does not have a totally busted commit history. Kindly inform me and allow me to reply before you merge though, I think I might be forgetting something and I do not want it to explode

Hey. Fixed version of PR5 that does not have a totally busted commit history. Kindly inform me and allow me to reply before you merge though, I think I might be forgetting something and I do not want it to explode
Fixed rumble not being sent to the controller
Some checks failed
Release job / Create tag (push) Failing after 2s
Release job / Release for linux-arm64 (push) Failing after 2s
Release job / Release MacOS universal (push) Failing after 0s
Release job / Release for linux-x64 (push) Failing after 0s
Release job / Release for win-x64 (push) Has been cancelled
Release job / flatpak_release (push) Has been cancelled
Release job / release (push) Has been cancelled
892fcd9444
Revert "Fixed rumble not being sent to the controller"
Some checks failed
Pull Request Triage / triage (pull_request_target) Failing after 33s
canary.yml / Revert "Fixed rumble not being sent to the controller" (pull_request) Failing after 0s
release.yml / Revert "Fixed rumble not being sent to the controller" (pull_request) Failing after 0s
7a050148fb
This reverts commit 892fcd9444.
sh0inx changed target branch from ryulynx-initial to master 2026-09-22 13:44:58 -04:00
Some checks failed
Pull Request Triage / triage (pull_request_target) Failing after 33s
canary.yml / Revert "Fixed rumble not being sent to the controller" (pull_request) Failing after 0s
release.yml / Revert "Fixed rumble not being sent to the controller" (pull_request) Failing after 0s
This pull request has changes conflicting with the target branch.
  • src/Ryujinx.UI.Common/Configuration/UI/ConfigurationState/ConfigurationFileFormat.cs
  • src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
  • src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
  • src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u YetAnotherSplashText:RecursiveMemory-YetAnotherSplashText
git switch RecursiveMemory-YetAnotherSplashText

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff RecursiveMemory-YetAnotherSplashText
git switch RecursiveMemory-YetAnotherSplashText
git rebase master
git switch master
git merge --ff-only RecursiveMemory-YetAnotherSplashText
git switch RecursiveMemory-YetAnotherSplashText
git rebase master
git switch master
git merge --no-ff RecursiveMemory-YetAnotherSplashText
git switch master
git merge --squash RecursiveMemory-YetAnotherSplashText
git switch master
git merge --ff-only RecursiveMemory-YetAnotherSplashText
git switch master
git merge RecursiveMemory-YetAnotherSplashText
git push origin master
Sign in to join this conversation.
No description provided.