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

Dev #6178

Merged
merged 41 commits into from
Aug 1, 2017
Merged

Dev #6178

merged 41 commits into from
Aug 1, 2017

Commits on Jul 26, 2017

  1. Merge pull request #22 from PokemonGoF/dev

    Dev import
    goedzo authored Jul 26, 2017
    Configuration menu
    Copy the full SHA
    1693851 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2017

  1. Merge pull request #24 from PokemonGoF/dev

    Importing Dev
    goedzo authored Jul 27, 2017
    Configuration menu
    Copy the full SHA
    a905768 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. Configuration menu
    Copy the full SHA
    201840e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    76d9afe View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d5eaa6e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    58f9f79 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2017

  1. Merge pull request #6161 from nbq/web_update

    Web folder update and required configuration script updates
    MerlionRock authored Jul 29, 2017
    Configuration menu
    Copy the full SHA
    3e0cf8a View commit details
    Browse the repository at this point in the history
  2. fixed pgo version

    nbq committed Jul 29, 2017
    Configuration menu
    Copy the full SHA
    a82e896 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dd66709 View commit details
    Browse the repository at this point in the history
  4. multibot shell test fix

    nbq committed Jul 29, 2017
    2 Configuration menu
    Copy the full SHA
    c2ecade View commit details
    Browse the repository at this point in the history
  5. Merge pull request #6160 from Alexus230/dev

    fix last_km_awarded error for new account
    MerlionRock authored Jul 29, 2017
    Configuration menu
    Copy the full SHA
    cf40e41 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2017

  1. bringing up to speed

    nbq committed Jul 30, 2017
    Configuration menu
    Copy the full SHA
    78aa28c View commit details
    Browse the repository at this point in the history
  2. add .git to clone commands

    nbq committed Jul 30, 2017
    Configuration menu
    Copy the full SHA
    908ff90 View commit details
    Browse the repository at this point in the history
  3. Update MultiBot.py

    fixing proxy and websocket handling
    Xairooo authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    bbabf04 View commit details
    Browse the repository at this point in the history
  4. fixed booboo

    nbq committed Jul 30, 2017
    Configuration menu
    Copy the full SHA
    b093887 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #6165 from Xairooo/patch-1

    Patch 1
    nbq authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    f8cd6b4 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #6164 from nbq/fix_mb_shell

    Fix pgo requirement in multibot shell
    Jcolomar authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    f3a5f13 View commit details
    Browse the repository at this point in the history
  7. Fixing proxies

    Xairooo authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    d5d2d1f View commit details
    Browse the repository at this point in the history
  8. Merge pull request #6166 from Xairooo/patch-2

    Fixing proxies
    MerlionRock authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    1649be6 View commit details
    Browse the repository at this point in the history
  9. Line 46 spelling error.

    Update from "Legendart" to "Legendary".
    VoIP authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    c7dc416 View commit details
    Browse the repository at this point in the history
  10. revert multibot shell looping

    nbq committed Jul 30, 2017
    Configuration menu
    Copy the full SHA
    78e8bfc View commit details
    Browse the repository at this point in the history
  11. Merge pull request #6167 from VoIP/patch-3

    Line 46 spelling error.
    nbq authored Jul 30, 2017
    Configuration menu
    Copy the full SHA
    fed7f07 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. Merge pull request #6168 from nbq/revert_mb_shell

    revert multibot shell looping
    MerlionRock authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    40dddd3 View commit details
    Browse the repository at this point in the history
  2. new settings, comments added

    Xairooo authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    fd039eb View commit details
    Browse the repository at this point in the history
  3. Telegram Settings

    Xairooo authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    e9f22d7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #6169 from Xairooo/patch-3

    new settings, comments added
    MerlionRock authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    1bf9235 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    58d91d0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cf78ba3 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #6170 from Xairooo/patch-5

    Telegram Settings added
    nbq authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    8a53966 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #6171 from nbq/win_manual

    clarify some steps in manual install
    Jcolomar authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    f61585d View commit details
    Browse the repository at this point in the history
  9. Merge pull request #6172 from nbq/multi-chmod

    changed runMultiBot.sh to be executable
    Jcolomar authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    ecf4f9e View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1 from PokemonGoF/dev

    Rebase from Mian
    MerlionRock authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    9130291 View commit details
    Browse the repository at this point in the history
  11. Updated Telegram Features

    Updated with Lucky egg Support
    Updated with new time calculation for sniper
    Update with new command to get time to snipe before snipping
    MerlionRock authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    261a8fb View commit details
    Browse the repository at this point in the history
  12. Updated Sniper

    Updated with Lucky egg Support (For telegram)
    Updated with new time calculation for sniper (Now up to 30KM at 15Mins)
    Update with new command to get time to snipe before snipping
    MerlionRock authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    c9d43fa View commit details
    Browse the repository at this point in the history
  13. Merge pull request #6173 from MerlionRock/dev

    Updated Sniper and Telegram Features
    Jcolomar authored Jul 31, 2017
    Configuration menu
    Copy the full SHA
    84e50ac View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. Update telegram_handler.py

    Added use incense and get incense count telegram functionality
    TheCannings authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    11780e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e256b2e View commit details
    Browse the repository at this point in the history
  3. Merge pull request #26 from PokemonGoF/dev

    Import latest Dev
    goedzo authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    04bde72 View commit details
    Browse the repository at this point in the history
  4. API updated to 0.69.1

    Note: Version number is updated to 2.13.0 to be in synch with protos version number.
    
    We are following [semantic versioning](http://semver.org/) for POGOProtos.  Every version will be mapped to their current PokémonGo version.
    
    | Version      | Android       | iOS           | Extra                     |
    |--------------|---------------|---------------|---------------------------|
    | 2.13.0       | 0.69.1        | 1.39.1        |                           |
    | 2.12.0       | 0.69.0        | 1.39.0        |                           |
    | 2.11.0       | 0.67.2        | 1.37.2        |                           |
    | 2.11.0-beta  | 0.67.1        | 1.37.1        |                           |
    | 2.10.x       | 0.63.1        | 1.33.1        |                           |
    | 2.9.2        | 0.61.0        | 1.31.0        | Updated protobuf to 3.3.0 |
    | 2.9.1        | 0.61.0        | 1.31.0        | Updated protobuf to 3.2.0 |
    | 2.9.0        | 0.61.0        | 1.31.0        |                           |
    | 2.8.0        | 0.59.1        | 1.29.1        |                           |
    | 2.7.0        | 0.57.2        | 1.27.2        |                           |
    | 2.6.x        | 0.55.0        | 1.25.0        |                           |
    | 2.5.x        | 0.53.1        | 1.23.1        |                           |
    | 2.4.x        | 0.51.0        | 1.21.0        |                           |
    | 2.3.0        | 0.49.1        | 1.19.1        |                           |
    | 2.2.0        | 0.47.1        | 1.17.0        |                           |
    | 2.1.0        | 0.45.0        | 1.15.0        |                           |
    | 2.1.0-beta   | 0.45.0        | 1.15.0        |                           |
    | 2.0.x        | 0.43.4        | 1.13.4        |                           |
    goedzo committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    f2df6fa View commit details
    Browse the repository at this point in the history
  5. Merge pull request #6176 from goedzo/0.69.1-API

    Upgraded to 0.69.1 api
    davidakachaos authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    c7edc6c View commit details
    Browse the repository at this point in the history
  6. Merge pull request #6175 from TheCannings/dev

    Added Incense to telegram
    MerlionRock authored Aug 1, 2017
    Configuration menu
    Copy the full SHA
    424908f View commit details
    Browse the repository at this point in the history