Code

2048 Game#19

Code

Open

annaleeherrera wants to merge 71 commits intoAda-C4:adah/masterAda-C4/2048:adah/masterfrom annaleeherrera:adah/masterannaleeherrera/2048:adah/masterCopy head branch name to clipboard

+201-14

Commits

Commits on Feb 2, 2016

• Able to move tiles all to one side

  Dreedle

  committed
  daa4570

  Copy full SHA for daa4570

• Working on conditional to move tiles

  Dreedle

  committed
  914a62b

  Copy full SHA for 914a62b

• Playing with identifying tiles by column

  Dreedle

  committed
  2ebd5ad

  Copy full SHA for 2ebd5ad

• Trying out a Tile function to make an array of tiles on keydown

  Dreedle

  committed
  a0a81a2

  Copy full SHA for a0a81a2

• Able to move tiles using Tile objects

  Dreedle

  committed
  f3a9399

  Copy full SHA for f3a9399

• Adding four directions for moving

  Dreedle

  committed
  2df69d2

  Copy full SHA for 2df69d2

• Adding row and col to numbers in the Tile function

  Dreedle

  committed
  ad169a2

  Copy full SHA for ad169a2

• Making function for Board

  Dreedle

  committed
  6f55cb6

  Copy full SHA for 6f55cb6

• Working on method to update the dom from the board

  Dreedle

  committed
  a328b3b

  Copy full SHA for a328b3b

• Fixing merge conflict

  Dreedle

  committed
  e5f4216

  Copy full SHA for e5f4216

• Fixing merge

  Dreedle

  committed
  3bd076f

  Copy full SHA for 3bd076f

• Deleting extra code

  Dreedle

  committed
  1bb7ba8

  Copy full SHA for 1bb7ba8

• Able to amend gameboard div from board

  Dreedle

  committed
  4b4bcca

  Copy full SHA for 4b4bcca

• Method to place tile on a board

  Dreedle

  committed
  50e945e

  Copy full SHA for 50e945e

• Debugging

  Dreedle

  committed
  bfc204c

  Copy full SHA for bfc204c

• Took out illegal breaks

  Dreedle

  committed
  ead0238

  Copy full SHA for ead0238

• fix errors from atom

  annaleeherrera

  committed
  3e8fb2a

  Copy full SHA for 3e8fb2a

• Debug

  Dreedle

  committed
  c729845

  Copy full SHA for c729845

• Better semicolons

  Dreedle

  committed
  9c7d4b9

  Copy full SHA for 9c7d4b9

• Working out infinite loop

  Dreedle

  committed
  1af4fc9

  Copy full SHA for 1af4fc9

Commits on Feb 3, 2016

• Debug

  Dreedle

  committed
  47ef9eb

  Copy full SHA for 47ef9eb

• Fixed infinite loop

  Dreedle

  committed
  c125531

  Copy full SHA for c125531

• Able to add a random value but only in one position

  Dreedle

  committed
  5729121

  Copy full SHA for 5729121

• Able to create a tile that is the right color

  Dreedle

  committed
  d84ee73

  Copy full SHA for d84ee73

• Debugging tile creation

  Dreedle

  committed
  c821630

  Copy full SHA for c821630

• Able to add random numbers only to top row

  Dreedle

  committed
  c62e096

  Copy full SHA for c62e096

• Able to add some random nnumbers but not in all positions

  Dreedle

  committed
  40080e9

  Copy full SHA for 40080e9

• Loop problem solved- now able to add random tiles until they fill the board

  Dreedle

  committed
  d18fed8

  Copy full SHA for d18fed8

• 2 new tiles on new game

  annaleeherrera

  committed
  5abe053

  Copy full SHA for 5abe053

• Working on movetiles method

  Dreedle

  committed
  d381f4c

  Copy full SHA for d381f4c

• Debugging movetiles

  Dreedle

  committed
  5bbb300

  Copy full SHA for 5bbb300

• Fixing bug in nextSpot

  Dreedle

  committed
  190de46

  Copy full SHA for 190de46

• Changing response from nextspot method

  Dreedle

  committed
  0bf5f91

  Copy full SHA for 0bf5f91

Commits on Feb 4, 2016

• making an object as a response to nextspot

  Dreedle

  committed
  030eb2a

  Copy full SHA for 030eb2a

• Refactoring nextSpot

  Dreedle

  committed
  e05f613

  Copy full SHA for e05f613

• Buggy but working on looking at next tile

  Dreedle

  committed
  8afe4ca

  Copy full SHA for 8afe4ca

• Building movetile

  Dreedle

  committed
  4bec2ee

  Copy full SHA for 4bec2ee

• Debuggin move tile

  Dreedle

  committed
  a3ca1e1

  Copy full SHA for a3ca1e1

• Merge branch 'adah/master' of github.com:annaleeherrera/2048 into adah/master

  Dreedle

  committed
  1baae84

  Copy full SHA for 1baae84

• Values are able to merge...incorrectly

  Dreedle

  committed
  6e66848

  Copy full SHA for 6e66848

• Passing in value to lookatspot

  Dreedle

  committed
  ebeccf4

  Copy full SHA for ebeccf4

• Getting better behavior

  Dreedle

  committed
  9b88d3a

  Copy full SHA for 9b88d3a

• Able to fill board up again, at least

  Dreedle

  committed
  1c9a7b8

  Copy full SHA for 1c9a7b8

• Able to combine values and not be in an infinite loop

  Dreedle

  committed
  60ea8fd

  Copy full SHA for 60ea8fd

• Able to add and take away numbers, seemingly randomly

  Dreedle

  committed
  10c8bb9

  Copy full SHA for 10c8bb9

• Working on movetile

  Dreedle

  committed
  bedd245

  Copy full SHA for bedd245

• Left is sort of working. Other directions arent

  Dreedle

  committed
  06b22ce

  Copy full SHA for 06b22ce

• To the left, tiles move farther but not all the way to the end

  Dreedle

  committed
  a8184f8

  Copy full SHA for a8184f8

Commits on Feb 5, 2016

• Removing unnecessary line

  Dreedle

  committed
  c0f048f

  Copy full SHA for c0f048f

• Game works to the left and upward, without tile swooshing

  Dreedle

  committed
  62bf9fb

  Copy full SHA for 62bf9fb

• Game is playable but doesn't do nice animation

  Dreedle

  committed
  84393ba

  Copy full SHA for 84393ba

• Removing extra line in keydown event

  Dreedle

  committed
  6983624

  Copy full SHA for 6983624

• Fooling around

  Dreedle

  committed
  9e59694

  Copy full SHA for 9e59694

• foolin

  Dreedle

  committed
  0ca6901

  Copy full SHA for 0ca6901

• Working on shifting tiles instead of adding/removing divs

  Dreedle

  committed
  72355b7

  Copy full SHA for 72355b7

• Working on making tiles slide

  Dreedle

  committed
  fd47ebd

  Copy full SHA for fd47ebd

Commits on Feb 6, 2016

• Adding ids to tiles

  Dreedle

  committed
  20569da

  Copy full SHA for 20569da

• Working on shiftTile method, but tiles are movign diagonally

  Dreedle

  committed
  6b4dc7a

  Copy full SHA for 6b4dc7a

Commits on Feb 7, 2016

• Tiles all move to corner

  Dreedle

  committed
  4faef05

  Copy full SHA for 4faef05

• Tile movement works, but iterating is not working (only one movement at a time)

  Dreedle

  committed
  6d7e111

  Copy full SHA for 6d7e111

• Updating board array with each movement. Isn't working

  Dreedle

  committed
  0200d30

  Copy full SHA for 0200d30

• Solved problem of innerhtml not changing

  Dreedle

  committed
  8875b51

  Copy full SHA for 8875b51

• Improved logic, but game buggy still

  Dreedle

  committed
  3840e20

  Copy full SHA for 3840e20

• Tiles look like they are running each other over (out of sequence)

  Dreedle

  committed
  88aac10

  Copy full SHA for 88aac10

• New tiles fadein

  Dreedle

  committed
  e0c6ca3

  Copy full SHA for e0c6ca3

• Modifying direction of iteration, in progress

  Dreedle

  committed
  180a639

  Copy full SHA for 180a639

• Refactored to make it so looping occurs foward or backward. buggy

  Dreedle

  committed
  c485556

  Copy full SHA for c485556

• Moving next.status logic to just one function

  Dreedle

  committed
  a08e463

  Copy full SHA for a08e463

• Made it so old divs get deleted when tiles shift

  Dreedle

  committed
  3cd0f67

  Copy full SHA for 3cd0f67

Commits on Feb 8, 2016

• Last commit

  Dreedle

  committed
  4d9a5b6

  Copy full SHA for 4d9a5b6

• Removing superfluous comment

  Dreedle

  committed
  6f9d917

  Copy full SHA for 6f9d917