Code

Arh/master - 2048 Project#15

Code

Open

hougland wants to merge 50 commits intoAda-C4:arh/masterAda-C4/2048:arh/masterfrom lacuchilla:arh/masterlacuchilla/2048:arh/masterCopy head branch name to clipboard

+398-15

Commits

Commits on Feb 1, 2016

• Add arrow key functionality to move a single tile. Placement is slightly off.

  lacuchilla

  committed
  cbbe623

Commits on Feb 2, 2016

• add loop to start being able to increment how far to one direction tiles should move

  hougland

  committed
  73266b8

• Add ability to move tile one place and have it register on the back end array

  lacuchilla

  committed
  6c8c5c4

• remove debugging statements

  hougland

  committed
  4c06a24

• add backend logic for square moving left

  hougland

  committed
  c7d07eb

• Begin work on getting the right arrow key to function, not working yet.

  lacuchilla

  committed
  8891371

• remove front end stuff

  hougland

  committed
  fad7cbb

• Add up key back end functionality

  lacuchilla

  committed
  f010384

• get down button working

  hougland

  committed
  8113567

• edit comments in down functionality

  hougland

  committed
  1eef911

• Fixed left key functionality. Now works.

  lacuchilla

  committed
  d27f162

Commits on Feb 3, 2016

• begin work on tile collision function

  lacuchilla

  committed
  64d0b3e

• in processes of switching down foreach loop into for loop

  hougland

  committed
  9e62490

• fix but so down arrow correctly moves tiles down now

  hougland

  committed
  178b3f5

• fix tiles moving up so they do it correctly now

  hougland

  committed
  2509554

• Add thoughts file to project to record thought processes and organize ideas.

  lacuchilla

  committed
  34efbcf

• fix tile movement going up againnnnn:

  hougland

  committed
  6290850

• move tile movement functionality into its own methods

  hougland

  committed
  5dda373

• lol fixing logic againnnn for getting tiles to slide right when you hit the right button

  hougland

  committed
  85eee4e

• debugg downTileCollision function to work

  hougland

  committed
  75381c8

• get left tile collision function working:

  hougland

  committed
  4c5a908

• begin working on right keypress tile collision function

  hougland

  committed
  73b3649

Commits on Feb 4, 2016

• Got function to work to pick a random number within a range. Added file for me to start creating js functions

  lacuchilla

  committed
  cc1c057

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  lacuchilla

  committed
  7d7b345

• tiles will collide when you press right

  hougland

  committed
  8850554

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  hougland

  committed
  e54f609

• is game lost function works to check if gamebaord is full, not yet if there are still tiles next to each other that can be combined

  hougland

  committed
  ccb7fe2

• Add code to determine indices of empty spaces

  lacuchilla

  committed
  ee7b56e

• Add more logic to pull a two or a 4 and assign it to an empty value in the game board. Not working yet.

  lacuchilla

  committed
  40207d2

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  lacuchilla

  committed
  50ce935

• add logic to is game lost function to check if any tiles are next to tiles they could be combined with

  hougland

  committed
  f33e909

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  hougland

  committed
  4c5a2bf

• Add functions to add tiles and check empty spots on tiles. Functions are working

  lacuchilla

  committed
  3285c43

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  lacuchilla

  committed
  88c8f14

• Integrated working add tile and get blank spaces functions into main file. Yay

  lacuchilla

  committed
  de04752

• Add function to check if a 2048 tile is present. It wooooooorks.

  lacuchilla

  committed
  0395e33

• begin adding scoring functionality

  hougland

  committed
  60f0c99

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  hougland

  committed
  eb32920

• Ch ch ch ch chaaaaaanges

  lacuchilla

  committed
  6e487f1

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  lacuchilla

  committed
  d3f70ab

• merge issue

  hougland

  committed
  abb9297

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  hougland

  committed
  2953e0d

• add console.log score to all 4 directional keys

  lacuchilla

  committed
  e6c9237

Commits on Feb 5, 2016

• minor changes for debugging

  hougland

  committed
  7e1b262

• Add back if that mysteriously went missing.

  lacuchilla

  committed
  665374a

• Merge branch 'arh/master' of github.com:lacuchilla/2048 into arh/master

  hougland

  committed
  d4f5be7

• debugging

  hougland

  committed
  5291d9a

• Debugging tile movement and tile collision functions. Still buggy.

  lacuchilla

  committed
  c7c7788

• add basic front end

  hougland

  committed
  c161005

• reset initialize info to place 2 random tiles like a reallll game

  hougland

  committed
  de5ccb8