feat(port): Keyboard format updates, tweaks #4635
Closed
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: 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
added
port request
|
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
removed
the
port request
Coolthulhu
requested changes
May 13, 2024
…clysmbnteam/Cataclysm-BN into keyboardformat_port_update2
…clysmbnteam/Cataclysm-BN into keyboardformat_port_update2
This reverts commit c2d5431.
…clysmbnteam/Cataclysm-BN into keyboardformat_port_update2
|
Okay so evidently #4636 contained the file changes for this PR and the other one so these can be closed? According to Kenan at least. 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. |
|
Per request but marking it as WIP afterward. |
Co-Authored-By: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com> Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com> Co-Authored-By: Jason Fields <jasonfields4@gmail.com>
…clysmbnteam/Cataclysm-BN into keyboardformat_port_update2
13 tasks
|
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.
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.cppfile, line 1257,crafting_gui.cppfile, 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.cppfile, 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