Code

Submitting 2048#22

Code

Open

emgord wants to merge 48 commits intoAda-C4:emilykelly/masterAda-C4/2048:emilykelly/masterfrom emgord:emilykelly/masteremgord/2048:emilykelly/masterCopy head branch name to clipboard

+334-37

Commits

Commits on Feb 1, 2016

• create addTile function

  kedevlin

  committed
  f7e444e

  Copy full SHA for f7e444e

Commits on Feb 2, 2016

• add randomly two spots that aren't 0 but if most spots are full it is very slow

  kedevlin

  committed
  a7fcc45

  Copy full SHA for a7fcc45

• change random row and column generator to cap at 4

  kedevlin

  committed
  09eb505

  Copy full SHA for 09eb505

• draw board works, need to eliminate zeros

  emgord

  committed
  ba9faf8

  Copy full SHA for ba9faf8

• draw board does not show zeros now

  emgord

  committed
  470867b

  Copy full SHA for 470867b

• refined add tile, missing { added

  emgord

  committed
  379a47f

  Copy full SHA for 379a47f

• added clear board function

  emgord

  committed
  0c1587a

  Copy full SHA for 0c1587a

• add new tiles with each turn, clear and print board

  emgord

  committed
  2032021

  Copy full SHA for 2032021

• add right arrow shift function

  kedevlin

  committed
  69156f5

  Copy full SHA for 69156f5

• left shift working

  emgord

  committed
  dddaaa0

  Copy full SHA for dddaaa0

• added separate functions for shifting up down left and right, looking for a way to refractor

  emgord

  committed
  a4c7bc1

  Copy full SHA for a4c7bc1

• merge function added to right shift, currently merging more than once

  emgord

  committed
  756441d

  Copy full SHA for 756441d

• update merge function to work for right arrow

  kedevlin

  committed
  a07fa17

  Copy full SHA for a07fa17

• downshift and right shift working

  emgord

  committed
  33e61ff

  Copy full SHA for 33e61ff

• update shift methods to work for up and left

  kedevlin

  committed
  c22febf

  Copy full SHA for c22febf

Commits on Feb 3, 2016

• prevent infinite loop in addTile

  kedevlin

  committed
  d5f7973

  Copy full SHA for d5f7973

• we're about to make weird changes, come back here if it fails

  kedevlin

  committed
  03d4a83

  Copy full SHA for 03d4a83

• add checkLoser function

  kedevlin

  committed
  cca2e41

  Copy full SHA for cca2e41

• update shift functions to accept a board as a parameter

  kedevlin

  committed
  69c11f3

  Copy full SHA for 69c11f3

• game win and game lose is set to true when that case is reached

  emgord

  committed
  41d2e8f

  Copy full SHA for 41d2e8f

• move lose check to be only when board is full

  kedevlin

  committed
  016554e

  Copy full SHA for 016554e

• update arrays to include 9 2s

  kedevlin

  committed
  276e12f

  Copy full SHA for 276e12f

• score working for merge left

  emgord

  committed
  60ff0ae

  Copy full SHA for 60ff0ae

• merge left adding score complete

  emgord

  committed
  30cc3e0

  Copy full SHA for 30cc3e0

• merge right downnow tracks score

  emgord

  committed
  b883caa

  Copy full SHA for b883caa

• right shift and down shift add to score

  emgord

  committed
  154cb00

  Copy full SHA for 154cb00

• add score for upshift, update moveTile to add score

  kedevlin

  committed
  2d1981e

  Copy full SHA for 2d1981e

• Merge branch 'emilykelly/master' of github.com:emgord/2048 into emilykelly/master

  kedevlin

  committed
  1d901f7

  Copy full SHA for 1d901f7

Commits on Feb 4, 2016

• about to start refractoring. come back here if things get crazy

  emgord

  committed
  6fe0a33

  Copy full SHA for 6fe0a33

• create axisBuilder method and call it from leftShifter

  kedevlin

  committed
  8791c2d

  Copy full SHA for 8791c2d

• update rightShifter to call axisBuilder

  kedevlin

  committed
  61a558d

  Copy full SHA for 61a558d

• update downShifter to call axisBuilder

  kedevlin

  committed
  a3631ac

  Copy full SHA for a3631ac

• update upShifter to call axisBuilder

  kedevlin

  committed
  e6fc2d3

  Copy full SHA for e6fc2d3

• update merge function names

  kedevlin

  committed
  f35e4d5

  Copy full SHA for f35e4d5

• master shifter method working for left shift

  emgord

  committed
  fc413f4

  Copy full SHA for fc413f4

• master shifter is working in all directions

  emgord

  committed
  ec6b1a4

  Copy full SHA for ec6b1a4

• deleted unecessary shifter functions. code is now so dry

  emgord

  committed
  a276427

  Copy full SHA for a276427

• add h1 header and score to display on page and update CSS

  kedevlin

  committed
  d0b65dd

  Copy full SHA for d0b65dd

• Update color scheme

  kedevlin

  committed
  a4878d4

  Copy full SHA for a4878d4

• color scheme on score

  emgord

  committed
  05c48cc

  Copy full SHA for 05c48cc

• floating point animantion working

  emgord

  committed
  c81fa9a

  Copy full SHA for c81fa9a

Commits on Feb 5, 2016

• changed position of point float

  emgord

  committed
  e9b2306

  Copy full SHA for e9b2306

• added new font for title

  emgord

  committed
  d9ff0ab

  Copy full SHA for d9ff0ab

• handle if game is won or lost, and new game button

  emgord

  committed
  1f9722f

  Copy full SHA for 1f9722f

• Style new game button

  kedevlin

  committed
  33ec152

  Copy full SHA for 33ec152

• added styling to win or lose

  emgord

  committed
  59c36c0

  Copy full SHA for 59c36c0

• merge conflict

  emgord

  committed
  e2150f9

  Copy full SHA for e2150f9

• bounce not working, back to previous iteration

  emgord

  committed
  97e7f91

  Copy full SHA for 97e7f91