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

Melissa & Sophia 2048 #12

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Melissa & Sophia 2048 #12

wants to merge 51 commits into from

Commits on Jul 5, 2016

  1. Update README.md

    @sophiabaldonado
    sophiabaldonado authored Jul 5, 2016
    Configuration menu
    Copy the full SHA
    ecf3d35 View commit details
    Browse the repository at this point in the history

  2. Very basic movement for the first 2 tiles;

    @sophiabaldonado
    sophiabaldonado committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    c4db4c9 View commit details
    Browse the repository at this point in the history

  3. Change data values and abstract movement into seperate function to us… 

    …e for all keys;
    @sophiabaldonado
    sophiabaldonado committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    c9d0c56 View commit details
    Browse the repository at this point in the history

  4. Fix moveTile and rm semicolons;

    @sophiabaldonado
    sophiabaldonado committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    ddff064 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. the tiles in the row 1 move all the way to the end

    melissajimison committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    9f3c2eb View commit details
    Browse the repository at this point in the history

  2. tiles of a row merge and add numbers if they are the same

    melissajimison committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    081376d View commit details
    Browse the repository at this point in the history

  3. Start new game with button and resets board;

    @sophiabaldonado
    sophiabaldonado committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    ca5f9be View commit details
    Browse the repository at this point in the history

  4. Spawn new tile(s) in random spaces;

    @sophiabaldonado
    sophiabaldonado committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    ffab5e3 View commit details
    Browse the repository at this point in the history

  5. Basic scoring function;

    @sophiabaldonado
    sophiabaldonado committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    4fa5866 View commit details
    Browse the repository at this point in the history

  6. Basic lose condition;

    @sophiabaldonado
    sophiabaldonado committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    8dacbcb View commit details
    Browse the repository at this point in the history

  7. Working on tile spawn bug;

    @sophiabaldonado
    sophiabaldonado committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    8425039 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. Set up sorts;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    f27d9d2 View commit details
    Browse the repository at this point in the history

  2. Correctly sort tiles based on keypress;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    eeada2c View commit details
    Browse the repository at this point in the history

  3. Created helper methods to move all the way to one direction and to me… 

    …rge if same value. Alot of oportunities to refactor though
    melissajimison committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    e3f5874 View commit details
    Browse the repository at this point in the history

  4. solved conflicts

    melissajimison committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    4ed80f8 View commit details
    Browse the repository at this point in the history

  5. fusioned sort lines with moving , BUG: when collided previos is not d… 

    …eleted
    melissajimison committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    cdaa33e View commit details
    Browse the repository at this point in the history

  6. keep tryin HARD

    melissajimison committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    bbc344c View commit details
    Browse the repository at this point in the history

  7. Fix sorting methods to work with up and down keypresses;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    ba900f3 View commit details
    Browse the repository at this point in the history

  8. fixed moveAllTheWay funtion

    melissajimison committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    c482a31 View commit details
    Browse the repository at this point in the history

  9. Clean up sorting method callbacks;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    5eaf69e View commit details
    Browse the repository at this point in the history

  10. fixed collideIfSameValue

    melissajimison committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    5f51cca View commit details
    Browse the repository at this point in the history

  11. Resolve merge;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    6b70759 View commit details
    Browse the repository at this point in the history

  12. Call addScore function on tile collision;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    bec3e2e View commit details
    Browse the repository at this point in the history

  13. Win function works;

    @sophiabaldonado
    sophiabaldonado committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    c9ef9ed View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2016

  1. moved button and score display

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    f8db19f View commit details
    Browse the repository at this point in the history

  2. conflicts

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    ac69f38 View commit details
    Browse the repository at this point in the history

  3. Tiles pop in with an animation instead of just appearing;

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    8c27780 View commit details
    Browse the repository at this point in the history

  4. Fix bug where the two new game tiles spawn in same spot;

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    726fea2 View commit details
    Browse the repository at this point in the history

  5. added win pop up and aniations

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    10853ea View commit details
    Browse the repository at this point in the history

  6. Merge branch 'setup'

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    ba63f36 View commit details
    Browse the repository at this point in the history

  7. Cleaned up console.logs;

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    3f6c1b4 View commit details
    Browse the repository at this point in the history

  8. made a herlper method

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    06885c1 View commit details
    Browse the repository at this point in the history

  9. Rewrote logic for spawning new tiles, does not spawn in spaces that a… 

    …re already occupied now;
    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    d436bcd View commit details
    Browse the repository at this point in the history

  10. more refactoring

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    3c7a68e View commit details
    Browse the repository at this point in the history

  11. New tiles have a grow animation and setup css for combine tiles pop a… 

    …nimation;
    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    3ea0bb2 View commit details
    Browse the repository at this point in the history

  12. conflict

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    1a2e143 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into movement

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    9cdd61c View commit details
    Browse the repository at this point in the history

  14. Add pop animation to combine tiles;

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    71a2e34 View commit details
    Browse the repository at this point in the history

  15. Fix infinite loop when board fills up lol;

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    fee67e8 View commit details
    Browse the repository at this point in the history

  16. created CheckNeighbours

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    6d00edf View commit details
    Browse the repository at this point in the history

  17. confluit

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    158af6e View commit details
    Browse the repository at this point in the history

  18. logic for losing working nice

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    d99ce95 View commit details
    Browse the repository at this point in the history

  19. cleaned text for new game

    melissajimison committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    1f2f337 View commit details
    Browse the repository at this point in the history

  20. rm console.logs and comments;

    @sophiabaldonado
    sophiabaldonado committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    c641eca View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2016

  1. Only spawn new tiles when tiles on the board have either moved or col… 

    …lided;
    @sophiabaldonado
    sophiabaldonado committed Jul 9, 2016
    Configuration menu
    Copy the full SHA
    c1a1726 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. try fixing js

    melissajimison committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    cd1f8f8 View commit details
    Browse the repository at this point in the history

  2. try fixing js

    melissajimison committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    bb62590 View commit details
    Browse the repository at this point in the history

  3. bug fixing

    melissajimison committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    4f958e7 View commit details
    Browse the repository at this point in the history

  4. move js file to root

    melissajimison committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    7ef6c65 View commit details
    Browse the repository at this point in the history

  5. moved scripts to the bottum

    melissajimison committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    e6f76da View commit details
    Browse the repository at this point in the history

  6. change jquery version

    melissajimison committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    eca382e View commit details
    Browse the repository at this point in the history