Melissa & Sophia 2048#12

Open

meliquintero wants to merge 51 commits intoAda-C5:masterfrom

meliquintero:master

Commits on Jul 7, 2016

Set up sorts;
sophiabaldonado
committed
Correctly sort tiles based on keypress;
sophiabaldonado
committed
Created helper methods to move all the way to one direction and to merge if same value. Alot of oportunities to refactor though
melissajimison
committed
solved conflicts
melissajimison
committed
fusioned sort lines with moving , BUG: when collided previos is not deleted
melissajimison
committed
keep tryin HARD
melissajimison
committed
Fix sorting methods to work with up and down keypresses;
sophiabaldonado
committed
fixed moveAllTheWay funtion
melissajimison
committed
Clean up sorting method callbacks;
sophiabaldonado
committed
fixed collideIfSameValue
melissajimison
committed
Resolve merge;
sophiabaldonado
committed
Call addScore function on tile collision;
sophiabaldonado
committed
Win function works;
sophiabaldonado
committed

Commits on Jul 8, 2016

moved button and score display
melissajimison
committed
conflicts
melissajimison
committed
Tiles pop in with an animation instead of just appearing;
sophiabaldonado
committed
Fix bug where the two new game tiles spawn in same spot;
sophiabaldonado
committed
added win pop up and aniations
melissajimison
committed
Merge branch 'setup'
sophiabaldonado
committed
Cleaned up console.logs;
sophiabaldonado
committed
made a herlper method
melissajimison
committed
Rewrote logic for spawning new tiles, does not spawn in spaces that are already occupied now;
sophiabaldonado
committed
more refactoring
melissajimison
committed
New tiles have a grow animation and setup css for combine tiles pop animation;
sophiabaldonado
committed
conflict
melissajimison
committed
Merge branch 'master' into movement
sophiabaldonado
committed
Add pop animation to combine tiles;
sophiabaldonado
committed
Fix infinite loop when board fills up lol;
sophiabaldonado
committed
created CheckNeighbours
melissajimison
committed
confluit
melissajimison
committed
logic for losing working nice
melissajimison
committed
cleaned text for new game
melissajimison
committed
rm console.logs and comments;
sophiabaldonado
committed

Commits on Jul 9, 2016

Only spawn new tiles when tiles on the board have either moved or collided;
sophiabaldonado
committed

Commits on Jan 30, 2017

try fixing js
melissajimison
committed
try fixing js
melissajimison
committed
bug fixing
melissajimison
committed
move js file to root
melissajimison
committed
moved scripts to the bottum
melissajimison
committed
change jquery version
melissajimison
committed