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

Adding Clan Personnel Tracking to MegaMek #5166

Merged
merged 10 commits into from
Feb 21, 2024
Merged

Conversation

SJuliez
Copy link
Member

@SJuliez SJuliez commented Feb 14, 2024

This is a replacement for #3500
This is Windchild's work, I just replaced references to clanner with clan pilot
Hopefully Fixes #3498
Accompanied by a MHQ PR.

Windchild292 and others added 9 commits March 7, 2022 18:48
# Conflicts:
#	megamek/src/megamek/client/bot/princess/BasicPathRanker.java
#	megamek/src/megamek/common/actions/FindClubAction.java
#	megamek/src/megamek/common/options/OptionsConstants.java
# Conflicts:
#	megamek/src/megamek/client/bot/MoveOption.java
#	megamek/src/megamek/client/ratgenerator/CrewDescriptor.java
#	megamek/src/megamek/common/Crew.java
#	megamek/src/megamek/common/MULParser.java
@SJuliez SJuliez added the For New Dev Cycle This PR should be merged at the beginning of a dev cycle label Feb 14, 2024
Copy link
Member

@neoancient neoancient left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks ok, but there is a conflict with the code that added the ability to set pilot hits.

# Conflicts:
#	megamek/src/megamek/client/ui/swing/CustomPilotView.java
@SJuliez SJuliez merged commit 4d8f55c into MegaMek:master Feb 21, 2024
4 checks passed
@SJuliez SJuliez deleted the WC_MM3498 branch March 9, 2024 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
For New Dev Cycle This PR should be merged at the beginning of a dev cycle
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dezgra-Mode
3 participants