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

merge master #131

Merged
merged 14 commits into from
Mar 30, 2021
Merged

merge master #131

merged 14 commits into from
Mar 30, 2021

Commits on Mar 21, 2021

  1. Setup for unused art 

    Also teaching davidbissig some git stuff
    @dzfischer
    dzfischer committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    1153639 View commit details
    Browse the repository at this point in the history

  2. Initial test commit of Early Jet Fighter W

    @davidbissig2019
    davidbissig2019 committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    f1ca1ab View commit details
    Browse the repository at this point in the history

  3. First attempt at new unit art

    @dzfischer
    dzfischer committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    801db0e View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/unit-art' into unit-art

    @davidbissig2019
    davidbissig2019 committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    b2f12c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. Official update and files for Early Jet Fighter W - REAL FILES ready … 

    …for use.
    @davidbissig2019
    davidbissig2019 committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    2f31538 View commit details
    Browse the repository at this point in the history

  2. Better nif setup of the early jet fighter

    @Toffer90
    Toffer90 committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    66253c6 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/unit-art' into unit-art

    @davidbissig2019
    davidbissig2019 committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    eae8dda View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. Fixed minor text typo, also put back minimum lake/sea size on canoe b… 

    …uilder - we don't want nuclear supercarriers on tiny lakes.

This needs better solution like standalone sea hunters.
    @raxo2222
    raxo2222 committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    84af60c View commit details
    Browse the repository at this point in the history

  2. Myth, animalistic and some resource producers buildings no longer req… 

    …uire minimum size of water body.
    @raxo2222
    raxo2222 committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    f51ae46 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Some misc texture and nif cleaning

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

  2. Upgraded early fighter 3D model with a model made by DavidBissig.

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

  3. Merge branch 'unit-art'

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

  4. Nerfed Leviathian promotionline - now it affects wooden ships only, a… 

    …nd is much weaker.
    @raxo2222
    raxo2222 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    a38ec3a View commit details
    Browse the repository at this point in the history

  5. Tweaked some code I added on init() (#910)

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