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

Contracts feature #15

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Contracts feature #15

wants to merge 15 commits into from

Commits on Jul 7, 2020

  1. removed contracts from stage, working with filter instead #3

    Paul Givel committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    71747d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Merge branch 'master' into feature/contracts

    @SThor
    SThor committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    a500ca7 View commit details
    Browse the repository at this point in the history

  2. Ability to start and finish contract

    @SThor
    SThor committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    0f32ff9 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Merge remote-tracking branch 'origin/master' into feature/contracts

    @SThor
    SThor committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    8010403 View commit details
    Browse the repository at this point in the history

  2. give default values for combat if contract didn't provide any

    @SThor
    SThor committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    fb30f1a View commit details
    Browse the repository at this point in the history

  3. more variables inside contract

    @SThor
    SThor committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    b2caf4d View commit details
    Browse the repository at this point in the history

  4. contract styling

    @SThor
    SThor committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    e22e5d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. close modal when contract is failed

    Paul Givel committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    4ea8e34 View commit details
    Browse the repository at this point in the history

  2. finished contracts are removed from the available ones

    Paul Givel committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    660a40b View commit details
    Browse the repository at this point in the history

  3. Contract styling + Wrote the first contract

    Paul Givel committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    7260c90 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. better contract text, handled contract fail, WIP ennemy name i

    Paul Givel committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    f3f3f15 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. merge master into feature/contracts

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

Commits on Oct 29, 2020

  1. Copied changes from @jmaneyrol69 PR. Closes #19

    @SThor
    SThor committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b5496b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2020

  1. fixed build problem, contracts still broken

    @SThor
    SThor committed Oct 31, 2020
    Configuration menu
    Copy the full SHA
    05e64bf View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2020

  1. fix contracts

    @SThor
    SThor committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    cd11d6b View commit details
    Browse the repository at this point in the history