Code

readme questions answered#4

Code

Open

annamm77 wants to merge 17 commits intoAda-C5:masterAda-C5/2048:masterfrom JBoshart:masterJBoshart/2048:masterCopy head branch name to clipboard

+375-18

Commits

Commits on Jul 5, 2016

• readme questions answered

  annamm77

  committed
  c4aa1c9

• Started work on move function. Pushing so we can both stare at it tonight.

  JBoshart

  committed
  d76be79

Commits on Jul 6, 2016

• move function is beginning to work, will change all tile rows in col1 to row0

  annamm77

  committed
  cfcf003

• Move tile is moving and combining, however there is currently a bug in the loop.

  JBoshart

  committed
  46dca72

• More work on the move/collide function. Currently colliding. Currently moving, but incorrectly.

  JBoshart

  committed
  73f1810

• moveTile now is working properly. Tiles move and combine. It should use a refactor.

  JBoshart

  committed
  06a1515

Commits on Jul 7, 2016

• working on down keypress

  annamm77

  committed
  f99ba9d

• reverse all column orders for down function

  annamm77

  committed
  d325485

• down function seems to merge tiles and work in general.

  annamm77

  committed
  9fa643c

• right move seems to work

  annamm77

  committed
  a1e99c8

• Move left functionality.

  JBoshart

  committed
  baa0589

• Merge branch 'right'

  annamm77

  committed
  2f4583f

• Added sort functionality to arrays so that we are compairing in the correct order.

  JBoshart

  committed
  94fbd31

Commits on Jul 8, 2016

• Created and implemented addScore function to be called after tiles are combined. Refactored as well. Added comments for clarity of partner debrief (pair is currently out of town, we intend to debri…

  Show description for 02e4198
  JBoshart

  committed
  02e4198

• addTile function is now working.

  JBoshart

  committed
  9fb21a1

• added hasLost function. If all spaces are filled, and no moves are possible it alerts the user.

  JBoshart

  committed
  8aaadea

• Added win check to addScore function.

  JBoshart

  committed
  001f962