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

Buddy Pokemon task #5530

Merged
merged 38 commits into from
Sep 20, 2016
Merged

Buddy Pokemon task #5530

merged 38 commits into from
Sep 20, 2016

Commits on Sep 3, 2016

  1. Created buddy_pokemon.py

    @DeXtroTip
    DeXtroTip committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    7dea1f6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    ac9acab View commit details
    Browse the repository at this point in the history

  3. Added pokemon filtering, including per family and best cp

    @DeXtroTip
    DeXtroTip committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    6991951 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2016

  1. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    c14bfc8 View commit details
    Browse the repository at this point in the history

  2. Created set_buddy function

    @DeXtroTip
    DeXtroTip committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    c310e5b View commit details
    Browse the repository at this point in the history

  3. Completed set_buddy

    @DeXtroTip
    DeXtroTip committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    e87c9d3 View commit details
    Browse the repository at this point in the history

  4. Added buddy_candy to class Pokemon

    @DeXtroTip
    DeXtroTip committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    b57ff77 View commit details
    Browse the repository at this point in the history

  5. Added get_buddy_walked api request to get candy from buddy 

    Added way to search pokemon from unique_id
Little changes on how task works
    @DeXtroTip
    DeXtroTip committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    ac87e80 View commit details
    Browse the repository at this point in the history

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

    @DeXtroTip
    DeXtroTip committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    62ed72f View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2016

  1. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    7d91c30 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    2c7bc10 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2016

  1. Some updates

    @DeXtroTip
    DeXtroTip committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    6fdd484 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    e644ae6 View commit details
    Browse the repository at this point in the history

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

    @DeXtroTip
    DeXtroTip committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    f3b5dcd View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    5ed383b View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2016

  1. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 11, 2016
    Configuration menu
    Copy the full SHA
    a4415b0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 11, 2016
    Configuration menu
    Copy the full SHA
    4f574ae View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2016

  1. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    ebd8292 View commit details
    Browse the repository at this point in the history

  2. Added configs for changing and setting buddy

    @DeXtroTip
    DeXtroTip committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    4a6c395 View commit details
    Browse the repository at this point in the history

  3. Reverted wrong file last commit

    @DeXtroTip
    DeXtroTip committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    b6055b4 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    a7f286c View commit details
    Browse the repository at this point in the history

  5. Updated pokemon.json with the km needed for buddy reward

    @DeXtroTip
    DeXtroTip committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    5b24650 View commit details
    Browse the repository at this point in the history

  6. Added events 

    Some little code fixes
    @DeXtroTip
    DeXtroTip committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    e71a1b9 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    c2fa0eb View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. Some updates and errors fix 

     * Added config to force buddy change at start
 * Added checks to see if pokemon can be set as buddy
 * Added and updated some events
 * Added colored events
 * Added periodically display of buddy km track
 * Now prints total candy after reward
    @DeXtroTip
    DeXtroTip committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    87909cb View commit details
    Browse the repository at this point in the history

  2. Little code changes 

    Update config example files
    @DeXtroTip
    DeXtroTip committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    4ebcd31 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2016

  1. Added some prints to test candy limit 

    Started updateing docs/configuration_files.md
    @DeXtroTip
    DeXtroTip committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    d7d036b View commit details
    Browse the repository at this point in the history

  2. Fixed error not updating buddy_km_needed when changing buddy

    @DeXtroTip
    DeXtroTip committed Sep 17, 2016
    Configuration menu
    Copy the full SHA
    c067064 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2016

  1. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    31edee9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    acf13c8 View commit details
    Browse the repository at this point in the history

  3. Fix var name error

    @DeXtroTip
    DeXtroTip committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    c467f52 View commit details
    Browse the repository at this point in the history

  4. Fixed wrong var name 

    Updated docs/configuration_files.md
Added documentation to task
    @DeXtroTip
    DeXtroTip committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    1ddae6a View commit details
    Browse the repository at this point in the history

  5. replace() to stri()

    @DeXtroTip
    DeXtroTip committed Sep 18, 2016
    Configuration menu
    Copy the full SHA
    e154dd5 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2016

  1. Update requirements.txt with updated api

    @DeXtroTip
    DeXtroTip committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    fdaea49 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2016

  1. Fixed wrong config in examples

    @DeXtroTip
    DeXtroTip committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    44a436d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into buddy_pokemon

    @DeXtroTip
    DeXtroTip committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    6f4d5f8 View commit details
    Browse the repository at this point in the history

  3. Fix example config

    @DeXtroTip
    DeXtroTip committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    90a69ee View commit details
    Browse the repository at this point in the history

  4. Fixed wrong var name

    @DeXtroTip
    DeXtroTip committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    aea9e9a View commit details
    Browse the repository at this point in the history