feat(content, port): UI, accessibility updates, tweaks, remade work #4712
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: ZeroInternalReflection <89038572+ZeroInternalReflection@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: ZeroInternalReflection <89038572+ZeroInternalReflection@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Jason Fields <jasonfields4@gmail.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
…m/cataclysmbnteam/Cataclysm-BN into UIaccessibility_portagain_update3
…m/cataclysmbnteam/Cataclysm-BN into UIaccessibility_portagain_update3 Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: ZeroInternalReflection <89038572+ZeroInternalReflection@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: martinrhan <53336429+martinrhan@users.noreply.github.com> Co-Authored-By: Mark Langsdorf <mlangsdo@redhat.com> Co-Authored-By: BevapDin <5095435+bevapdin@users.noreply.github.com> Co-Authored-By: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Jason Fields <jasonfields4@gmail.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Chorus System <3629845+yay855@users.noreply.github.com>
…m/cataclysmbnteam/Cataclysm-BN into UIaccessibility_portagain_update3
github-actions
bot
added
docs
|
Autofix has formatted code style violation in this PR. I edit commits locally (e.g: git, github desktop) and want to keep autofix
I do not want the automated commit
If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT. |
Kenan2000
changed the title
|
Closing this because pull request of @KheirFerrum includes fixed version of this work |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should hopefully work correctly now
Ports these pull requests
CleverRaven/Cataclysm-DDA#47584,
CleverRaven/Cataclysm-DDA#47585,
CleverRaven/Cataclysm-DDA#58609,
CleverRaven/Cataclysm-DDA#51447,
CleverRaven/Cataclysm-DDA#59035,
CleverRaven/Cataclysm-DDA#50892,
CleverRaven/Cataclysm-DDA#41605,
CleverRaven/Cataclysm-DDA#57361,
So from pull request https://CleverRaven/Cataclysm-DDA#41605 tweaks from only a single file,
ui.h, have been ported, whereas all other pull requests were essentially ported as fully as possible. This depends on #4634, #4635, so it cannot be merged until these are mergedSo, again, thanks to @Coolthulhu, @yay855, @AlecWhite, whereas @olanti-p helped to fix some initial errors, whereas @KheirFerrum has greatly helped with tidying, fixing keyboard format errors in #4635, but there are still some things to fix so it's a draft
It's very important that these pull requests, #4634, #4635 along with this would be merged in exactly this order, to avoid conflicts, to avoid errors with files, I will ask for review when all of them are ready to be merged
Coauthors have been linked properly via GitHub Desktop built-in function to do this work hopefully