Cataclysm-BN icon indicating copy to clipboard operation
Cataclysm-BN copied to clipboard

feat(port): Keyboard format updates, tweaks

Open Kenan2000 opened this issue 9 months ago • 1 comments

Ports these pull requests

https://github.com/CleverRaven/Cataclysm-DDA/pull/40961, https://github.com/CleverRaven/Cataclysm-DDA/pull/41866, https://github.com/CleverRaven/Cataclysm-DDA/pull/47263, https://github.com/CleverRaven/Cataclysm-DDA/pull/56212, https://github.com/CleverRaven/Cataclysm-DDA/pull/46796, https://github.com/CleverRaven/Cataclysm-DDA/pull/55152, https://github.com/CleverRaven/Cataclysm-DDA/pull/57266,

This also includes pull requests #4627, #4623 by @chaosvolt for easier mergeability. This depends on https://github.com/cataclysmbnteam/Cataclysm-BN/pull/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 avatar May 11 '24 23:05 Kenan2000

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.

autofix-ci[bot] avatar May 11 '24 23:05 autofix-ci[bot]

Okay so evidently https://github.com/cataclysmbnteam/Cataclysm-BN/pull/4636 contained the file changes for this PR and the other one so these can be closed? According to Kenan at least. image

I'm going to hope this is the right descision, if anyone spots anything vital in this re-open and fix merge conflicts then, bleh.

chaosvolt avatar May 30 '24 17:05 chaosvolt

Per request but marking it as WIP afterward.

chaosvolt avatar May 30 '24 19:05 chaosvolt

Closing this because pull request of @KheirFerrum includes fixed version of this work

Kenan2000 avatar Jun 01 '24 23:06 Kenan2000