Code

Carleton Team :)#10

Code

Open

ElisaKazan wants to merge 18 commits intomirego:mastermirego/csgames18-competition:masterfrom JackMc:masterJackMc/csgames18-competition:masterCopy head branch name to clipboard

+1,026-16

Commits

Commits on Mar 24, 2018

• start

  

  Elisa Kazan

  committed
  90e7518

  Copy full SHA for 90e7518

• Add new properties from json to part

  JackMc

  committed
  dfd14ea

  Copy full SHA for dfd14ea

• Fix

  JackMc

  committed
  bc7ee7c

  Copy full SHA for bc7ee7c

• Add Jack stuff

  JackMc

  committed
  944df5b

  Copy full SHA for 944df5b

• json start

  

  Elisa Kazan

  committed
  e8a9098

  Copy full SHA for e8a9098

• it compiles

  

  Elisa Kazan

  committed
  1c48b43

  Copy full SHA for 1c48b43

Commits on Mar 25, 2018

• I push

  JackMc

  committed
  c9d5d87

  Copy full SHA for c9d5d87

• listy list

  

  Elisa Kazan

  committed
  ac69554

  Copy full SHA for ac69554

• listy list

  

  Elisa Kazan

  committed
  844f755

  Copy full SHA for 844f755

• I push once more

  JackMc

  committed
  7ea393b

  Copy full SHA for 7ea393b

• removed the lol

  

  Elisa Kazan

  committed
  6913c92

  Copy full SHA for 6913c92

• Fix

  JackMc

  committed
  9b1b3c6

  Copy full SHA for 9b1b3c6

• Merge branch 'master' of github.com:JackMc/csgames18-competition

  JackMc

  committed
  d2bf366

  Copy full SHA for d2bf366

• it aint ugly no more

  

  Elisa Kazan

  committed
  af85122

  Copy full SHA for af85122

• Merge branch 'master' of https://github.com/JackMc/csgames18-competition

  

  Elisa Kazan

  committed
  9aaef0f

  Copy full SHA for 9aaef0f

• sexy map pins ;)

  

  Elisa Kazan

  committed
  6efb860

  Copy full SHA for 6efb860

• Add location, not working

  JackMc

  committed
  9d3f602

  Copy full SHA for 9d3f602

• Merge branch 'master' of github.com:JackMc/csgames18-competition

  JackMc

  committed
  6df6a10

  Copy full SHA for 6df6a10