Code

Completed 2048 game#12

Code

Open

jbuechs wants to merge 58 commits intoAda-C4:jr/masterAda-C4/2048:jr/masterfrom rileslovesyall:jr/masterrileslovesyall/2048:jr/masterCopy head branch name to clipboard

+441-34

Commits

Commits on Feb 2, 2016

• function working for collision logic in both positive and negative directions

  rileslovesyall

  committed
  c80c1b9

  Copy full SHA for c80c1b9

• some gameOver logic that isn't quite working yet

  rileslovesyall

  committed
  ac5c1fb

  Copy full SHA for ac5c1fb

• removed extraneous code

  rileslovesyall

  committed
  d3c3208

  Copy full SHA for d3c3208

• add gameover function

  jbuechs

  committed
  7de23b5

  Copy full SHA for 7de23b5

• create addTile method for adding and displaying new tile

  jbuechs

  committed
  6118a1a

  Copy full SHA for 6118a1a

• revamped for tile objects, addTiles working but not displaying

  rileslovesyall

  committed
  6ed7318

  Copy full SHA for 6ed7318

• comment w next step

  rileslovesyall

  committed
  138b6b2

  Copy full SHA for 138b6b2

• addTile properly displaying initial tiles, like a boss

  rileslovesyall

  committed
  62944b6

  Copy full SHA for 62944b6

• new Tile html includes tileId in class

  rileslovesyall

  committed
  71c0383

  Copy full SHA for 71c0383

• hard coded moving tiles working

  rileslovesyall

  committed
  65e69ec

  Copy full SHA for 65e69ec

• back end tile collision function for pressing up

  jbuechs

  committed
  ff298d5

  Copy full SHA for ff298d5

• removed extraneous files

  rileslovesyall

  committed
  95c3bfe

  Copy full SHA for 95c3bfe

• html displaying and combining properly

  rileslovesyall

  committed
  77ee506

  Copy full SHA for 77ee506

Commits on Feb 3, 2016

• bugfix remove deleted tiles from this.board

  jbuechs

  committed
  55b2205

  Copy full SHA for 55b2205

• Big fixed: addTile won't double up on tile spaces

  rileslovesyall

  committed
  863cfd3

  Copy full SHA for 863cfd3

• added catch for if a tile doesn't have pair

  rileslovesyall

  committed
  dde79c5

  Copy full SHA for dde79c5

• DRYed bug fix, still not working entirely

  rileslovesyall

  committed
  aac9788

  Copy full SHA for aac9788

• delete extraneous comments and consoles

  jbuechs

  committed
  adbaf5c

  Copy full SHA for adbaf5c

• bugfix moveTile switching around

  jbuechs

  committed
  144644a

  Copy full SHA for 144644a

• bugfix update data-row attr for not combined tiles in moveTile

  jbuechs

  committed
  9bcaa8c

  Copy full SHA for 9bcaa8c

• complete down arrow functionality in makeMove

  jbuechs

  committed
  df3f5fd

  Copy full SHA for df3f5fd

• left arrow works

  rileslovesyall

  committed
  c322cd5

  Copy full SHA for c322cd5

• add right functionality to makeMove function

  jbuechs

  committed
  68613c8

  Copy full SHA for 68613c8

• only add tile when move is made for up arrow

  jbuechs

  committed
  3afa0cb

  Copy full SHA for 3afa0cb

• removed extraneous code

  rileslovesyall

  committed
  7c1fe6e

  Copy full SHA for 7c1fe6e

• added moveCount functionality to right, left, and down

  rileslovesyall

  committed
  bc4c887

  Copy full SHA for bc4c887

• delayed addTiles for each direction

  rileslovesyall

  committed
  39f31c8

  Copy full SHA for 39f31c8

• remove extra console logs

  jbuechs

  committed
  265ec5c

  Copy full SHA for 265ec5c

• refactored moveTile for DRYer code

  rileslovesyall

  committed
  fd0e582

  Copy full SHA for fd0e582

• add score functionality

  jbuechs

  committed
  7a85cb5

  Copy full SHA for 7a85cb5

• game reset functional, yussss

  rileslovesyall

  committed
  8293274

  Copy full SHA for 8293274

• add game won functionality

  jbuechs

  committed
  ae99748

  Copy full SHA for ae99748

Commits on Feb 4, 2016

• gameOver code in progress

  rileslovesyall

  committed
  1597ec8

  Copy full SHA for 1597ec8

• fix checkGameOver logic

  jbuechs

  committed
  df6c339

  Copy full SHA for df6c339

• add 4 value to new tiles

  jbuechs

  committed
  4e288d5

  Copy full SHA for 4e288d5

• awsd keys work to play game as well as arrows

  rileslovesyall

  committed
  079d383

  Copy full SHA for 079d383

• working on css

  rileslovesyall

  committed
  4059409

  Copy full SHA for 4059409

• Merge branch 'gameOver' into jr/master

  rileslovesyall

  committed
  b2e043c

  Copy full SHA for b2e043c

• minor merge issue fixed

  rileslovesyall

  committed
  9be0a7c

  Copy full SHA for 9be0a7c

• stupid merge error fixed

  rileslovesyall

  committed
  64055fe

  Copy full SHA for 64055fe

• score looking a little better

  rileslovesyall

  committed
  153895a

  Copy full SHA for 153895a

• add high score

  jbuechs

  committed
  925b5bd

  Copy full SHA for 925b5bd

• New Game button visible

  rileslovesyall

  committed
  7b9031d

  Copy full SHA for 7b9031d

• fix merge conflicts

  jbuechs

  committed
  5e3990b

  Copy full SHA for 5e3990b

• Merge branch 'jr/master' of github.com:rileyrileyrose/2048 into jr/master

  jbuechs

  committed
  78b9a66

  Copy full SHA for 78b9a66

• display high score at beginning of game

  jbuechs

  committed
  a089931

  Copy full SHA for a089931

• some CSS is okay i guess ughh

  rileslovesyall

  committed
  dab597b

  Copy full SHA for dab597b

• front board looks pretty okay i guess

  rileslovesyall

  committed
  11f8e86

  Copy full SHA for 11f8e86

• change css to display game over message

  jbuechs

  committed
  59f0af5

  Copy full SHA for 59f0af5

• fix merge conflicts

  jbuechs

  committed
  75907fe

  Copy full SHA for 75907fe

• updated css for gameover screen

  rileslovesyall

  committed
  628947c

  Copy full SHA for 628947c

Commits on Feb 5, 2016

• add game won message

  jbuechs

  committed
  d789e6f

  Copy full SHA for d789e6f

• slightly changed header size

  rileslovesyall

  committed
  b8e9720

  Copy full SHA for b8e9720

• added a delay, so two tiles combining over a long distance looks less wonky

  rileslovesyall

  committed
  cdad9e5

  Copy full SHA for cdad9e5

• format score boxes

  jbuechs

  committed
  3efc945

  Copy full SHA for 3efc945

• Merge branch 'jr/master' of github.com:rileyrileyrose/2048 into jr/master

  jbuechs

  committed
  846ae93

  Copy full SHA for 846ae93

• change animation timings for collisions

  jbuechs

  committed
  d642eed

  Copy full SHA for d642eed

• style new game button

  jbuechs

  committed
  14f5870

  Copy full SHA for 14f5870