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.

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

Bring together CatchVisiblePokemon & CatchLuredPokemon in config #3966

Merged
merged 17 commits into from
Aug 17, 2016

Commits on Aug 15, 2016

  1. CatchPokemon calls CatchLuredPokemon and CatchVisiblePokemon methods.

    Config now only needs one catch related worker.  All catch related config including option to catch lured and/or visible can be kept with the task.
    Quantra committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    ef621fa View commit details
    Browse the repository at this point in the history
  2. example config

    Quantra committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    ade7ffe View commit details
    Browse the repository at this point in the history
  3. indentation

    Quantra committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    1b14c55 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Configuration menu
    Copy the full SHA
    d3bb037 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f12515 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'dev_latest' into catch_pokemon

    Conflicts:
    	pokecli.py
    Quantra committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    aab2aca View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b8969ab View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9c2a400 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    38fdd6b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a7468ac View commit details
    Browse the repository at this point in the history
  8. Merge branch 'dev_latest' into catch_pokemon

    Conflicts:
    	pokecli.py
    Quantra committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    88c7aba View commit details
    Browse the repository at this point in the history
  9. Merge branch 'dev_latest' into catch_pokemon

    Conflicts:
    	configs/config.json.example
    Quantra committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    7bd91ea View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Configuration menu
    Copy the full SHA
    60351ac View commit details
    Browse the repository at this point in the history
  2. deprecation warning message

    Quantra committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    f25d7b2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bfc0e8c View commit details
    Browse the repository at this point in the history
  4. updated example configs

    Quantra committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    040a5f4 View commit details
    Browse the repository at this point in the history
  5. updated docs

    Quantra committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    a7da045 View commit details
    Browse the repository at this point in the history