Code

Lgkd/master#24

Code

Open

lgranger wants to merge 23 commits intoAda-C4:lgkd/masterAda-C4/2048:lgkd/masterfrom kdefliese:lgkd/masterCopy head branch name to clipboard

+325-10

Commits

Commits on Feb 2, 2016

• added simple tile sliding

  kdefliese

  committed
  78b5735

  Copy full SHA for 78b5735

• arrow key presses move and reassign tile rol and col values

  

  Lauren Granger

  committed
  ce6c240

  Copy full SHA for ce6c240

• random 2 is added to the game board via the createRandomTile function

  

  Lauren Granger

  committed
  ee311f4

  Copy full SHA for ee311f4

• tiles are being added to the board

  

  Lauren Granger

  committed
  8194ec5

  Copy full SHA for 8194ec5

• random tiles adding to board based on their rando locations, plus bug fixes

  

  Lauren Granger

  committed
  48cfb76

  Copy full SHA for 48cfb76

• began thinking about how to move tiles horizontally

  kdefliese

  committed
  c368127

  Copy full SHA for c368127

• board updates when you move the tiles to the left

  kdefliese

  committed
  475b467

  Copy full SHA for 475b467

• did a little cosmetic clean up

  kdefliese

  committed
  eab262c

  Copy full SHA for eab262c

• updated tile references to tiles

  kdefliese

  committed
  cc58520

  Copy full SHA for cc58520

• a few more cosmetic clean up items

  kdefliese

  committed
  0025e26

  Copy full SHA for 0025e26

• separated animation into its own function

  kdefliese

  committed
  409976f

  Copy full SHA for 409976f

Commits on Feb 3, 2016

• wtf is happening

  

  Lauren Granger

  committed
  0aaf558

  Copy full SHA for 0aaf558

• played around with alternate solution for moving tiles but nothing concrete yet

  kdefliese

  committed
  2d7095e

  Copy full SHA for 2d7095e

Commits on Feb 4, 2016

• added sort function for Tiles array

  kdefliese

  committed
  4432672

  Copy full SHA for 4432672

• draft of animateTiles function

  kdefliese

  committed
  1fb9752

  Copy full SHA for 1fb9752

• tiles slide properly to the left

  

  Lauren Granger

  committed
  a333f98

  Copy full SHA for a333f98

• fixed tile colors and cleaned things up a bit

  

  Lauren Granger

  committed
  f9a9672

  Copy full SHA for f9a9672

• upateBoard function properly updates board for all cases

  

  Lauren Granger

  committed
  e87843c

  Copy full SHA for e87843c

Commits on Feb 5, 2016

• fixed board updating

  kdefliese

  committed
  96e51d3

  Copy full SHA for 96e51d3

• deleting div tiles that were combined

  kdefliese

  committed
  3239180

  Copy full SHA for 3239180

• swiping left combines tiles successfully, YAY

  kdefliese

  committed
  b86502e

  Copy full SHA for b86502e

• added scoring

  kdefliese

  committed
  140b12f

  Copy full SHA for 140b12f

• tiles swiping right and combining although animation is not quite right

  kdefliese

  committed
  e726354

  Copy full SHA for e726354