Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Submitting 2048 #22

Open
wants to merge 48 commits into
base: emilykelly/master
Choose a base branch
from
Open

Submitting 2048 #22

wants to merge 48 commits into from

Conversation

emgord
Copy link

@emgord emgord commented Feb 6, 2016

See our page here: http://emgord.github.io/2048/

We focused on the back end game logic at the start of this project, and struggled to figure out how to translate this to tiles sliding and bouncing on the front end.

kedevlin and others added 30 commits February 1, 2016 15:52
@kedevlin
create addTile function
f7e444e
@kedevlin
add randomly two spots that aren't 0 but if most spots are full it is…
a7fcc45 
… very slow
@kedevlin
change random row and column generator to cap at 4
09eb505
@emgord
draw board works, need to eliminate zeros
ba9faf8
@emgord
draw board does not show zeros now
470867b
@emgord
refined add tile, missing { added
379a47f
@emgord
added clear board function
0c1587a
@emgord
add new tiles with each turn, clear and print board
2032021
@kedevlin
add right arrow shift function
69156f5
@emgord
left shift working
dddaaa0
@emgord
added separate functions for shifting up down left and right, looking…
a4c7bc1 
… for a way to refractor
@emgord
merge function added to right shift, currently merging more than once
756441d
@kedevlin
update merge function to work for right arrow
a07fa17
@emgord
downshift and right shift working
33e61ff
@kedevlin
update shift methods to work for up and left
c22febf
@kedevlin
prevent infinite loop in addTile
d5f7973
@kedevlin
we're about to make weird changes, come back here if it fails
03d4a83
@kedevlin
add checkLoser function
cca2e41
@kedevlin
update shift functions to accept a board as a parameter
69c11f3
@emgord
game win and game lose is set to true when that case is reached
41d2e8f
@kedevlin
move lose check to be only when board is full
016554e
@kedevlin
update arrays to include 9 2s
276e12f
@emgord
score working for merge left
60ff0ae
@emgord
merge left adding score complete
30cc3e0
@emgord
merge right downnow tracks score
b883caa
@emgord
right shift and down shift add to score
154cb00
@kedevlin
add score for upshift, update moveTile to add score
2d1981e
@kedevlin
Merge branch 'emilykelly/master' of github.com:emgord/2048 into emily…
1d901f7 
…kelly/master
@emgord
about to start refractoring. come back here if things get crazy
6fe0a33
@kedevlin
create axisBuilder method and call it from leftShifter
8791c2d
kedevlin and others added 18 commits February 4, 2016 11:21
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
@emgord @kedevlin