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

AtB - StratCon implementation #2144

Merged
merged 176 commits into from Apr 21, 2021
Merged

AtB - StratCon implementation #2144

merged 176 commits into from Apr 21, 2021

Commits on Feb 4, 2019

  1. start of conversion work;traitors modifier

    @NickAragua
    NickAragua committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    8f2b011 View commit details
    Browse the repository at this point in the history

  2. re-organization of map parameters editor GUI elements

    @NickAragua
    NickAragua committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    2b006fe View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2019

  1. bring back the GUI

    @NickAragua
    NickAragua committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    d39d775 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. some kind of changes

    @NickAragua
    NickAragua committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    ed10019 View commit details
    Browse the repository at this point in the history

  2. xml file

    @NickAragua
    NickAragua committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    beff8d6 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. merge

    @NickAragua
    NickAragua committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    a0c1cbf View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. merge from upstream

    @NickAragua
    NickAragua committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    3002e32 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2019

  1. data structure work

    @NickAragua
    NickAragua committed Mar 6, 2019
    Configuration menu
    Copy the full SHA
    da85b15 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. work on generating scenarios for specific track

    @NickAragua
    NickAragua committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    02eaa59 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. hook it up, kind of

    @NickAragua
    NickAragua committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    1361faa View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2019

  1. force assignment UI prototype

    @NickAragua
    NickAragua committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    d9c015f View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2019

  1. modifiers cleanup; template definitions;

    @NickAragua
    NickAragua committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    7ffb5e0 View commit details
    Browse the repository at this point in the history

  2. scenario generation work

    @NickAragua
    NickAragua committed Mar 16, 2019
    Configuration menu
    Copy the full SHA
    6c24826 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2019

  1. fix a few bugs; status display work

    @NickAragua
    NickAragua committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    1f6a53e View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

  1. merge from upstream

    @NickAragua
    NickAragua committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    2a512ee View commit details
    Browse the repository at this point in the history

  2. continued scenario lance assignment work

    @NickAragua
    NickAragua committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    00c8977 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2019

  1. merge from upstream again

    @NickAragua
    NickAragua committed Mar 29, 2019
    Configuration menu
    Copy the full SHA
    75b54ef View commit details
    Browse the repository at this point in the history

  2. scenarios can be generated and populated in campaign

    @NickAragua
    NickAragua committed Mar 29, 2019
    Configuration menu
    Copy the full SHA
    9219265 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. initial map generation and facilities

    @NickAragua
    NickAragua committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    2c2de01 View commit details
    Browse the repository at this point in the history

  2. introduce scrolling

    @NickAragua
    NickAragua committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    0067a4f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2019

  1. minor bugfixes

    @NickAragua
    NickAragua committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    6ea9e04 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. proper clicked hex detection

    @NickAragua
    NickAragua committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    05f3bd0 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

  1. continues work on track gui and rules

    @NickAragua
    NickAragua committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    34f5dff View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2019

  1. hook up stratcon rules manager to mekhq event bus

    @NickAragua
    NickAragua committed Apr 27, 2019
    Configuration menu
    Copy the full SHA
    b1c2e0f View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. stratcon UI hookup, opfor gen tweak

    @NickAragua
    NickAragua committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    b096ba2 View commit details
    Browse the repository at this point in the history

  2. remove force gen files from tracking - we're not there yet

    @NickAragua
    NickAragua committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    010c986 View commit details
    Browse the repository at this point in the history

  3. undo misguided PR cleanup attempt

    @NickAragua
    NickAragua committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    ce41cc5 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. fill transports feature

    @NickAragua
    NickAragua committed May 2, 2019
    Configuration menu
    Copy the full SHA
    40d913c View commit details
    Browse the repository at this point in the history

Commits on May 4, 2019

  1. branch switch commit

    @NickAragua
    NickAragua committed May 4, 2019
    Configuration menu
    Copy the full SHA
    b314c92 View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed May 4, 2019
    Configuration menu
    Copy the full SHA
    6f180f0 View commit details
    Browse the repository at this point in the history

  3. save campaign/track state; wreck force assignment

    @NickAragua
    NickAragua committed May 4, 2019
    Configuration menu
    Copy the full SHA
    1eb5e5e View commit details
    Browse the repository at this point in the history

Commits on May 12, 2019

  1. scenario setup work

    @NickAragua
    NickAragua committed May 12, 2019
    Configuration menu
    Copy the full SHA
    119ff41 View commit details
    Browse the repository at this point in the history

  2. scenario revision

    @NickAragua
    NickAragua committed May 12, 2019
    Configuration menu
    Copy the full SHA
    d8e5bc6 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. work on scenario-force assignment UI

    @NickAragua
    NickAragua committed May 22, 2019
    Configuration menu
    Copy the full SHA
    e373025 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2019

  1. continued work on scenario management UI

    @NickAragua
    NickAragua committed May 25, 2019
    Configuration menu
    Copy the full SHA
    51c9744 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. continued work on scenario setup wizard

    @NickAragua
    NickAragua committed May 28, 2019
    Configuration menu
    Copy the full SHA
    60e60c9 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. reworked track scenario generation mechanism

    @NickAragua
    NickAragua committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    dab9569 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. continued work on scenario wizard

    @NickAragua
    NickAragua committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    c26e5e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2019

  1. continued work on scenario UI, force assignment UI

    @NickAragua
    NickAragua committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    cbf0f56 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. continued scenario initiation work

    @NickAragua
    NickAragua committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    53ee7e4 View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    cb18b86 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. minor refactoring

    @NickAragua
    NickAragua committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    d510c6b View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. merge from upstream

    @NickAragua
    NickAragua committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    2548381 View commit details
    Browse the repository at this point in the history

  2. higher rated units get nastier opposing force

    @NickAragua
    NickAragua committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    7cee408 View commit details
    Browse the repository at this point in the history

  3. fix unit test error

    @NickAragua
    NickAragua committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    c05d07e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2019

  1. facility detection and fog of war rendering

    @NickAragua
    NickAragua committed Jun 22, 2019
    Configuration menu
    Copy the full SHA
    b6220b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. facility effects on scenarios

    @NickAragua
    NickAragua committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    5c411e3 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    ed6a5c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. merge changes

    @NickAragua
    NickAragua committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    c5f4857 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    ca46ea5 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. scenario info display

    @NickAragua
    NickAragua committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    90b1ede View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    b2f014d View commit details
    Browse the repository at this point in the history

  2. facility serialization/deserialization

    @NickAragua
    NickAragua committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    40c89f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    2bd7638 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    d4f035c View commit details
    Browse the repository at this point in the history

  2. adapt to LocalDate

    @NickAragua
    NickAragua committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    47bdb33 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. facilities work

    @NickAragua
    NickAragua committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    04c2cab View commit details
    Browse the repository at this point in the history

  2. facilities work

    @NickAragua
    NickAragua committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    7d75eb4 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. facility definitions

    @NickAragua
    NickAragua committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    f5bdaa4 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    5830ebe View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed Aug 25, 2020
    Configuration menu
    Copy the full SHA
    1d2b393 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. multiple bug fixes and hookup to actual campaign

    @NickAragua
    NickAragua committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    c862259 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2020

  1. base attack turret fix

    @NickAragua
    NickAragua committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    7c1cd73 View commit details
    Browse the repository at this point in the history

  2. facility work

    @NickAragua
    NickAragua committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    72a6f70 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. modifier sorting; pirates

    @NickAragua
    NickAragua committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    338875e View commit details
    Browse the repository at this point in the history

  2. Facility display details

    @NickAragua
    NickAragua committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    5954e05 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2020

  1. logic shuffling for better scenario generation

    @NickAragua
    NickAragua committed Sep 5, 2020
    Configuration menu
    Copy the full SHA
    3b8d316 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. scenario resolution processing; facility work

    @NickAragua
    NickAragua committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    8f7cacb View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    935339a View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2020

  1. data fixes; force undeployment by date;

    @NickAragua
    NickAragua committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    b5f6220 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2020

  1. facility capture logic;data adjustments

    @NickAragua
    NickAragua committed Sep 13, 2020
    Configuration menu
    Copy the full SHA
    1122e2f View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed Sep 13, 2020
    Configuration menu
    Copy the full SHA
    a8da6ab View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2020

  1. crew skill upgrader fix

    @NickAragua
    NickAragua committed Sep 16, 2020
    Configuration menu
    Copy the full SHA
    dd96cc4 View commit details
    Browse the repository at this point in the history

  2. UI status updates; 'business' logic for scenario completion

    @NickAragua
    NickAragua committed Sep 16, 2020
    Configuration menu
    Copy the full SHA
    d1381bb View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    98a91fa View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. contract def data structure

    @NickAragua
    NickAragua committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    1f90f88 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. pre-merge commit

    @NickAragua
    NickAragua committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    0b9be5a View commit details
    Browse the repository at this point in the history

  2. pre-merge commit MegaMek#2

    @NickAragua
    NickAragua committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    525709d View commit details
    Browse the repository at this point in the history

  3. merge from upstream

    @NickAragua
    NickAragua committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    04f10ee View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2020

  1. save point

    @NickAragua
    NickAragua committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    9b2480a View commit details
    Browse the repository at this point in the history

  2. enough of this is not api bullcrap

    @NickAragua
    NickAragua committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    8a0fc7e View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. initial implementation of objective/facility seeding

    @NickAragua
    NickAragua committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    8118366 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. objective/facility seeding; ui polish

    @NickAragua
    NickAragua committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    c226cc5 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2020

  1. contract definitions;polish;bugfixes

    @NickAragua
    NickAragua committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    c05474e View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    998ab0f View commit details
    Browse the repository at this point in the history

  3. Delete unitQuirksOverride.xml 

    Incorrectly added file
    @NickAragua
    NickAragua committed Oct 16, 2020
    Configuration menu
    Copy the full SHA
    684430e View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2020

  1. gm-reveal map; fixes for save/loading showstopper

    @NickAragua
    NickAragua committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    1a8ba7e View commit details
    Browse the repository at this point in the history

  2. merge from upstream?

    @NickAragua
    NickAragua committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    7d274ef View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. reroll population from actual lance; minefields; facility data fixes

    @NickAragua
    NickAragua committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bd14ef0 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    2eec6da View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2020

  1. fix force assignment save bug; facility name lengthening

    @NickAragua
    NickAragua committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    7fdf85e View commit details
    Browse the repository at this point in the history

  2. address some lgtm issues

    @NickAragua
    NickAragua committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    644f177 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2020

  1. template fixes; modifier application fixes; deployment return check f… 

    …ix; improved force deployment visibility
    @NickAragua
    NickAragua committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    da4960f View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    dfca32f View commit details
    Browse the repository at this point in the history

  2. stop modifier doubling

    @NickAragua
    NickAragua committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    b9e6b9d View commit details
    Browse the repository at this point in the history

  3. data fixes; hook up missed scenario method

    @NickAragua
    NickAragua committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    05d025d View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. tokenization; other stuff I don't remember

    @NickAragua
    NickAragua committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    93020d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    24c2199 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2020

  1. merge from upstream

    @NickAragua
    NickAragua committed Dec 22, 2020
    Configuration menu
    Copy the full SHA
    6fe11ed View commit details
    Browse the repository at this point in the history

  2. revert ContractMarket

    @NickAragua
    NickAragua committed Dec 22, 2020
    Configuration menu
    Copy the full SHA
    ffaea50 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2021

  1. merge from upstream

    @NickAragua
    NickAragua committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    d69c012 View commit details
    Browse the repository at this point in the history

  2. fix NPE

    @NickAragua
    NickAragua committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    3f29441 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2021

  1. merge from upstream

    @NickAragua
    NickAragua committed Mar 6, 2021
    Configuration menu
    Copy the full SHA
    7f59899 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. merge from upstream

    @NickAragua
    NickAragua committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    b197521 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. render deployed forces; part of support point costs;

    @NickAragua
    NickAragua committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    c04f51a View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. reinforcement deployment mechanics; facility visibility issue

    @NickAragua
    NickAragua committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    f32def0 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. preferences; tokens

    @NickAragua
    NickAragua committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    9f9de19 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. minefield serialization; cosmetic updates

    @NickAragua
    NickAragua committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    929e851 View commit details
    Browse the repository at this point in the history

  2. legacy AtB scenario definition formatting

    @NickAragua
    NickAragua committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    8cd257a View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2021

  1. additional code review changes

    @NickAragua
    NickAragua committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    a5382b0 View commit details
    Browse the repository at this point in the history

  2. static constructor replacement

    @NickAragua
    NickAragua committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    69a98c0 View commit details
    Browse the repository at this point in the history

  3. merge from upstream

    @NickAragua
    NickAragua committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    fe6e045 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. fix compilation errors

    @NickAragua
    NickAragua committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    49aa475 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. path constants; filter on inactive units; refresh campaign state prop… 

    …erly
    @NickAragua
    NickAragua committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    3712585 View commit details
    Browse the repository at this point in the history

  2. additional unit eligibility checks

    @NickAragua
    NickAragua committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    df692e1 View commit details
    Browse the repository at this point in the history

  3. use util funciton instead of hand-rolled mess

    @NickAragua
    NickAragua committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    558d523 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. code review changes

    @NickAragua
    NickAragua committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    aac2ced View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. merge from upstream

    @NickAragua
    NickAragua committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    8627de7 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. merge from upstream

    @NickAragua
    NickAragua committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    093eaeb View commit details
    Browse the repository at this point in the history

  2. implement failed reinforcement attempts; fix scenario template retrie… 

    …val bug caused by code review changes
    @NickAragua
    NickAragua committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    cc3a1c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. UI cleanup; 'sticky' forces

    @NickAragua
    NickAragua committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    5b5aeb8 View commit details
    Browse the repository at this point in the history

  2. ui adjustments to reduce jumping

    @NickAragua
    NickAragua committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    84c3b0b View commit details
    Browse the repository at this point in the history

  3. fix compilation warnings

    @NickAragua
    NickAragua committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    26e5b59 View commit details
    Browse the repository at this point in the history

  4. leadership force deployment rules/UI

    @NickAragua
    NickAragua committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    1343c8b View commit details
    Browse the repository at this point in the history

  5. units deployed to StratCon tracks are ineligible for repairs

    @NickAragua
    NickAragua committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    e5b1d3a View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. force type data fixes

    @NickAragua
    NickAragua committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    41be2e4 View commit details
    Browse the repository at this point in the history

  2. scenario generation for deployed forces; bomb type fixes/expansion; s… 

    …cenario modifier fixes
    @NickAragua
    NickAragua committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    796b672 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2021

  1. code review changes

    @NickAragua
    NickAragua committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    d14fb80 View commit details
    Browse the repository at this point in the history

  2. missed a spot

    @NickAragua
    NickAragua committed Mar 28, 2021
    Configuration menu
    Copy the full SHA
    3ad5f4e View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. missed another spot

    @NickAragua
    NickAragua committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    ded0a76 View commit details
    Browse the repository at this point in the history

  2. code review changes

    @NickAragua
    NickAragua committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    3dded06 View commit details
    Browse the repository at this point in the history

  3. more code review changes

    @NickAragua
    NickAragua committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    8a2b3d0 View commit details
    Browse the repository at this point in the history

  4. spacing fix

    @NickAragua
    NickAragua committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    82e5dd2 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Apply suggestions from code review 

    Pretty sure you can read it just fine, but whatever.

Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    28c4109 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    4354381 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    0244602 View commit details
    Browse the repository at this point in the history

  4. merge from upstream

    @NickAragua
    NickAragua committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    3714465 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

  1. Update MekHQ/data/scenariomodifiers/FacilityHostileCapture.xml 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    7ab4b9b View commit details
    Browse the repository at this point in the history

  2. merge

    @NickAragua
    NickAragua committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    55af097 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2021

  1. code review changes

    @NickAragua
    NickAragua committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    8c476d8 View commit details
    Browse the repository at this point in the history

  2. Update MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    fbd59fb View commit details
    Browse the repository at this point in the history

  3. Update MekHQ/data/scenariomodifiers/AlliedMechReinforcements.xml 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    72a4646 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. merge from upstream

    @NickAragua
    NickAragua committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    c2d264c View commit details
    Browse the repository at this point in the history

  2. merge from upstream

    @NickAragua
    NickAragua committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    08c5d5b View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. missed folders in build script

    @NickAragua
    NickAragua committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    9451101 View commit details
    Browse the repository at this point in the history

  2. fix new day nag NPEs

    @NickAragua
    NickAragua committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    52905d6 View commit details
    Browse the repository at this point in the history

  3. disable legacy scenario generation for stratcon contracts

    @NickAragua
    NickAragua committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    882838f View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. don't save color if we don't have one

    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    c29f3db View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/MegaMek/mekhq into legacy… 

    …_atb_conversion
    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    5cc9941 View commit details
    Browse the repository at this point in the history

  3. deploy forces to currently selected track

    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    aed743f View commit details
    Browse the repository at this point in the history

  4. clean up phantom scenarios to prevent new day processing errors

    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    fde52dd View commit details
    Browse the repository at this point in the history

  5. sort lance lists by alphabetical order

    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    975ff32 View commit details
    Browse the repository at this point in the history

  6. code review changes

    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    058ae23 View commit details
    Browse the repository at this point in the history

  7. fix potential null color situation

    @NickAragua
    NickAragua committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    01bf880 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2021

  1. multiple bugs with ignoring scenarios; ground pirats on air maps

    @NickAragua
    NickAragua committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    133e586 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2021

  1. calculate track odds granularly; fix scenario generation/saving under… 

    … independent/liaison command
    @NickAragua
    NickAragua committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    0c8de94 View commit details
    Browse the repository at this point in the history

  2. update VP/SP in GUI when deploying reinforcements

    @NickAragua
    NickAragua committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    ba7898a View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. prevent transported infantry from throwing off reinforcement turn cal… 

    …culations
    @NickAragua
    NickAragua committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    b08b95c View commit details
    Browse the repository at this point in the history

  2. faq

    @NickAragua
    NickAragua committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    e23eb59 View commit details
    Browse the repository at this point in the history

  3. prevent unlimited assignment of leadership auxiliaries

    @NickAragua
    NickAragua committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    ed3e5f5 View commit details
    Browse the repository at this point in the history

  4. add text resources; remove campaign scenarios after ignoring in strat… 

    …con UI
    @NickAragua
    NickAragua committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    3d8916c View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2021

  1. code review changes

    @NickAragua
    NickAragua committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    2e00ea9 View commit details
    Browse the repository at this point in the history

  2. faq update

    @NickAragua
    NickAragua committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    78b310e View commit details
    Browse the repository at this point in the history

  3. missed isempty

    @NickAragua
    NickAragua committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    c38a1f7 View commit details
    Browse the repository at this point in the history

  4. fire brick error

    @NickAragua
    NickAragua committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    e5f7b6e View commit details
    Browse the repository at this point in the history

  5. whoops

    @NickAragua
    NickAragua committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    b36d9fa View commit details
    Browse the repository at this point in the history

  6. code review changes; data fix; stop nagging once user hits 'no' once

    @NickAragua
    NickAragua committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    becffdc View commit details
    Browse the repository at this point in the history

  7. Update MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    a6a4efc View commit details
    Browse the repository at this point in the history

  8. Update MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    42b305c View commit details
    Browse the repository at this point in the history

  9. Update MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java 

    Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
    @NickAragua @Windchild292
    NickAragua and Windchild292 committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    93299a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2021

  1. last code review change; properly initialize and update strategic obj… 

    …ective count
    @NickAragua
    NickAragua committed Apr 18, 2021
    Configuration menu
    Copy the full SHA
    5d41cf6 View commit details
    Browse the repository at this point in the history

  2. fix operator precedence to avoid NPE

    @NickAragua
    NickAragua committed Apr 18, 2021
    Configuration menu
    Copy the full SHA
    4b7ca45 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2021

  1. more NPE protection

    @NickAragua
    NickAragua committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    00ed93a View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2021

  1. fix scenario dates; facility generation

    @NickAragua
    NickAragua committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    c4f072f View commit details
    Browse the repository at this point in the history

  2. remove attacker/defender from dynamic scenario description

    @NickAragua
    NickAragua committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    430dcc1 View commit details
    Browse the repository at this point in the history

  3. last code review change; minor faq update

    @NickAragua
    NickAragua committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    ae5731c View commit details
    Browse the repository at this point in the history