New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(port): UI, accessibility updates, tweaks #4636
base: main
Are you sure you want to change the base?
Conversation
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Rob Kuijper <robkuijper@live.nl> Co-Authored-By: Brambor <13402666+Brambor@users.noreply.github.com> Co-Authored-By: eltank <8000047+eltank@users.noreply.github.com> Co-Authored-By: David Seguin <davidseguin@live.ca> Co-Authored-By: ZeroInternalReflection <89038572+zerointernalreflection@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>
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. |
…aclysmbnteam/Cataclysm-BN into UIaccessibility_port_update3
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Olanti <olanti-p@yandex.ru> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
…aclysmbnteam/Cataclysm-BN into UIaccessibility_port_update3
You have to
Just delete the unused variable. |
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com> Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
Got a hang-up while drinking water on a fresh save. I don't know if it's from this PR or another, but I can't OK this one until this issue is resolved. |
Ports these pull requests
CleverRaven/Cataclysm-DDA#40961,
CleverRaven/Cataclysm-DDA#41866,
CleverRaven/Cataclysm-DDA#47263,
CleverRaven/Cataclysm-DDA#56212,
CleverRaven/Cataclysm-DDA#46796,
CleverRaven/Cataclysm-DDA#55152,
CleverRaven/Cataclysm-DDA#57266,
CleverRaven/Cataclysm-DDA#47584,
CleverRaven/Cataclysm-DDA#47585,
CleverRaven/Cataclysm-DDA#50892,
CleverRaven/Cataclysm-DDA#51447,
CleverRaven/Cataclysm-DDA#53069,
CleverRaven/Cataclysm-DDA#58609,
CleverRaven/Cataclysm-DDA#59035,
CleverRaven/Cataclysm-DDA#41605,
CleverRaven/Cataclysm-DDA#47229,
CleverRaven/Cataclysm-DDA#57361,
CleverRaven/Cataclysm-DDA#65767,
CleverRaven/Cataclysm-DDA#67847,
This also includes pull requests #4627, #4623 by @chaosvolt for easier mergeability. This depends on #4634, #4635, so it cannot be merged until these are merged
activity_handlers.cpp
file, line 1257,crafting_gui.cpp
file, line 718,character_display.cpp
file, line 541 throw errors during compiling which, based on conversation with @Coolthulhu, will be fixed with help of Coolthulhu or other developers or both.action.cpp
file, line 930 could not be ported because it throws an error so it was added to a comment with explanationCoauthors have been linked properly via GitHub Desktop built-in function to do this work hopefully