Skip to content

Dev merge to master#2939

Merged
solderzzc merged 20 commits intomasterfrom
dev
Aug 7, 2016
Merged

Dev merge to master#2939
solderzzc merged 20 commits intomasterfrom
dev

Conversation

@solderzzc
Copy link
Copy Markdown
Contributor

Short Description:
Since the dev branch is working stable.

elicwhite and others added 20 commits August 7, 2016 00:14
* Adding plugin support

* Adding an empty __init__.py
* Moving the base task to the project root

* Moving the base class more

* Changing the import again
* Adding a heartbeat to the analytics

* Heartbeat every 30 seconds, not every 5
* Fixing lure pokestop encoding

* fixing lure encoding
* Fix For catchable not being displayed on the web

* Update catch_visible_pokemon.py
Fix 32bit check, darwin and linux use the same file

Make it a function

Check if file exists, if not show error

Define file_name first

Fix return

Check if file exists, if not show error

Print info about paths

Fix for 32/64bit detection
With a simple try / except this can be solved.

Fix dirty catch all
…login. (#2771)

* Fixes #2698
- Added api.activate_signature call to prevent issue after re-login.
- Also replaced deprecated log call with event_manager emit to prevent exception being thrown.

* Modified to use OS detected library path as per PR #2768
Setting LD_LIBRARY_PATH on Dockerfile
Added a player_data property in PokemonGoBot to access player data from outside
Added unit tests for login and username stats
Added tests for call args when updating the window title
Added a platform-specific test for window title updating on win32 platform
* Fixed emit_event typo

* Update CONTRIBUTORS.md

* Changed initialization location for "bot"

We use bot in main exception on 128

* Update pokecli.py
@solderzzc solderzzc merged commit 5b3fe3d into master Aug 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.