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

Allow to keep stronger pokemon #1302

Merged
merged 10 commits into from
Jul 28, 2016
Merged

Allow to keep stronger pokemon #1302

merged 10 commits into from
Jul 28, 2016

Commits on Jul 28, 2016

  1. Allow to keep stronger pokemon. It is woring both with CP and IV

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    a7d2684 View commit details
    Browse the repository at this point in the history

  2. Remove not needed code

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    f716a35 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/dev' into dev

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    5906f4a View commit details
    Browse the repository at this point in the history

  4. Add example of keep_best_iv into configuration

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    a632e74 View commit details
    Browse the repository at this point in the history

  5. Add delay before pokemon transfering

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    f128257 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/dev' into dev

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    5b9050b View commit details
    Browse the repository at this point in the history

  7. Resolve merge conflicts

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    6032ca2 View commit details
    Browse the repository at this point in the history

  8. Use config.release_pokemon to determine should we release pokemon or not

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    e34c0e5 View commit details
    Browse the repository at this point in the history

  9. Fix a bug

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    843d8a3 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/dev' into dev

    @Nihisil
    Nihisil committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    89441f6 View commit details
    Browse the repository at this point in the history