Skip to content
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

Open
wants to merge 16 commits into
base: main
Choose a base branch
from

Conversation

Kenan2000
Copy link
Collaborator

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 explanation

Coauthors have been linked properly via GitHub Desktop built-in function to do this work hopefully

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>
@Kenan2000 Kenan2000 added port request Request to port functionality or content from DDA src PR changes related to source code. data PRs related to datas. Won't crash game (probably) tests PR changes related to tests labels May 11, 2024
Copy link
Contributor

autofix-ci bot commented May 11, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@Kenan2000 Kenan2000 added port request Request to port functionality or content from DDA and removed port request Request to port functionality or content from DDA labels May 12, 2024
@Coolthulhu
Copy link
Member

Error: src/character_display.cpp:542:30: error: ‘join’ was not declared in this scope
  542 |     const std::string desc = join( s, "\n" );

You have to #include "string_utils.h" in the include section (top of the file).

Error: src/character_display.cpp:1281:24: error: unused variable ‘effect_win_size_y_max’ [-Werror=unused-variable]
 1281 |     const unsigned int effect_win_size_y_max = 1 + static_cast<unsigned>( effect_name_and_text.size() );

Just delete the unused variable.

Kenan2000 and others added 3 commits May 16, 2024 22:51
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
@github-actions github-actions bot added the docs PRs releated to docs page label May 18, 2024
@Coolthulhu
Copy link
Member

Minor bug:
"Effects" box is not enclosed, but goes down to the bottom of the screen

Screenshot from 2024-05-24 10-50-04

@Coolthulhu
Copy link
Member

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably) docs PRs releated to docs page src PR changes related to source code. tests PR changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants