Code

functional 2048 game#13

Code

Open

jennaplusplus wants to merge 40 commits intoAda-C4:jmnsat/masterAda-C4/2048:jmnsat/masterfrom jennaplusplus:jmnsat/masterjennaplusplus/2048:jmnsat/masterCopy head branch name to clipboard

+9,018-6

Commits

Commits on Feb 1, 2016

• function to get empty spaces

  jennaplusplus

  committed
  37d2a51

Commits on Feb 2, 2016

• method to add 2 or 4 to empty board cell

  jennaplusplus

  committed
  2eca20e

• made tile logic clearer

  jennaplusplus

  committed
  67bf1f8

• removed hard-coded lengths from loop

  jennaplusplus

  committed
  50c51c9

• two random tiles at the beginning of the game

  jennaplusplus

  committed
  1b3f3e4

• moving multiple tiles up to a wall

  jennaplusplus

  committed
  0529184

• moving tiles up, not working

  jennaplusplus

  committed
  784d14e

• Tiles correctly move to top of board without replacing existing values

  trowbrsa

  committed
  dc89923

• Troubleshooting why currentRow breaks after completion of while loop - still not working

  trowbrsa

  committed
  ece9cd0

• Moving tiles to the left now works

  trowbrsa

  committed
  1d35bc9

• Moving tiles to the right now works

  trowbrsa

  committed
  47bd398

• not checking every cell for up condition

  jennaplusplus

  committed
  143b296

• refactor up and down

  jennaplusplus

  committed
  179ba9a

Commits on Feb 3, 2016

• refactor all directions

  jennaplusplus

  committed
  f1fc46a

• new tile looks better

  jennaplusplus

  committed
  a279b24

• Added logic for winning game

  trowbrsa

  committed
  92336df

• Added a reset board function

  trowbrsa

  committed
  d45ebfb

• Added css styling for reset button

  trowbrsa

  committed
  d878611

• fixed reset button

  jennaplusplus

  committed
  4eccf5a

• method to get tile from row and col

  jennaplusplus

  committed
  7dadcd7

Commits on Feb 4, 2016

• combine method for UP direction

  jennaplusplus

  committed
  6a157b5

• collisions UP

  jennaplusplus

  committed
  85aa20d

• You can now have collisions when you press the downkey

  trowbrsa

  committed
  cf9b4b7

• Left arrow not correctly combining values

  trowbrsa

  committed
  4499983

• Left and right collisions now working

  trowbrsa

  committed
  bdba1a6

• updated gitignore and cleaned up move tile function

  jennaplusplus

  committed
  7927ee8

• fixed spacing

  jennaplusplus

  committed
  e0b8d4d

• fixed function name

  jennaplusplus

  committed
  da17015

Commits on Feb 5, 2016

• Score method now works

  trowbrsa

  committed
  f9a7ae0

• Added minor css and a 'you win' message

  trowbrsa

  committed
  94deae4

• Reverted back to master branch'

  trowbrsa

  committed
  6047c56

• Fixed syntax for win function

  trowbrsa

  committed
  b0aafab

• Fixed if/else in scoreboard statement

  trowbrsa

  committed
  47e1b66

• Win message now displaying

  trowbrsa

  committed
  264ec09

• fixed merge conflict

  trowbrsa

  committed
  6709bfd

• no tile added if your move was impossible

  jennaplusplus

  committed
  fb6d603

• Score method now displays beautifully

  trowbrsa

  committed
  072ce75

• game lost function

  jennaplusplus

  committed
  04146ae

• Styling for header

  trowbrsa

  committed
  aa86ebd

• fixed merge conflict

  trowbrsa

  committed
  36d32a8