Advanced inventory split #34630
Merged
Advanced inventory split #34630
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
Also added reset for SkillDisplayType
cleaning up code a little fixing help keybinding
fixing Return crashing with empty list
ZhilkinSerg
added
[C++]
Merge branch 'master' into bionics_ui # Conflicts: # data/json/bionics.json # src/bionics_ui.cpp # src/skill.cpp
# Conflicts: # src/advanced_inv.cpp
ZhilkinSerg
reviewed
Oct 20, 2019
ZhilkinSerg
reviewed
Oct 20, 2019
# Conflicts: # src/advanced_inv.cpp
Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
|
There's something weird with commits, but the diff looks correct. So let me know if I need to do anything extra here. |
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.
Summary
SUMMARY: Infrastructure "Split advanced inventory into multiple files"
Purpose of change
part of advanced inventory refactoring #34502
Describe the solution
Describe alternatives you've considered
Additional context
No functional changes