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

Use Ultraball If No Other Balls (With Constraint) #3421

Merged
merged 17 commits into from
Aug 12, 2016
Merged

Use Ultraball If No Other Balls (With Constraint) #3421

merged 17 commits into from
Aug 12, 2016

Commits on Aug 10, 2016

  1. Add Use Ultraball (#1) 

    * Add `use_ultraball` event to Event Manager

* Add use ultraball if pokeball + greatball = 0
    @joaodragao
    joaodragao authored Aug 10, 2016
    Configuration menu
    Copy the full SHA
    52b691f View commit details
    Browse the repository at this point in the history

  2. Add Use Ultraball if No Other Balls (#2) 

    * Add `use_ultraball` event to Event Manager

* Add use ultraball if pokeball + greatball = 0

* Add New Contributor
    @joaodragao
    joaodragao authored Aug 10, 2016
    Configuration menu
    Copy the full SHA
    b3b62c5 View commit details
    Browse the repository at this point in the history

  3. Revert "Add Use Ultraball" (#4)

    @joaodragao
    joaodragao authored Aug 10, 2016
    Configuration menu
    Copy the full SHA
    72e6ce3 View commit details
    Browse the repository at this point in the history

  4. Use Ultraball If No Other Balls (#3) 

    * Add `use_ultraball` event to Event Manager

* Add use ultraball if pokeball + greatball = 0

* Add New Contributor

* Remove 'use_ultraball' event.

* Remove `use_ultraball` event call
    @joaodragao
    joaodragao authored Aug 10, 2016
    Configuration menu
    Copy the full SHA
    2137f11 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Merge remote-tracking branch 'PokemonGoF/dev' into dev 

    # Conflicts:
#	CONTRIBUTORS.md
    @joaodragao
    joaodragao committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    616d82f View commit details
    Browse the repository at this point in the history

  2. Update & add avoid catching Pokemon if no pokeball

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    6f14c2f View commit details
    Browse the repository at this point in the history

  3. Update conflict contributors

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    b08f630 View commit details
    Browse the repository at this point in the history

  4. Add get min_ultraball_to_keep from config file

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    940402a View commit details
    Browse the repository at this point in the history

  5. Improved min_ultraball_to_keep with condition

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    0d5e9fa View commit details
    Browse the repository at this point in the history

  6. Added min_ultraball_to_keep option

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    2534f58 View commit details
    Browse the repository at this point in the history

  7. Added min_ultraball_to_keep option

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    d0b76b4 View commit details
    Browse the repository at this point in the history

  8. Added min_ultraball_to_keep option

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    5c4cf9b View commit details
    Browse the repository at this point in the history

  9. Added min_ultraball_to_keep option

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    00daaf8 View commit details
    Browse the repository at this point in the history

  10. Add min_ultraball_to_keep option

    @joaodragao
    joaodragao authored Aug 11, 2016
    Configuration menu
    Copy the full SHA
    90c023d View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Remove count all pokeballs

    @joaodragao
    joaodragao authored Aug 12, 2016
    Configuration menu
    Copy the full SHA
    165aa99 View commit details
    Browse the repository at this point in the history

  2. Update to current state

    @joaodragao
    joaodragao committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    bb3d083 View commit details
    Browse the repository at this point in the history

  3. Resolved Conflicts

    @joaodragao
    joaodragao authored Aug 12, 2016
    Configuration menu
    Copy the full SHA
    844284e View commit details
    Browse the repository at this point in the history