Commits

Branch selector

master

User selector

All users

All time

Commit history

Commits on Jul 22, 2016

• Merge pull requests #135, #131 and #130

  Show description for 4f5b715
  jabbink

  committed
  4f5b715View commit details

  Copy full SHA for 4f5b715

  Browse repository at this point

• Merge branch 'feature/captureLures' into mjmfighter-catch_fix

  jabbink

  committed
  21892d6View commit details

  Copy full SHA for 21892d6

  Browse repository at this point

• Merge branch 'catch_fix' of git://github.com/mjmfighter/PokeGOAPI-Java into mjmfighter-catch_fix

  jabbink

  committed
  cf857feView commit details

  Copy full SHA for cf857fe

  Browse repository at this point

• Added Pokedex handling

  

  Matthew J. Mjelde

  committed
  ba979f3View commit details

  Copy full SHA for ba979f3

  Browse repository at this point

• Minor addition to fix for inventories and a fix for issue #136

  

  Matthew J. Mjelde

  committed
  1f79f38View commit details

  Copy full SHA for 1f79f38

  Browse repository at this point

• Fixed checkstyle error..........

  

  Matthew J. Mjelde

  committed
  298b7ecView commit details

  Copy full SHA for 298b7ec

  Browse repository at this point

• Slight fix for checkstyle to pass....

  

  Matthew J. Mjelde

  committed
  85af611View commit details

  Copy full SHA for 85af611

  Browse repository at this point

• Slight update to fix some inventory issues.

  

  Matthew J. Mjelde

  committed
  43099b7View commit details

  Copy full SHA for 43099b7

  Browse repository at this point

• Merge remote-tracking branch 'upstream/master' into feature/captureLures

  jabbink

  committed
  c3cdfb0View commit details

  Copy full SHA for c3cdfb0

  Browse repository at this point

• Merge pull request #126 from Hindi/checkStyle

  Show description for 7d9d2ab
  Grover-c13

  authored
  7d9d2abView commit details

  Copy full SHA for 7d9d2ab

  Browse repository at this point

• Merge remote-tracking branch 'upstream/master' into feature/captureLures

  jabbink

  committed
  685c4f7View commit details

  Copy full SHA for 685c4f7

  Browse repository at this point

• Another fix for catching pokemon

  

  Matthew J. Mjelde

  committed
  f5f58f6View commit details

  Copy full SHA for f5f58f6

  Browse repository at this point

• add lure pokemon to CatchablePokemon

  jabbink

  committed
  cc7a0bcView commit details

  Copy full SHA for cc7a0bc

  Browse repository at this point

• Merge pull request #129 from mjmfighter/catch_fix

  Show description for f5b5368
  Grover-c13

  authored
  f5b5368View commit details

  Copy full SHA for f5b5368

  Browse repository at this point

• Fix catching of pokemon. Also added updating of inventories to a few methods related to pokemon

  

  Matthew J. Mjelde

  committed
  d66a627View commit details

  Copy full SHA for d66a627

  Browse repository at this point

• Merge pull request #108 from mjmfighter/inventory_refactor

  Show description for 7ad922e
  Grover-c13

  authored
  7ad922eView commit details

  Copy full SHA for 7ad922e

  Browse repository at this point

• refresh expired auth tickets

  jabbink

  committed
  f8b2aacView commit details

  Copy full SHA for f8b2aac

  Browse repository at this point

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

  jabbink

  committed
  98e3a41View commit details

  Copy full SHA for 98e3a41

  Browse repository at this point

• Removed an unused import

  

  Matthew J. Mjelde

  committed
  bcfa426View commit details

  Copy full SHA for bcfa426

  Browse repository at this point

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

  

  Matthew J. Mjelde

  committed
  755482bView commit details

  Copy full SHA for 755482b

  Browse repository at this point

• Added check to see if pokemon was already in the inventory

  

  mjmjelde

  authored and

  Matthew J. Mjelde

  committed
  a4f4721View commit details

  Copy full SHA for a4f4721

  Browse repository at this point

• Added Player Stats

  

  mjmjelde

  authored and

  Matthew J. Mjelde

  committed
  a4b951dView commit details

  Copy full SHA for a4b951d

  Browse repository at this point

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

  

  mjmjelde

  authored and

  Matthew J. Mjelde

  committed
  6a2f87aView commit details

  Copy full SHA for 6a2f87a

  Browse repository at this point

• Added check to see if pokemon was already in the inventory

  mjmjelde

  committed
  4f69978View commit details

  Copy full SHA for 4f69978

  Browse repository at this point

• Fix checkstyle for requestHandler

  Stdh2d

  committed
  acbc142View commit details

  Copy full SHA for acbc142

  Browse repository at this point

• Merge pull request #122 from jabbink/fix/refreshAuthTicket

  Show description for 93834bb
  jabbink

  authored
  93834bbView commit details

  Copy full SHA for 93834bb

  Browse repository at this point

• refresh expired auth tickets

  jabbink

  committed
  b6eb9d3View commit details

  Copy full SHA for b6eb9d3

  Browse repository at this point

• Merge pull request #121 from jabbink/fix-closeResponseResource

  Show description for 13d4f9a
  jabbink

  authored
  13d4f9aView commit details

  Copy full SHA for 13d4f9a

  Browse repository at this point

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

  jabbink

  committed
  0550908View commit details

  Copy full SHA for 0550908

  Browse repository at this point

• Merge pull request #113 from jabbink/fix-threadSafeServerRequest

  Show description for f55dc0e
  Grover-c13

  authored
  f55dc0eView commit details

  Copy full SHA for f55dc0e

  Browse repository at this point

• Fix checkstyle

  jabbink

  committed
  580d752View commit details

  Copy full SHA for 580d752

  Browse repository at this point

• Merge pull request #114 from langerhans/patch-1

  Show description for 0a2fdb4
  Grover-c13

  authored
  0a2fdb4View commit details

  Copy full SHA for 0a2fdb4

  Browse repository at this point

• Merge branch 'master' into fix-threadSafeServerRequest

  jabbink

  committed
  94ba91eView commit details

  Copy full SHA for 94ba91e

  Browse repository at this point

• Only build master pushes

  Show description for 2ebc072
  langerhans

  authored
  2ebc072View commit details

  Copy full SHA for 2ebc072

  Browse repository at this point

• Merge pull request #112 from Grover-c13/PokemonCatch

  Show description for 09e66f6
  Grover-c13

  authored
  09e66f6View commit details

  Copy full SHA for 09e66f6

  Browse repository at this point