Code

Pull Request for 2048 Game#16

Code

Open

dezshino wants to merge 49 commits intoAda-C4:mmrdfp/masterAda-C4/2048:mmrdfp/masterfrom dezshino:mmrdfp/masterdezshino/2048:mmrdfp/masterCopy head branch name to clipboard

+9,002-19

Commits

Commits on Feb 2, 2016

• Pressing up arrow moves tile up one cell

  knaydee

  committed
  a3f0ca4

  Copy full SHA for a3f0ca4

• Tile can move down, fix so up and down movement can not be out out of the r0 to r3 range

  dezshino

  committed
  b4d671e

  Copy full SHA for b4d671e

• Tile can move left and right

  dezshino

  committed
  5bc06bd

  Copy full SHA for 5bc06bd

• put tile directions in for loops for later additions of tiles

  dezshino

  committed
  b596e99

  Copy full SHA for b596e99

• Storing tile data-row attribute in array

  knaydee

  committed
  acbbac5

  Copy full SHA for acbbac5

• Storing tile data-col attribute in array

  knaydee

  committed
  089d1b0

  Copy full SHA for 089d1b0

• Separate getting tile positions into its own function

  dezshino

  committed
  7ff78bb

  Copy full SHA for 7ff78bb

• Start with empty board array

  dezshino

  committed
  06febd0

  Copy full SHA for 06febd0

• Start planning random tile function

  dezshino

  committed
  5697970

  Copy full SHA for 5697970

• Put all 0s in the board in an array

  knaydee

  committed
  07c41f4

  Copy full SHA for 07c41f4

• addRandomTile function chooses the index of one of the empty 0 spots in the board and reassigns it to 2

  dezshino

  committed
  869ee6b

  Copy full SHA for 869ee6b

• Randomly select a 2 or 4 to assign to the empty position in the board

  dezshino

  committed
  35273e7

  Copy full SHA for 35273e7

• Update comments

  dezshino

  committed
  a399073

  Copy full SHA for a399073

• moveLeft function gets hit when called within moveTile function

  knaydee

  committed
  0c5c1f3

  Copy full SHA for 0c5c1f3

• Moves value over one if space before is 0

  dezshino

  committed
  59bd5c3

  Copy full SHA for 59bd5c3

Commits on Feb 3, 2016

• Clean up code, add comments, refactor

  dezshino

  committed
  dce726a

  Copy full SHA for dce726a

• Refactor, tile can move left

  dezshino

  committed
  f0679b6

  Copy full SHA for f0679b6

• Initialize gameboard with 2 randomly placed tiles

  dezshino

  committed
  902809e

  Copy full SHA for 902809e

• Adds a random tile after moving left

  dezshino

  committed
  17de617

  Copy full SHA for 17de617

• Add moveRight function for tiles

  dezshino

  committed
  858c96d

  Copy full SHA for 858c96d

• moveUp function works

  knaydee

  committed
  027118f

  Copy full SHA for 027118f

• addRandomTile to case 38 in moveTile

  knaydee

  committed
  dd37c09

  Copy full SHA for dd37c09

• Add addRandTile method to be after any keystroke

  dezshino

  committed
  3058004

  Copy full SHA for 3058004

• Empty displayBoard method started

  dezshino

  committed
  8e0117e

  Copy full SHA for 8e0117e

Commits on Feb 4, 2016

• Add tile collision cases to moveLeft function, works in all cases except a 242 type pattern

  dezshino

  committed
  bbe1bff

  Copy full SHA for bbe1bff

• jquery for random tiles at start of game

  knaydee

  committed
  cac4df4

  Copy full SHA for cac4df4

• jquery for moveTile function

  knaydee

  committed
  53456b1

  Copy full SHA for 53456b1

• Rebuilt moveLeft function, it now works for the 2420 pattern

  dezshino

  committed
  e12b246

  Copy full SHA for e12b246

• Merge branch 'mmrdfp/master' of github.com:desireepoland/2048 into mmrdfp/master

  dezshino

  committed
  ffc2ac4

  Copy full SHA for ffc2ac4

Commits on Feb 5, 2016

• put comments to the right

  dezshino

  committed
  039a9e5

  Copy full SHA for 039a9e5

• Refactor moveLeft function

  dezshino

  committed
  51cf1ef

  Copy full SHA for 51cf1ef

• Add moveRight function, still working on merging over two 0s, added code to visualize in console better

  dezshino

  committed
  1c7ede0

  Copy full SHA for 1c7ede0

• Bug fix, fixed the 2240 cases in moveLeft abd moveRight

  dezshino

  committed
  d4edc98

  Copy full SHA for d4edc98

• Bug fix for 2002 pattern cases. moveLeft and moveRight seem to fully work now

  dezshino

  committed
  af9e73b

  Copy full SHA for af9e73b

• Change background color

  dezshino

  committed
  44c8863

  Copy full SHA for 44c8863

• Add moveUp function

  dezshino

  committed
  7445c69

  Copy full SHA for 7445c69

• Add moveDown function

  dezshino

  committed
  2f94c75

  Copy full SHA for 2f94c75

• Set initial score to 0 and gameOver to false

  dezshino

  committed
  72ab836

  Copy full SHA for 72ab836

• Set gameOver to true if board filled, no random tiles added if gameOver

  dezshino

  committed
  db112f7

  Copy full SHA for db112f7

• Change order for initialized game so the initial 2 tiles appear

  dezshino

  committed
  475ee98

  Copy full SHA for 475ee98

• Add addToScore method, use it after every merge/collision

  dezshino

  committed
  17bc38d

  Copy full SHA for 17bc38d

• Started building endGame function

  dezshino

  committed
  61d4fd2

  Copy full SHA for 61d4fd2

• Add display board method, works but grid disappears

  dezshino

  committed
  253d28f

  Copy full SHA for 253d28f

• Fixed grid disappearance issue

  dezshino

  committed
  4535c96

  Copy full SHA for 4535c96

• change gameOver to boardFull for more clarity

  dezshino

  committed
  f798aba

  Copy full SHA for f798aba

• Game win or lose logic

  knaydee

  committed
  5d22da2

  Copy full SHA for 5d22da2

• Add sweet alerts when game is over

  dezshino

  committed
  2915cb8

  Copy full SHA for 2915cb8

• Add a title

  dezshino

  committed
  682c549

  Copy full SHA for 682c549

Commits on Feb 6, 2016

• Add status images to alerts

  dezshino

  committed
  794fc8d

  Copy full SHA for 794fc8d