Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Grover-c13/PokeGOAPI-Java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: Development
Choose a base ref
...
head repository: broach/PokeGOAPI-Java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: Development
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 3 files changed
  • 4 contributors

Commits on Jul 30, 2016

  1. Fix expiration time issues related to Wild Pokemon

    Wild pokemon have two fields in the protobuf;
    LastModifiedTimestampMs and TimeTillHiddenMs. The
    TimeTillHiddenMs will often be a negative number.
    
    Example:
    LastModifiedTimestampMs: 1469902449401
    TimeTillHiddenMs: -1023634170
    
    To get the actual expire time, you need to add them together.
    
    In addition, you will also see that in a single query you get back
    the same Pokemon (same encounter id) in both Wild and Catchable.
    The catchable will have a -1 expiration time.
    
    I've modified the CatchablePokemon constructor to calculate the
    correct expiration time for WilPokemon and also screen out the
    -1 expiration Catchables in MapObjects.addCatchablePokemons()
    (They're going to be in Wild array with the correct expiration)
    Brian Roach Brian Roach
    Brian Roach authored and Brian Roach committed Jul 30, 2016
    Configuration menu
    Copy the full SHA
    3984612 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2016

  1. Reverted excluding -1 expire time pokemons from catachable

    Brian Roach Brian Roach
    Brian Roach authored and Brian Roach committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    343f274 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2016

  1. Merge remote-tracking branch 'upstream/Development' into Development

    Brian Roach Brian Roach
    Brian Roach authored and Brian Roach committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    dc9b3a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2016

  1. Configuration menu
    Copy the full SHA
    377e1b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0903f86 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'upstream2/safe_implementation_xxhashfac…

    …tory' into Development
    broach committed Aug 7, 2016
    Configuration menu
    Copy the full SHA
    a1d23da View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. Configuration menu
    Copy the full SHA
    2ff51ae View commit details
    Browse the repository at this point in the history
  2. Reorder imports + proper name

    iGio90 committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    6630497 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e9d6e89 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Configuration menu
    Copy the full SHA
    dae8615 View commit details
    Browse the repository at this point in the history
Loading