Merge branch 'master' into Development #424
Merged
+16,996
−1,156
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…esh token when using static auth
Fixes #128
Refresh the OAuth token when it expires
Publish sources jar
Level enum public for custom loggers
Fix the checkstyle config to not break other modules
add license to GoogleLoginSecrets
…va into vmarchaud-Development
update inventory after hatching eggs add missing license
find Pokemon by ID
Meta info on pokemon
…an automate the flow
Add a callback for when the Initial oAuth completes so that the app c…
add method for the incubator
Inventory force update
Power up pokemon API
Add info about native google sign in
* Sync list * Hopefully fix map.getObject/getCatchablePokemon issue
* Sync list * Hopefully fix map.getObject/getCatchablePokemon issue * Refactor some player profile stuff, make the constructor shorter, made it lazy init (wont call for an update on the server unless you call a method to get data) * The api constructor will not make any server requests, it will lazy load any sections of the api a person needs (ie callling getInventories will get stuff from the server if its yet to happen). Some extra methods now throw RemoteServer/Login exceptions so please keep that in mind. cleaned up a few things (mainly javadoc). * Refactor some player profile stuff, make the constructor shorter, made it lazy init (wont call for an update on the server unless you call a method to get data)
…rs for API users without having to rewrite the whole class. (#350)
* Optimize imports * Optimize imports
…rom catchable list after being caught/fleeing
…rom catchable list after being caught/fleeing
* fix infinite loop when pokemon flees using catch(), removed pokemon from catchable list after being caught/fleeing * fix infinite loop when pokemon flees using catch(), removed pokemon from catchable list after being caught/fleeing
Fix NPE on catch result Fix issue when pokemon broke out of ball Fix checkstyle issues
Fixes an ArrayOutOfBoundsException in EvolutionInfo. Currently it takes the length of an array as an index in the array which will result in an exception being thrown anytime this function is called.
* Extra log levels: all and none * Fix indentation (tabs only)
* Adding map util to get distance between two points * Adding sorting function for objects in the map * Adding the check if the user have enough poke ball´s * Adding the check if the user have enough poke ball´s * Adding license * Fixing example class * Fix code style * Updating code style * Updating code style * Fixing import
* Added lured pokemon to getCatchablePokemon removed DummyFuture Fixed NPE in FutureWrapper when using .just Fixed issue when caught pokemon will still appearing in catchable pokemon Added a little more detail to the PTC login exception Changed exception message from "Error in url" to "Invalid auth status code recieved" * Checkstyle * Travis fix
* Adding the check if the user have enough poke ball´s * Adding the check if the user have enough poke ball´s * Fixing example class * Fix code style
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge branch 'master' into Development