Inventory refactor#108

Merged

Grover-c13 merged 29 commits intoGrover-c13:masterfrom

mjmjelde:inventory_refactor

Jul 22, 2016

Commits on Jul 21, 2016

Modified how caching of map objects works
Matthew J. Mjelde
committed
Fixed the license
Matthew J. Mjelde
committed

Commits on Jul 22, 2016

Moved inventories to group them together better. Moved update methods as well.
mjmjelde
committed
Added Player Stats
mjmjelde
committed
Added more data to EncounterResult
mjmjelde
committed
Merge pull request #109 from mjmfighter/add_more_encounter_data
Grover-c13
authored
Modified how caching of map objects works

Matthew J. Mjelde
authored and
Grover-c13
committed
Fixed the license

Matthew J. Mjelde
authored and
Grover-c13
committed
Merge branch 'mjmfighter-MapAPI_Updates'
Grover-c13
committed
Merge remote-tracking branch 'origin/master'
Grover-c13
committed
Fix merge issue with package rename (Pokemon -> pokemon) and stylecheck errors.
Grover-c13
committed
Make server requests work over multiple threads at once
jabbink
committed
made catchPokemon() use the next tier pokeball if out of the tier below (ie 0 pokeballs = use greatball, 0 greatballs use ultraball)
Grover-c13
committed
Merge pull request #112 from Grover-c13/PokemonCatch
Grover-c13
authored
Only build master pushes
langerhans
authored
Merge branch 'master' into fix-threadSafeServerRequest
jabbink
committed
Merge pull request #114 from langerhans/patch-1
Grover-c13
authored
Fix checkstyle
jabbink
committed
Merge pull request #113 from jabbink/fix-threadSafeServerRequest
Grover-c13
authored
automatically close the Response stream, even when the server fails to reply correctly
jabbink
committed
Merge pull request #121 from jabbink/fix-closeResponseResource
jabbink
authored
refresh expired auth tickets
jabbink
committed
Merge pull request #122 from jabbink/fix/refreshAuthTicket
jabbink
authored
Added check to see if pokemon was already in the inventory
mjmjelde
committed
Moved inventories to group them together better. Moved update methods as well.

mjmjelde
authored and
Matthew J. Mjelde
committed
Added Player Stats

mjmjelde
authored and
Matthew J. Mjelde
committed
Added check to see if pokemon was already in the inventory

mjmjelde
authored and
Matthew J. Mjelde
committed
Rebased with latest master. Removed code that automatically updated inventories when evolving or other similar tasks. Fixed code style
Matthew J. Mjelde
committed
Removed an unused import
Matthew J. Mjelde
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Inventory refactor#108

Inventory refactor#108
Grover-c13 merged 29 commits intoGrover-c13:masterfrom
mjmjelde:inventory_refactor

Commits on Jul 21, 2016

Modified how caching of map objects works

Fixed the license

Commits on Jul 22, 2016

Moved inventories to group them together better. Moved update methods as well.

Added Player Stats

Added more data to EncounterResult

Merge pull request #109 from mjmfighter/add_more_encounter_data

Modified how caching of map objects works

Fixed the license

Merge branch 'mjmfighter-MapAPI_Updates'

Merge remote-tracking branch 'origin/master'

Fix merge issue with package rename (Pokemon -> pokemon) and stylecheck errors.

Make server requests work over multiple threads at once

made catchPokemon() use the next tier pokeball if out of the tier below (ie 0 pokeballs = use greatball, 0 greatballs use ultraball)

Merge pull request #112 from Grover-c13/PokemonCatch

Only build master pushes

Merge branch 'master' into fix-threadSafeServerRequest

Merge pull request #114 from langerhans/patch-1

Fix checkstyle

Merge pull request #113 from jabbink/fix-threadSafeServerRequest

automatically close the Response stream, even when the server fails to reply correctly

Merge pull request #121 from jabbink/fix-closeResponseResource

refresh expired auth tickets

Merge pull request #122 from jabbink/fix/refreshAuthTicket

Added check to see if pokemon was already in the inventory

Moved inventories to group them together better. Moved update methods as well.

Added Player Stats

Added check to see if pokemon was already in the inventory

Rebased with latest master. Removed code that automatically updated inventories when evolving or other similar tasks. Fixed code style

Removed an unused import