Code

Alysia & Ania's 2048#9

Code

Open

aniagonzalez wants to merge 19 commits intoAda-C5:masterAda-C5/2048:masterfrom aniagonzalez:masteraniagonzalez/2048:masterCopy head branch name to clipboard

+299-10

Commits

Commits on Jul 5, 2016

• We initialized a matrix of 4x4

  aniagonzalez

  committed
  2aea255

• We initialized a square value :D

  aniagonzalez

  committed
  d1dfb36

• We created a function that renders the tiles

  aniagonzalez

  committed
  8189ba2

• Refactored columns and rows into numbers so we can use them in ranges

  aniagonzalez

  committed
  42a6c66

Commits on Jul 6, 2016

• tiles can move up and down

  aniagonzalez

  committed
  24ce217

• Added arrow key functionality for moving tiles.

  abrown152

  committed
  fecb70e

• Can combine tiles and get a new tile value.

  abrown152

  committed
  2463ec7

• the random tiles appear

  aniagonzalez

  committed
  2e4744c

• added a modTiles array so that we can keep track of tiles that have already been combined

  aniagonzalez

  committed
  0a9e9a0

• Fixed bug -- multiple combines cannot happen during a single move.

  abrown152

  committed
  596a541

• Added console message when player loses.

  abrown152

  committed
  8d96d6a

Commits on Jul 7, 2016

• Initialized win, lose and scoring functions.

  aniagonzalez

  committed
  f5188d0

• Created checkWin function.

  abrown152

  committed
  5da5af0

• Added updateScore function.

  abrown152

  committed
  f79cf47

• Check lose function is working

  aniagonzalez

  committed
  ee4950f

Commits on Jul 8, 2016

• Added score to display.

  abrown152

  committed
  f033c88

• Added win notification to display.

  abrown152

  committed
  e52f9f0

• Merge branch 'master' of github.com:aniagonzalez/2048

  Show description for 19f565e
  abrown152

  committed
  19f565e

• Added loss display and functions.

  abrown152

  committed
  0e9eeaf