Code

Maps#9

Code

Open

Zeromark30 wants to merge 44 commits intomemelyfe:mapsmemelyfe/pokemongo-api-demo:mapsfrom Zeromark30:mapsCopy head branch name to clipboard

+207-116

Commits

Commits on Jul 17, 2016

• Use small icons and original Pokemon names

  luke-jr

  committed
  03fc27b

• gitignore stuff

  luke-jr

  committed
  cbe6046

• Show player on map

  luke-jr

  committed
  bdaed61

• Rename config.json to config.json.example

  luke-jr

  committed
  5bde09d

• Make times reasonably accurate

  luke-jr

  committed
  b85ab8d

• No need to clear data from previous session until we have done at least a first pass

  luke-jr

  committed
  b182bc4

• Be more resilient to failures

  luke-jr

  committed
  6c0f05f

• Store expiry time rather than time left in data

  luke-jr

  committed
  a6c99e4

• Use a hash to avoid duplicates of the same pokemon

  luke-jr

  committed
  d4bdfa1

• Load existing data at startup

  luke-jr

  committed
  278cf7f

• Merge branch 'maps' of https://github.com/memelyfe/pokemongo-api-demo into maps

  luke-jr

  committed
  85d3bc6

• Sort "Hide Pokemon" list

  luke-jr

  committed
  eee29e3

• Break down days, hours, and minutes

  luke-jr

  committed
  594bce2

• Don't delete and recreate markers for every refresh

  luke-jr

  committed
  fd25da5

• Count number of pokemon seen on the map

  luke-jr

  committed
  a44106e

Commits on Jul 18, 2016

• Show pokemon counts

  luke-jr

  committed
  201f4fb

• Retry heartbeat if it fails

  luke-jr

  committed
  bc031b6

• Atomically update data file

  luke-jr

  committed
  25fd49d

• Avoid using title for HTML content

  luke-jr

  committed
  32fa478

• Update details for existing markers so the timeleft counts down

  luke-jr

  committed
  f4b148f

• Change HTML page title

  lalten

  committed
  7b5ea8f

• Add app icon as favicon

  lalten

  committed
  342a1ac

• Use Object for hidden_layers

  luke-jr

  committed
  937fafb

• Use pokemon id number for hidden_layers key

  luke-jr

  committed
  dc9ae40

• Allow specifying default hidden_layers in config file

  luke-jr

  committed
  2663290

• Sort by and display pokedex number, and allow specifying ignored pokemon in config

  luke-jr

  committed
  d53ca57

• Ensure pokemon icons are 25px and anchor in the middle-bottom

  luke-jr

  committed
  ec267ba

• Prevent caching data

  luke-jr

  committed
  c04681a

• Make JS console logging more useful

  luke-jr

  committed
  23a665c

• Resize legend

  luke-jr

  committed
  960fbd0

Commits on Jul 19, 2016

• Merge branch 'laltenpregoogle' into merging

  Zeromark30

  committed
  ded73e4

• Merge successful

  Zeromark30

  committed
  a6ff56f

• tidy up for pull to memelyfe

  Zeromark30

  committed
  ab53878

• data.json

  Show description for b426927
  Zeromark30

  committed
  b426927

• ignore data.json

  Zeromark30

  committed
  5e0f56a

• Rename config.json.example to config.json

  Zeromark30

  authored
  b25bf5f

• Merge remote-tracking branch 'freenode/maps' into merging

  Zeromark30

  committed
  a6dbc64

• further merging

  Zeromark30

  committed
  a62c59b

• merging

  Zeromark30

  committed
  10ee267

• Create data.json

  Zeromark30

  authored
  519a3b3

• Create config.json

  Zeromark30

  authored
  c6c2823

• Merge branch 'maps' into merging

  Zeromark30

  committed
  42efa28

• Merge pull request #1 from Zeromark30/merging

  Show description for 2be3cd1
  Zeromark30

  authored
  2be3cd1

• remove minifiy

  Zeromark30

  committed
  1ca7700