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

Dev merge from head fork #1

Merged
merged 21 commits into from
Aug 17, 2016
Merged

Dev merge from head fork #1

merged 21 commits into from
Aug 17, 2016

Commits on Aug 17, 2016

  1. Updated wiki, explain how to use Docker under Windows (#4136)

    @supercourgette @solderzzc
    supercourgette authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    e98b52c View commit details
    Browse the repository at this point in the history

  2. Bring together CatchVisiblePokemon & CatchLuredPokemon in config (#3966) 

    * 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.

* example config

* indentation

* defaults for catch_lured/visible_pokemon

* deprecated command line options for throw parameters

* catch_throw_parameters defaults match config.json.example

* added deprecation functionality for CatchVisiblePokemon and CatchLuredPokemon

* min_ultraball_to_keep default reflects example config

* tree_config_builder_test uses CatchPokemon instead of CatchLuredPokemon

* deprecation warning message

* catchsim config moved to CatchPokemon

* updated example configs

* updated docs
    @Quantra @solderzzc
    Quantra authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    805930d View commit details
    Browse the repository at this point in the history

  3. User configurable delay when spinning fort (#4109) 

    * user configurable delay for spin fort

* replaced time.sleep(2) with configurable delay

* updated configs
    @Quantra @solderzzc
    Quantra authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8a7580e View commit details
    Browse the repository at this point in the history

  4. fix followCluster & MoveToMapPokemon (#4115) 

    * * fixed followCluster not following lured clusters because of outdated pokestop data structure
* fixed very annoying followCluster wording (OCD senses were tickling)
* fixed #4022

* no message

* string formatting

* correcting message to display lured only when walking to lured cluster

* message formatting

* forgot to add regester event variable
    @mvrska @solderzzc
    mvrska authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    ad91ac7 View commit details
    Browse the repository at this point in the history

  5. Showing detailed sleep info (#4066)

    @cmezh @solderzzc
    cmezh authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    7cb32e3 View commit details
    Browse the repository at this point in the history

  6. Windows installation instructions refit (#3898) 

    * Delete PokemonGo-Bot-Repair.bat

* Update PokemonGo-Bot-Install.bat

* Update PokemonGo-Bot-Start.bat

Removed an update procedure that was making the map not to work.

* Update installation.md

Modified Windows installation instructions to use the batch files.

* Update PokemonGo-Bot-Install.bat

Added links for the configuration instructions. Still missing links for the encrypt files. Need help on it.

* Update manual_installation.md

Recreated the installations instructions for Windows.

* Update installation.md

Removed the need to download PyYAML and modified the instructions to download only the required encrypt files.

* Update manual_installation.md

Removed the requirement to download PyYAML as the installer already downloads it during git pull. Also removed the requirement to download all encrypt files.

* Update PokemonGo-Bot-Install.bat

* Update PokemonGo-Bot-Install.bat

* Update PokemonGo-Bot-Start.bat

Added a pause in the end so the promp wont close in the end if `pokecli.py` goes to error.

* Update PokemonGo-Bot-Install.bat

Added a procedure to deal with the installation path issue. Also, added a command to install protobuff automatically.

* Update installation.md

Removed the requirement to install protobuff as it will be installed automatically by the install batch.

* Update PokemonGo-Bot-Install.bat

* Update manual_installation.md

Removed the requirement for protoc and added command line to download it.

* Update PokemonGo-Bot-Install.bat

* Update PokemonGo-Bot-Start.bat

Updated in order to work anywhere as long its inside the windows_bat folder

* Update PokemonGo-Bot-Install.bat

* Update installation.md

* Update PokemonGo-Bot-Start.bat

* Update PokemonGo-Bot-Install.bat

* Update CONTRIBUTORS.md

* Update PokemonGo-Bot-Start.bat

* Update PokemonGo-Bot-Start.bat

* Update PokemonGo-Bot-Start.bat

* Update PokemonGo-Bot-Install.bat

* Revert "Update CONTRIBUTORS.md"

This reverts commit 856a0fd.

* Revert "Delete PokemonGo-Bot-Repair.bat"

This reverts commit a459a86.

* Revert "Update PokemonGo-Bot-Start.bat"

This reverts commit 510570d.

* Revert "Update PokemonGo-Bot-Install.bat"

This reverts commit 9db2798.

# Conflicts:
#	windows_bat/PokemonGo-Bot-Install.bat

* Complete refit of all batches

We can now choose an install location and all required software is
automatically installed.

* Added contributors

Added new contributors

* Revert "Added contributors"

This reverts commit a1d364c.
    @danielsdian @solderzzc
    danielsdian authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8e40230 View commit details
    Browse the repository at this point in the history

  7. Deprecate action_wait_min/max in favour of task specific options (#4048) 

    * RecycleItems uses it's own recycle_wait_min/max instead of action_wait_min/max

* TransferPokemon uses it's own transfer_wait_min/max instead of action_wait_min/max

* PokemonOptimizer uses it's own transfer_wait_min/max instead of action_wait_min/max

* Deprecated action_wait_min and action_wait_max

* fixed mistake
    @Quantra @solderzzc
    Quantra authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    7136348 View commit details
    Browse the repository at this point in the history

  8. Update update_live_stats.py (#3985)

    @Kassadd @elicwhite
    Kassadd authored and elicwhite committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    3d5e270 View commit details
    Browse the repository at this point in the history

  9. SQLite backend for bot/plugin use (#4129) 

    * Initial attempt at implementing an SQLite backend for plugin use

* Fixed attribute error when accessing DB
    @cwild @brantje
    cwild authored and brantje committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    41d5628 View commit details
    Browse the repository at this point in the history

  10. Patch snipey in move_to_map_pokemon.py (#4146) 

    to solve issue #4142
    @Gurzeh @brantje
    Gurzeh authored and brantje committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    0233882 View commit details
    Browse the repository at this point in the history

  11. Add files via upload (#4151)

    @RedViper9 @brantje
    RedViper9 authored and brantje committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    a940e54 View commit details
    Browse the repository at this point in the history

  12. fix example config

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

  13. fix config file

    @rawgni
    rawgni committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8baa4c9 View commit details
    Browse the repository at this point in the history

  14. added a script to check json, and updated .travis.yml

    @rawgni
    rawgni committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    332aec5 View commit details
    Browse the repository at this point in the history

  15. Update json-validate.py

    @rawgni
    rawgni authored Aug 17, 2016
    Configuration menu
    Copy the full SHA
    a96c18e View commit details
    Browse the repository at this point in the history

  16. Documenting docker-compose with Tor (#4161) 

    * Send bot through Tor

All of the bot's API requests go through tor

* links privoxy

you gotta link if you want to reference

* keep privoxy up too

* Docker documentation update

Including example command for using the alternate tor proxy command. Additionally changed line 114 to down rather than rm so that the containers are stopped before they are removed in the case that the containers were launched in detached mode.
    @douglascamata
    Matthew Crowson authored and douglascamata committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    4df7d6e View commit details
    Browse the repository at this point in the history

  17. Remove , at line 112 (#4171)

    @thanhson1085 @solderzzc
    thanhson1085 authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    e253db1 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'fix-example-config' of https://github.com/rawgni/Pokemo… 

    …nGo-Bot into rawgni-fix-example-config
    @solderzzc
    solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    0768ae8 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'rawgni-fix-example-config' into dev

    @solderzzc
    solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    0c010fb View commit details
    Browse the repository at this point in the history

  20. Minor config fix (#4173) 

    Fixes indent
    @Bashin @solderzzc
    Bashin authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    181fba5 View commit details
    Browse the repository at this point in the history

  21. Fix no pokeballs log spamming (#4000) 

    * Fix looping between equidstant pokestops

* :D

* emp

* changes

* fix no pokeballs log spamming, fix possible bug

* remove unnesscessary return

* revert pokemongo_bot/cell_workers/move_to_fort.py

* solve merge conflicts

* Remove extra whitespace
    @umbreon222 @solderzzc
    umbreon222 authored and solderzzc committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    96bdbb6 View commit details
    Browse the repository at this point in the history