Skip to content

Conversation

@SJuliez
Copy link
Member

@SJuliez SJuliez commented May 20, 2024

In development

SJuliez and others added 9 commits May 20, 2024 11:40
MegaMek
+ Fix 5476: Update SV armor slots to 2 or 1 for Rating E or F respectively

MegaMekLab
+ Fix #MegaMek#1514: Fix Atrocious table shading render speed

MekHQ
+ PR MegaMek#4106: Use tabs in customize scenario dialog
+ PR MegaMek#4105: Updated Post-Scenario Logging for Prisoners
+ PR MegaMek#4104: Fixed Post-Scenario Tracking System's Handling of Multiple Personnel in autoAwards
+ PR MegaMek#4102: Fixed Award Tier Count Calculations in PersonViewPanel
+ PR MegaMek#4093: Added Negotiation and Scrounge Skill Settings for Administrator Personnel
+ PR MegaMek#4054: Added Life Paths Campaign Options Tab, Added Education Module
            Very Important to read the documentation on this feature (See Docs folder)
# Conflicts:
#	megamek/docs/history.txt
@codecov
Copy link

codecov bot commented Aug 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 29.14%. Comparing base (b03a2d9) to head (d5953a3).
Report is 43 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #5490      +/-   ##
============================================
- Coverage     29.15%   29.14%   -0.02%     
- Complexity    15415    15441      +26     
============================================
  Files          2865     2871       +6     
  Lines        280027   280357     +330     
  Branches      49307    49346      +39     
============================================
+ Hits          81655    81718      +63     
- Misses       192890   193153     +263     
- Partials       5482     5486       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HammerGS HammerGS added the For New Dev Cycle This PR should be merged at the beginning of a dev cycle label Jan 31, 2025
@rjhancock
Copy link
Collaborator

9 months with no changes. Closing for now. Please re-open when updated.

@rjhancock rjhancock closed this Feb 1, 2025
@HammerGS HammerGS reopened this Feb 1, 2025
@HammerGS
Copy link
Member

HammerGS commented Feb 1, 2025

Please leave open.

SJuliez and others added 3 commits February 26, 2025 17:20
# Conflicts:
#	megamek/data/mechfiles/vehicles/3145/Davion/Destrier Siege Vehicle.blk
#	megamek/src/megamek/client/ui/swing/MekViewPanel.java
#	megamek/src/megamek/client/ui/swing/util/FluffImageHelper.java
@AFoletti
Copy link

FWIW, I am super-happy to see this development happening. Can't wait to have it merged.
Thanks for your work!

IllianiBird and others added 4 commits October 13, 2025 11:07
…or to Reduce Ambiguity (MegaMek#7491)

As per title. Nothing exciting here.

As further action, it might make sense to rename 'TargetRoll' and
'TargetRollModifier' to 'TargetNumber' and 'TargetNumberModifier' to
further reduce risk of confusion moving forward. Such confusion was the
root cause of MegaMek/mekhq#7713
# Conflicts:
#	megamek/docs/AI and MegaMek Suite (Not Princess Stuff).txt
#	megamek/docs/history.txt
#	megamek/src/megamek/client/ui/FluffImageTooltip.java
#	megamek/src/megamek/client/ui/swing/MekViewPanel.java
#	megamek/src/megamek/client/ui/util/FluffImageHelper.java
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.

5 participants