Code

Hwdg/master#18

Code

Open

yourFriendWes wants to merge 46 commits intoAda-C4:hwdg/masterAda-C4/2048:hwdg/masterfrom yourFriendWes:hwdg/masteryourFriendWes/2048:hwdg/masterCopy head branch name to clipboard

+439-44

Commits

Commits on Feb 2, 2016

• Added some functionality to keep track of free spaces

  daphnegold

  committed
  b677699

  Copy full SHA for b677699

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  daphnegold

  committed
  764ca63

  Copy full SHA for 764ca63

• add method to remove free spaces

  yourFriendWes

  committed
  64cefd2

  Copy full SHA for 64cefd2

• Some stuff for moving tiles

  daphnegold

  committed
  1301163

  Copy full SHA for 1301163

• add case for moving tiles right

  yourFriendWes

  committed
  46ff70c

  Copy full SHA for 46ff70c

• add buggy logic for shift tile left so we can both work on debugging

  yourFriendWes

  committed
  9caeb96

  Copy full SHA for 9caeb96

Commits on Feb 3, 2016

• maybe some things with updating the board methods

  daphnegold

  committed
  c5ea9b3

  Copy full SHA for c5ea9b3

• some stuff

  daphnegold

  committed
  ef0f366

  Copy full SHA for ef0f366

• refactor move left code

  daphnegold

  committed
  884d7e3

  Copy full SHA for 884d7e3

• finished logic for tile movement to the left

  yourFriendWes

  committed
  c6dd1ec

  Copy full SHA for c6dd1ec

• Pieces move in every direction yay

  daphnegold

  committed
  ebe9d26

  Copy full SHA for ebe9d26

• things move around the board without merging weirdly, began merging things

  daphnegold

  committed
  8ca522a

  Copy full SHA for 8ca522a

• change findFreeSpace method

  yourFriendWes

  committed
  9fd8da5

  Copy full SHA for 9fd8da5

• Fixed bug with deleting the wrong tile in a merge

  daphnegold

  committed
  c9ebdf6

  Copy full SHA for c9ebdf6

Commits on Feb 4, 2016

• Merge in all directions now

  daphnegold

  committed
  14fb8f5

  Copy full SHA for 14fb8f5

• add method to indicate game is over - needs debugging

  yourFriendWes

  committed
  3c5c553

  Copy full SHA for 3c5c553

• Fixed issue (mostly) with slide animation on merge tiles

  daphnegold

  committed
  b83e880

  Copy full SHA for b83e880

• fix undefined bug triggered by gameLost

  yourFriendWes

  committed
  5e26fa9

  Copy full SHA for 5e26fa9

• fix css bug for game over, and disable keydown event when game over.

  yourFriendWes

  committed
  143f7e2

  Copy full SHA for 143f7e2

• Merge pull request #1 from wesleywillis/gameover

  Show description for 176f6ca
  wesleywillis

  committed
  176f6ca

  Copy full SHA for 176f6ca

• added score

  daphnegold

  committed
  fb321f6

  Copy full SHA for fb321f6

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  daphnegold

  committed
  86bf509

  Copy full SHA for 86bf509

• remove hideboard event on gameLost

  yourFriendWes

  committed
  5abb547

  Copy full SHA for 5abb547

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  yourFriendWes

  committed
  d717a0e

  Copy full SHA for d717a0e

• add retry button for lost game that refreshes page for new game

  yourFriendWes

  committed
  48dbe1d

  Copy full SHA for 48dbe1d

• Tiles no longer spawn if nothing moved on the board

  daphnegold

  committed
  5989fbe

  Copy full SHA for 5989fbe

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  daphnegold

  committed
  8a0c41e

  Copy full SHA for 8a0c41e

Commits on Feb 5, 2016

• moveTile method no longer takes tile as a parameter

  daphnegold

  committed
  3e285ff

  Copy full SHA for 3e285ff

• buggy code - trying to allow user to keep playing after they win

  yourFriendWes

  committed
  0b5ff97

  Copy full SHA for 0b5ff97

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  yourFriendWes

  committed
  573f0b3

  Copy full SHA for 573f0b3

• added class names for game won and matching css

  yourFriendWes

  committed
  4c37585

  Copy full SHA for 4c37585

• add lisa frank colors that are lovely

  yourFriendWes

  committed
  1ba0ced

  Copy full SHA for 1ba0ced

• CSS for Lisa Frank Theme

  daphnegold

  committed
  5dd9ad5

  Copy full SHA for 5dd9ad5

• keep playing is allowed now after winning

  yourFriendWes

  committed
  2d45e06

  Copy full SHA for 2d45e06

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  yourFriendWes

  committed
  3e8ec38

  Copy full SHA for 3e8ec38

• Done

  daphnegold

  committed
  bc9e14a

  Copy full SHA for bc9e14a

• changed background color

  daphnegold

  committed
  2b991fa

  Copy full SHA for 2b991fa

• style tweaking

  yourFriendWes

  committed
  4b9d7f2

  Copy full SHA for 4b9d7f2

• Merge branch 'hwdg/master' of github.com:wesleywillis/2048 into hwdg/master

  yourFriendWes

  committed
  04a498c

  Copy full SHA for 04a498c

• Added more CSS

  daphnegold

  committed
  8a7c031

  Copy full SHA for 8a7c031

• game lose condition possibly fixed

  daphnegold

  committed
  7b3b18d

  Copy full SHA for 7b3b18d

Commits on Feb 6, 2016

• Fixed bug with losing game conditions and deleted unused code

  daphnegold

  committed
  69fb38b

  Copy full SHA for 69fb38b

• Added images rather than links to tiles

  daphnegold

  committed
  7509db7

  Copy full SHA for 7509db7

• Fixed small image problem

  daphnegold

  committed
  d705b63

  Copy full SHA for d705b63

Commits on Feb 7, 2016

• Seriously though, fixed the losing game logic. Users have to attempt a move after losing for losing screen to appear

  daphnegold

  committed
  2c8214d

  Copy full SHA for 2c8214d

Commits on Feb 9, 2016

• Adjusted the probability of getting a 2 or a 4 on tile spawn

  daphnegold

  committed
  8766901

  Copy full SHA for 8766901