Skip to content

Completed 2048 game#12

Open
jbuechs wants to merge 58 commits intoAda-C4:jr/masterfrom
rileslovesyall:jr/master
Open

Completed 2048 game#12
jbuechs wants to merge 58 commits intoAda-C4:jr/masterfrom
rileslovesyall:jr/master

Conversation

@jbuechs
Copy link

@jbuechs jbuechs commented Feb 5, 2016

Complete 2048 game:

  • keeps track of score and high score
  • game over screen with restart button
  • game win screen with restart & resume game buttons
  • sliding collision animations that (mostly) look silky smooth
  • game board is an array of Tile objects (as opposed to 2-d array)
  • can play with arrow keys or asdw

Link to our Trello board: https://trello.com/b/SWKmW9QE/2048

rileslovesyall and others added 30 commits February 1, 2016 16:20
@rileslovesyall
function working for collision logic in both positive and negative di…
c80c1b9 
…rections
@rileslovesyall
some gameOver logic that isn't quite working yet
ac5c1fb
@rileslovesyall
removed extraneous code
d3c3208
@jbuechs
add gameover function
7de23b5
@jbuechs
create addTile method for adding and displaying new tile
6118a1a
@rileslovesyall
revamped for tile objects, addTiles working but not displaying
6ed7318
@rileslovesyall
comment w next step
138b6b2
@rileslovesyall
addTile properly displaying initial tiles, like a boss
62944b6
@rileslovesyall
new Tile html includes tileId in class
71c0383
@rileslovesyall
hard coded moving tiles working
65e69ec
@jbuechs
back end tile collision function for pressing up
ff298d5
@rileslovesyall
removed extraneous files
95c3bfe
@rileslovesyall
html displaying and combining properly
77ee506
@jbuechs
bugfix remove deleted tiles from this.board
55b2205
@rileslovesyall
Big fixed: addTile won't double up on tile spaces
863cfd3
@rileslovesyall
added catch for if a tile doesn't have pair
dde79c5
@rileslovesyall
DRYed bug fix, still not working entirely
aac9788
@jbuechs
delete extraneous comments and consoles
adbaf5c
@jbuechs
bugfix moveTile switching around
144644a
@jbuechs
bugfix update data-row attr for not combined tiles in moveTile
9bcaa8c
@jbuechs
complete down arrow functionality in makeMove
df3f5fd
@rileslovesyall
left arrow works
c322cd5
@jbuechs
add right functionality to makeMove function
68613c8
@jbuechs
only add tile when move is made for up arrow
3afa0cb
@rileslovesyall
removed extraneous code
7c1fe6e
@rileslovesyall
added moveCount functionality to right, left, and down
bc4c887
@rileslovesyall
delayed addTiles for each direction
39f31c8
@jbuechs
remove extra console logs
265ec5c
@rileslovesyall
refactored moveTile for DRYer code
fd0e582
@jbuechs
add score functionality
7a85cb5
rileslovesyall and others added 28 commits February 3, 2016 14:47
@rileslovesyall
game reset functional, yussss
8293274
@jbuechs
add game won functionality
ae99748
@rileslovesyall
gameOver code in progress
1597ec8
@jbuechs
fix checkGameOver logic
df6c339
@jbuechs
add 4 value to new tiles
4e288d5
@rileslovesyall
awsd keys work to play game as well as arrows
079d383
@rileslovesyall
working on css
4059409
@rileslovesyall
Merge branch 'gameOver' into jr/master
b2e043c
@rileslovesyall
minor merge issue fixed
9be0a7c
@rileslovesyall
stupid merge error fixed
64055fe
@rileslovesyall
score looking a little better
153895a
@jbuechs
add high score
925b5bd
@rileslovesyall
New Game button visible
7b9031d
@jbuechs
fix merge conflicts
5e3990b
@jbuechs
Merge branch 'jr/master' of github.com:rileyrileyrose/2048 into jr/ma…
78b9a66 
…ster
@jbuechs
display high score at beginning of game
a089931
@rileslovesyall
some CSS is okay i guess ughh
dab597b
@rileslovesyall
front board looks pretty okay i guess
11f8e86
@jbuechs
change css to display game over message
59f0af5
@jbuechs
fix merge conflicts
75907fe
@rileslovesyall
updated css for gameover screen
628947c
@jbuechs
add game won message
d789e6f
@rileslovesyall
slightly changed header size
b8e9720
@rileslovesyall
added a delay, so two tiles combining over a long distance looks less…
cdad9e5 
… wonky
@jbuechs
format score boxes
3efc945
@jbuechs
Merge branch 'jr/master' of github.com:rileyrileyrose/2048 into jr/ma…
846ae93 
…ster
@jbuechs
change animation timings for collisions
d642eed
@jbuechs
style new game button
14f5870
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jbuechs @rileslovesyall