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.

Sign up for GitHub

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

Jump to bottom

Added the Automatic Tracking of Award Eligibility and Additional Award Enhancements #4008

Merged
merged 75 commits into from
May 22, 2024
Merged

Added the Automatic Tracking of Award Eligibility and Additional Award Enhancements #4008

Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
0c5b682
Completed Award Controller framework and hooked it into the end of Mi…
IllianiCBT Apr 11, 2024
06895b9
Added better filtering out of Prisoners and Dependents; improved docu…
IllianiCBT Apr 11, 2024
5d448a2
Added requested additional functionality to Skill Awards
IllianiCBT Apr 12, 2024
d1ef51f
Further improvements to Skill Awards, added InjuryAwards.java
IllianiCBT Apr 12, 2024
a7946f0
Refactored Skill Awards
IllianiCBT Apr 15, 2024
7064188
Fixed missing break in switch case
IllianiCBT Apr 15, 2024
5508d53
Removed MissionAccomplishedAwards.java and moved functionality to Mis…
IllianiCBT Apr 15, 2024
379939d
Refactoring and adding support for Rank Awards
IllianiCBT Apr 15, 2024
bbabdd2
Refactoring and adding support for Time in Service Awards
IllianiCBT Apr 15, 2024
a30a011
Refactoring and added support for Contract Awards
IllianiCBT Apr 16, 2024
a9e3ff8
Refactoring and added support for Theatre of War awards
IllianiCBT Apr 16, 2024
dab7e57
Fixed typo
IllianiCBT Apr 16, 2024
09b90a1
Refactoring, improved functionality for Theatre of War Awards
IllianiCBT Apr 16, 2024
e110ffa
Refactoring
IllianiCBT Apr 16, 2024
eaabd8e
Refactoring & added support for Faction Hunter Awards
IllianiCBT Apr 16, 2024
7adc92a
Refactoring
IllianiCBT Apr 16, 2024
8ac45af
Refactoring and remaining award work
IllianiCBT Apr 17, 2024
f7f67b2
Merge branch 'MegaMek:master' into AutoMedals
IllianiCBT Apr 17, 2024
7b8e6ce
Added missing checks mandated by Github
IllianiCBT Apr 17, 2024
998b4d2
Merge remote-tracking branch 'origin/AutoMedals' into AutoMedals
IllianiCBT Apr 17, 2024
233438c
Merge branch 'MegaMek:master' into AutoMedals
IllianiCBT Apr 18, 2024
90819fe
Refactoring and added support for Scenario Kill Awards
IllianiCBT Apr 18, 2024
4fe542a
Refactoring and added support for Injury Awards
IllianiCBT Apr 18, 2024
434848a
Removed InjuryAwards.java
IllianiCBT Apr 18, 2024
ad9bea8
Adjustments following GitHub feedback
IllianiCBT Apr 18, 2024
a7dd9b3
Refactoring & initial phase two functionality
IllianiCBT Apr 19, 2024
a540afc
Typos caught by Github
IllianiCBT Apr 19, 2024
487fc8d
Refactoring and added support for 'Only issue the best award' Campaig…
IllianiCBT Apr 19, 2024
2401ef8
Refactoring and remaining Phase Two functionality
IllianiCBT Apr 19, 2024
cd65770
Bug fixes
IllianiCBT Apr 20, 2024
2536bd6
More bug fixes
IllianiCBT Apr 20, 2024
f0a8b70
Final refactoring in prep for Phase 3 development
IllianiCBT Apr 20, 2024
edae73b
Added initial GUI support
IllianiCBT Apr 21, 2024
647bb9b
Refactoring and GUI support for Kill Awards(General)
IllianiCBT Apr 22, 2024
9354067
Fixed infinite loop in TOE reading tech
IllianiCBT Apr 22, 2024
e390a7c
Mass rollout of GUI support
IllianiCBT Apr 22, 2024
10ce719
Fixed really nasty bug
IllianiCBT Apr 23, 2024
43e9f46
Split Kill campaign option into individual and formation
IllianiCBT Apr 23, 2024
79c0908
Final GUI functionality, & added the ability to ignore the standard set
IllianiCBT Apr 23, 2024
e767635
Added Toggle All buttons to Award Ceremony
IllianiCBT Apr 23, 2024
709d9c7
Added the ability to assign multiple award image tiers to Awards
IllianiCBT Apr 23, 2024
4f1e328
Added support for wide and square award images
IllianiCBT Apr 23, 2024
7376998
Bug fixes & refactoring
IllianiCBT Apr 23, 2024
89af65f
Rolled back faulty multiple award image functionality
IllianiCBT Apr 24, 2024
f36e2ad
Restored previously faulty code
IllianiCBT Apr 24, 2024
b525d16
Added ability to run autoAwards manually
IllianiCBT Apr 24, 2024
bb8025e
Reorganized the Standard Set
IllianiCBT Apr 24, 2024
ed6437a
Remaining Phase Three functionality
IllianiCBT Apr 24, 2024
14d2f2b
Removed unused tag precedence from the Standard Set
IllianiCBT Apr 24, 2024
c3fc84f
Final update
IllianiCBT Apr 24, 2024
d12e207
Merge remote-tracking branch 'origin/AutoMedals' into AutoMedals
IllianiCBT Apr 24, 2024
1772ba1
Fixing bad merge
IllianiCBT Apr 24, 2024
4f05df5
Merge branch 'MegaMek:master' into AutoMedals
IllianiCBT Apr 24, 2024
038e269
Merge remote-tracking branch 'origin/AutoMedals' into AutoMedals
IllianiCBT Apr 24, 2024
5441b10
Removed errant TODOs
IllianiCBT Apr 24, 2024
27fdba3
Delete .gitignore
IllianiCBT Apr 24, 2024
ed8271d
Remove unnecessary award attributes in XML. Fixed bug with Ignore Sta…
IllianiCBT Apr 24, 2024
f616aba
Merge remote-tracking branch 'origin/AutoMedals' into AutoMedals
IllianiCBT Apr 24, 2024
cf49c23
Revert "Delete .gitignore"
IllianiCBT Apr 24, 2024
d7a4a94
Turns out I shouldn't have deleted .gitignore from within GitHub. Thi…
IllianiCBT Apr 24, 2024
69dc2df
Removed remaining size and range from Awards with the Ignore tag
IllianiCBT Apr 24, 2024
e2bb805
Merge branch 'master' into AutoMedals
IllianiCBT May 15, 2024
8ebeadb
Refactored auto award files and remove redundant comments
IllianiCBT May 15, 2024
dd906fd
Rolled back awards image picker in PersonViewPanel
IllianiCBT May 15, 2024
b0579cb
Restored Award Guides moving them to Archive Docs
IllianiCBT May 15, 2024
41e1cd5
Added 'group' field to Award class and implemented in UI
IllianiCBT May 15, 2024
b3bbe64
Update Award constructor and cleanup PersonnelTableMouseAdapter
IllianiCBT May 15, 2024
f377f91
Updated group award names and refactored handling of "group" awards
IllianiCBT May 15, 2024
0862b6d
Add compatibility handler for "Standard" award set
IllianiCBT May 15, 2024
df81fd7
Updated award group labels and implement standard set ignore option
IllianiCBT May 15, 2024
96c837a
Added additional Misc Award handling
IllianiCBT May 15, 2024
475d829
Updated documentation
IllianiCBT May 15, 2024
7c3d731
Add exception handling to MedalOfHonor method
IllianiCBT May 15, 2024
28934c9
Merge branch 'master' into AutoMedals
IllianiCBT May 16, 2024
843c8c4
Merge branch 'master' into AutoMedals
IllianiCBT May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 0 additions & 64 deletions .gitignore
View file
Open in desktop
IllianiCBT marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.