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

[Aftershock] Millyficent whately and the migo #36908

Merged
merged 30 commits into from
Mar 6, 2020
Merged

[Aftershock] Millyficent whately and the migo #36908

merged 30 commits into from
Mar 6, 2020

Commits on Jan 2, 2020

  1. Merge pull request #9 from CleverRaven/master 

    catchup to cleverraven
    @Maleclypse
    Maleclypse committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    6ab2e88 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Merge pull request #10 from CleverRaven/master 

    Catchup to CleverRaven
    @Maleclypse
    Maleclypse committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    13ffb8f View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. Merge pull request #11 from CleverRaven/master 

    Catchup
    @Maleclypse
    Maleclypse committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    6ed5b41 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. dreams mutations and classes

    @Maleclypse
    Maleclypse committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    12428ec View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2020

  1. dialogue missions and mutations

    @Maleclypse
    Maleclypse committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    c242b08 View commit details
    Browse the repository at this point in the history

  2. fixes

    @Maleclypse
    Maleclypse committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    864accd View commit details
    Browse the repository at this point in the history

  3. fixes

    @Maleclypse
    Maleclypse committed Jan 11, 2020
    Configuration menu
    Copy the full SHA
    b4a172b View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2020

  1. Update data/mods/Aftershock/mutations/mutations.json 

    Co-Authored-By: John Candlebury <johncandlebury@gmail.com>
    @Maleclypse @John-Candlebury
    Maleclypse and John-Candlebury committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    0b1dbc9 View commit details
    Browse the repository at this point in the history

  2. Update data/mods/Aftershock/items/mutagen.json 

    Co-Authored-By: John Candlebury <johncandlebury@gmail.com>
    @Maleclypse @John-Candlebury
    Maleclypse and John-Candlebury committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    0f792f0 View commit details
    Browse the repository at this point in the history

  3. Update data/mods/Aftershock/mutations/mutations.json 

    Co-Authored-By: John Candlebury <johncandlebury@gmail.com>
    @Maleclypse @John-Candlebury
    Maleclypse and John-Candlebury committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    10dd251 View commit details
    Browse the repository at this point in the history

  4. Update data/mods/Aftershock/items/mutagen.json 

    Co-Authored-By: John Candlebury <johncandlebury@gmail.com>
    @Maleclypse @John-Candlebury
    Maleclypse and John-Candlebury committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    e019c61 View commit details
    Browse the repository at this point in the history

  5. Create millyficent_lab.json

    @Maleclypse
    Maleclypse committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    9491bd1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Millyficent-Whately' of https://github.com/Maleclypse/C… 

    …ataclysm-DDA into Millyficent-Whately
    @Maleclypse
    Maleclypse committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    fcfece7 View commit details
    Browse the repository at this point in the history

  7. Update dreams.json

    @Maleclypse
    Maleclypse committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    04f00ca View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. mutations and effects 

    adds immunity to migo-breathe
    @Maleclypse
    Maleclypse committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    105adab View commit details
    Browse the repository at this point in the history

  2. Lab and Overmap files 

    Second Floor of lab still needs to be finished.  PRED1 and PRED2 need flags that are being worked on.
    @Maleclypse
    Maleclypse committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    2568a84 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. Update millyficent_lab.json

    @Maleclypse
    Maleclypse committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    a09c25b View commit details
    Browse the repository at this point in the history

  2. Update classes.json

    @Maleclypse
    Maleclypse committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    b8d53c8 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. field type and overmap terrain symbols

    @Maleclypse
    Maleclypse committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    440aa5b View commit details
    Browse the repository at this point in the history

  2. linting

    @Maleclypse
    Maleclypse committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    5df91da View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2020

  1. Update mutations.json

    @Maleclypse
    Maleclypse committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    6e8425a View commit details
    Browse the repository at this point in the history

  2. Update mutations.json

    @Maleclypse
    Maleclypse committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    71aba71 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. Update overmap_terrain.json

    @Maleclypse
    Maleclypse committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    3159d90 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. fixes

    @Maleclypse
    Maleclypse committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    a752d1b View commit details
    Browse the repository at this point in the history

  2. Update millyficent_lab.json

    @Maleclypse
    Maleclypse committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    1a03d2b View commit details
    Browse the repository at this point in the history

  3. Update millyficent_lab.json

    @Maleclypse
    Maleclypse committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    64a5db6 View commit details
    Browse the repository at this point in the history

  4. Update millyficent_lab.json

    @Maleclypse
    Maleclypse committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    2d205d7 View commit details
    Browse the repository at this point in the history

  5. trying to fix terrain calls

    @Maleclypse
    Maleclypse committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    98aee60 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2020

  1. North?

    @Maleclypse
    Maleclypse committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    7ff6e79 View commit details
    Browse the repository at this point in the history

  2. Fixes and updates. Container test.

    @Maleclypse
    Maleclypse committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    63536de View commit details
    Browse the repository at this point in the history