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): Keyboard format updates, tweaks #4635

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

Conversation

Kenan2000
Copy link
Collaborator

@Kenan2000 Kenan2000 commented May 11, 2024

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,

This also includes pull requests #4627, #4623 by @chaosvolt for easier mergeability. This depends on #4634 so it cannot be merged until it's merged

activity_handlers.cpp file, line 1257, crafting_gui.cpp file, line 718 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

Kenan2000 and others added 2 commits May 12, 2024 03:21
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: 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>
@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 removed the port request Request to port functionality or content from DDA label May 12, 2024
src/activity_handlers.cpp Outdated Show resolved Hide resolved
@Kenan2000 Kenan2000 requested a review from Coolthulhu May 15, 2024 22:48
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) 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