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 to mater #4659

Merged
merged 34 commits into from
Aug 24, 2016
Merged

Dev merge to mater #4659

merged 34 commits into from
Aug 24, 2016

Commits on Aug 23, 2016

  1. Map expieration timestamps / names (#4633) 

    * name from ID

* p name

* name from id

* Pokemon name & expiration information

* Update map.js

* Update map.js

* Add files via upload

* Update main.js

* Update map.js
    @BreezeRo
    BreezeRo authored Aug 23, 2016
    Configuration menu
    Copy the full SHA
    bc73d61 View commit details
    Browse the repository at this point in the history

  2. Add files via upload (#4637)

    @BreezeRo
    BreezeRo authored Aug 23, 2016
    Configuration menu
    Copy the full SHA
    d87733e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into dev

    @solderzzc
    solderzzc authored Aug 23, 2016
    Configuration menu
    Copy the full SHA
    a1a71fb View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2016

  1. Added text toast to screen if send by human. 

    Switch link to repo.
    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    81ba624 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o dev
    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    2a5898b View commit details
    Browse the repository at this point in the history

  3. Fixed #4621 (broken 'any' after addition of 'all') (#4639) 

    * 'all' keyword in 'release' config discards all pokemon in bag except N best ones

* "release": {"all": keep_best_cp": 100} globally keeps 100 best CP pokemon
* fixed description of 'any' in docs and configs
* added 'all' example in config files
* added example of 'all' to docs

* Fixed #4621
    @LitRidl @mjmadsen
    LitRidl authored and mjmadsen committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    04c5ec5 View commit details
    Browse the repository at this point in the history

  4. Catcher improvements (#4640) 

    * Encounter check + etc

* Deleted catch_lured_pokemon

* Deleted catch_visible_pokemon

* No need to sort forts IMO

* Removed capture_lured_* and capture_visible_*
    @mjmadsen
    mjmadsen authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    fe7768c View commit details
    Browse the repository at this point in the history

  5. Increase config default wait times (#4642) 

    * Raise default waits

* Raise default waits

* Raise default waits

* Raise default waits

* Raise default waits

* Raise default waits
    @mjmadsen
    mjmadsen authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    d586ce9 View commit details
    Browse the repository at this point in the history

  6. enable polywalker on FollowPath (#4644)

    @alexyaoyang @mjmadsen
    alexyaoyang authored and mjmadsen committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    b16bd50 View commit details
    Browse the repository at this point in the history

  7. update docs with working pokemongo-map link

    @C-o-r-E
    C-o-r-E committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    f44d1a7 View commit details
    Browse the repository at this point in the history

  8. Fixed variable reference (#4650)

    @mjmadsen
    mjmadsen authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    e3442e9 View commit details
    Browse the repository at this point in the history

  9. Reduce reachable range (#4651) 

    * Fixed variable reference

* Reduce reachable range

* Reduce reachable range

* Increase pokemon range a  bit
    @mjmadsen
    mjmadsen authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    a0cb16f View commit details
    Browse the repository at this point in the history

  10. teleporting do not update last-location

    @helloj
    helloj committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    9fb370e View commit details
    Browse the repository at this point in the history

  11. typo: min_evolve_speed -> max_evolve_speed

    @geminiyellow
    geminiyellow authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    722f86d View commit details
    Browse the repository at this point in the history

  12. Merge pull request #4645 from C-o-r-E/dev 

    update docs with working pokemongo-map link
    @solderzzc
    solderzzc authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    47adbfc View commit details
    Browse the repository at this point in the history

  13. Merge pull request #4655 from geminiyellow/patch-1 

    typo: `min_evolve_speed` -> `max_evolve_speed`
    @solderzzc
    solderzzc authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    60d1272 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #4653 from helloj/hotfix_teleport 

    teleporting do not update last-location
    @solderzzc
    solderzzc authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    fd95ce8 View commit details
    Browse the repository at this point in the history

  15. Level limit

    Alex Yao committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    40a2716 View commit details
    Browse the repository at this point in the history

  16. Modify to hide the google translate.

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    1bfa03a View commit details
    Browse the repository at this point in the history

  17. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o dev
    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    7df7ad0 View commit details
    Browse the repository at this point in the history

  18. Only change the native part of mqtt broker, cname won't work on the w… 

    …ebsocket side.
    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    f2905c4 View commit details
    Browse the repository at this point in the history

  19. Enable this line if you are doing the snip code, off stress

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    67df2c9 View commit details
    Browse the repository at this point in the history

  20. Removed code to avoid exception.

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    951d102 View commit details
    Browse the repository at this point in the history

  21. Need remove the name since some are UTF8 encode.

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

  22. Fixed typo.

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    42eeb80 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #4656 from alexyaoyang/feature-level-limit 

    Stops bot after a set level limit
    @solderzzc
    solderzzc authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    b035269 View commit details
    Browse the repository at this point in the history

  24. switch to self hosted mqtt server.

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    56a5d11 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o dev
    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    22fb757 View commit details
    Browse the repository at this point in the history

  26. Submit code for sniper testing.

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    3f32ba8 View commit details
    Browse the repository at this point in the history

  27. Revert "Stops bot after a set level limit"

    @solderzzc
    solderzzc authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    204af22 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #4658 from PokemonGoF/revert-4656-feature-level-limit 

    Revert "Stops bot after a set level limit"
    @solderzzc
    solderzzc authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    af7d82c View commit details
    Browse the repository at this point in the history

  29. Comment out some code to let code run.

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    3248b91 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'dev' of https://github.com/PokemonGoF/PokemonGo-Bot int… 

    …o dev
    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    fae2fb2 View commit details
    Browse the repository at this point in the history

  31. Merge remote-tracking branch 'origin/master' into dev

    @solderzzc
    solderzzc committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    5d198c5 View commit details
    Browse the repository at this point in the history