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

Move Field of Fire Sprites out of BoardView #5466

Merged
merged 17 commits into from
May 19, 2024
Merged

Move Field of Fire Sprites out of BoardView #5466

merged 17 commits into from
May 19, 2024

Commits on May 9, 2024

  1. Add multiple BoardViews handling to AbstractClientGUI

    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    acfc3d4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/SJuliezFork/sbf-clientgui'… 

    … into clientgui-boardviews

# Conflicts:
#	megamek/src/megamek/client/ui/swing/AbstractClientGUI.java
    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    7a69d68 View commit details
    Browse the repository at this point in the history

  3. Use BoardViewsContainer and IBoardView

    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    71ec4f0 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/SJuliezFork/misc-updates' … 

    …into clientgui-boardviews

# Conflicts:
#	megamek/src/megamek/client/ui/swing/ClientGUI.java
    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    56146ce View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/SJuliezFork/SBF-step' into… 

    … clientgui-boardviews
    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    aecaff2 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'refs/remotes/SJuliezFork/sbf-step-repor… 

    …ts' into clientgui-boardviews

# Conflicts:
#	megamek/src/megamek/common/strategicBattleSystems/SBFGame.java
#	megamek/src/megamek/server/SBFGameManager.java
    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    f508c69 View commit details
    Browse the repository at this point in the history

  7. corrections

    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    e6d5608 View commit details
    Browse the repository at this point in the history

  8. add basic GUI processing to SBFClientGUI

    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    a577dec View commit details
    Browse the repository at this point in the history

  9. add basic GUI processing to SBFClientGUI

    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    c4a4f3b View commit details
    Browse the repository at this point in the history

  10. various cleanup

    @SJuliez
    SJuliez committed May 9, 2024
    Configuration menu
    Copy the full SHA
    6c9d670 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. remove unnecessary code from WeaponPanel, comments

    @SJuliez
    SJuliez committed May 12, 2024
    Configuration menu
    Copy the full SHA
    99b0bff View commit details
    Browse the repository at this point in the history

  2. misc cleanup

    @SJuliez
    SJuliez committed May 12, 2024
    Configuration menu
    Copy the full SHA
    7354ccf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/master' into clientgui-boardviews-2

    @SJuliez
    SJuliez committed May 12, 2024
    Configuration menu
    Copy the full SHA
    9aac86a View commit details
    Browse the repository at this point in the history

  4. update field of fire sprites when color settings are changed

    @SJuliez
    SJuliez committed May 12, 2024
    Configuration menu
    Copy the full SHA
    e32fc20 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'refs/heads/master' into clientgui-boardviews-2-mergemaster 

    # Conflicts:
#	megamek/src/megamek/client/ui/swing/ClientGUI.java
#	megamek/src/megamek/common/strategicBattleSystems/SBFGame.java
    @SJuliez
    SJuliez committed May 17, 2024
    Configuration menu
    Copy the full SHA
    c522a36 View commit details
    Browse the repository at this point in the history

  2. after-merge changes and CodeQL

    @SJuliez
    SJuliez committed May 17, 2024
    Configuration menu
    Copy the full SHA
    55e2bae View commit details
    Browse the repository at this point in the history

  3. review changes

    @SJuliez
    SJuliez committed May 17, 2024
    Configuration menu
    Copy the full SHA
    637ce46 View commit details
    Browse the repository at this point in the history