Skip to content

Melissa & Sophia 2048#12

Open
meliquintero wants to merge 51 commits intoAda-C5:masterfrom
meliquintero:master
Open

Melissa & Sophia 2048#12
meliquintero wants to merge 51 commits intoAda-C5:masterfrom
meliquintero:master

Conversation

@meliquintero
Copy link
Copy Markdown

@meliquintero meliquintero commented Jul 9, 2016 •
edited
Loading

Sophia Baldonado

Melissa Jimison

Trello Board

sophiabaldonado and others added 30 commits July 5, 2016 13:43
@sophiabaldonado
Update README.md
ecf3d35
@sophiabaldonado
Very basic movement for the first 2 tiles;
c4db4c9
@sophiabaldonado
Change data values and abstract movement into seperate function to us…
c9d0c56 
…e for all keys;
@sophiabaldonado
Fix moveTile and rm semicolons;
ddff064
the tiles in the row 1 move all the way to the end
9f3c2eb
tiles of a row merge and add numbers if they are the same
081376d
@sophiabaldonado
Start new game with button and resets board;
ca5f9be
@sophiabaldonado
Spawn new tile(s) in random spaces;
ffab5e3
@sophiabaldonado
Basic scoring function;
4fa5866
@sophiabaldonado
Basic lose condition;
8dacbcb
@sophiabaldonado
Working on tile spawn bug;
8425039
@sophiabaldonado
Set up sorts;
f27d9d2
@sophiabaldonado
Correctly sort tiles based on keypress;
eeada2c
Created helper methods to move all the way to one direction and to me…
e3f5874 
…rge if same value. Alot of oportunities to refactor though
solved conflicts
4ed80f8
fusioned sort lines with moving , BUG: when collided previos is not d…
cdaa33e 
…eleted
keep tryin HARD
bbc344c
@sophiabaldonado
Fix sorting methods to work with up and down keypresses;
ba900f3
fixed moveAllTheWay funtion
c482a31
@sophiabaldonado
Clean up sorting method callbacks;
5eaf69e
fixed collideIfSameValue
5f51cca
@sophiabaldonado
Resolve merge;
6b70759
@sophiabaldonado
Call addScore function on tile collision;
bec3e2e
@sophiabaldonado
Win function works;
c9ef9ed
moved button and score display
f8db19f
conflicts
ac69f38
@sophiabaldonado
Tiles pop in with an animation instead of just appearing;
8c27780
@sophiabaldonado
Fix bug where the two new game tiles spawn in same spot;
726fea2
added win pop up and aniations
10853ea
@sophiabaldonado
Merge branch 'setup'
ba63f36
@meliquintero meliquintero changed the title 2048 Melissa & Sophia 2048 Jul 9, 2016
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

@meliquintero @sophiabaldonado