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

Remove redundant prompts and inappropriate retreat options. Bump version and fix old version processing #1621

Closed
wants to merge 30 commits into from
Closed

Remove redundant prompts and inappropriate retreat options. Bump version and fix old version processing #1621

wants to merge 30 commits into from

Commits on Mar 24, 2017

  1. Add abstract class for MustFightBattle & NonFightingBattle to consoli… 

    …date duplicated code
    Simon committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    65574dc View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2017

  1. Review feedback

    Simon committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    e26b518 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2017

  1. Don't prompt for retreat when only one retreat territory is valid 

    Don't ask for submerge or retreat when only defenseless transports remain
    Simon committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    29389d5 View commit details
    Browse the repository at this point in the history

  2. Fix tests

    Simon committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    32a6142 View commit details
    Browse the repository at this point in the history

  3. Fix bug found by test

    Simon committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    c6a3106 View commit details
    Browse the repository at this point in the history

  4. Kill undefended AA Guns too

    Simon committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    87fc650 View commit details
    Browse the repository at this point in the history

  5. Code formatting

    Simon committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    e6a18a4 View commit details
    Browse the repository at this point in the history

  6. Fix order for subs submerging vs air only so that retreat is not inap… 

    …propriately offered
    Simon committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    50e199b View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. Move on 3rd version number because this fix breaks serialisation when… 

    … a combat is in progress
    Simon committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    2ae7a18 View commit details
    Browse the repository at this point in the history

  2. Fix NPE

    Simon committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    9ecca77 View commit details
    Browse the repository at this point in the history

  3. Fix NPE

    Simon committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    9940148 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'cleanup' of github.com:simon33-2/triplea into cleanup

    Simon committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    6c7a53f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'cleanup' into RemovePrompts

    Simon committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    73c2cb5 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2017

  1. Encode version in jar file

    @simon33-2
    simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    ec35384 View commit details
    Browse the repository at this point in the history

  2. Don't prompt for retreat when only one retreat territory is valid 

    Don't ask for submerge or retreat when only defenseless transports remain
    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    e2fd46e View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    cb0fb84 View commit details
    Browse the repository at this point in the history

  4. Fix bug found by test

    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    a52246a View commit details
    Browse the repository at this point in the history

  5. Kill undefended AA Guns too

    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    e177df8 View commit details
    Browse the repository at this point in the history

  6. Code formatting

    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    e7c5117 View commit details
    Browse the repository at this point in the history

  7. Fix order for subs submerging vs air only so that retreat is not inap… 

    …propriately offered
    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    13fa2d3 View commit details
    Browse the repository at this point in the history

  8. Move on 3rd version number because this fix breaks serialisation when… 

    … a combat is in progress
    @simon33-2
    Simon authored and simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    0042627 View commit details
    Browse the repository at this point in the history

  9. Merge commit '73c2cb56790d6006540f17cbed2d9aa3cb824b71'; commit 'ec35… 

    …384ecfdc54d6096f16cc56ea8360044ca993' into RemovePrompts2

Old Jar 1.9.0 made with above commit 4ca993
    @simon33-2
    simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    f251c1f View commit details
    Browse the repository at this point in the history

  10. Auto Update game_engine.properties

    @simon33-2
    simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    59c1aca View commit details
    Browse the repository at this point in the history

  11. Re-simplify code

    @simon33-2
    simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    36e9740 View commit details
    Browse the repository at this point in the history

  12. Code formatting

    @simon33-2
    simon33-2 committed Apr 6, 2017
    Configuration menu
    Copy the full SHA
    21486aa View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2017

  1. Checkstyle changes

    Simon committed Apr 8, 2017
    Configuration menu
    Copy the full SHA
    b53fcde View commit details
    Browse the repository at this point in the history

  2. CheckStyle

    Simon committed Apr 8, 2017
    Configuration menu
    Copy the full SHA
    3632e10 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2017

  1. Remove latest_version_new file dependency

    Simon committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    8da098a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into RemovePrompts

    Simon committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    313b867 View commit details
    Browse the repository at this point in the history

  3. Couldn't see a way of resolving the conflict here???

    Simon committed Apr 10, 2017
    Configuration menu
    Copy the full SHA
    36b0d62 View commit details
    Browse the repository at this point in the history