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

add jQuery to make jeopardy game interaction work! #3

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

add jQuery to make jeopardy game interaction work! #3

wants to merge 20 commits into from

Commits on Jan 31, 2014

  1. moved code from my cloned repo to my forked repo

    @oliverswitzer
    oliverswitzer committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    0aef8f3 View commit details
    Browse the repository at this point in the history

  2. remove score1, score2, score3 vars in beginning

    @oliverswitzer
    oliverswitzer committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    bd3cbb2 View commit details
    Browse the repository at this point in the history

  3. added alert to make sure user changes points before moving on to the … 

    …next question
    @oliverswitzer
    oliverswitzer committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    0c8bb6a View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2014

  1. card.rb => memory_card.rb

    @oliverswitzer
    oliverswitzer committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    65f25b4 View commit details
    Browse the repository at this point in the history

  2. merge fix in jeopardy2 and card.rb

    @oliverswitzer
    oliverswitzer committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    42a28f3 View commit details
    Browse the repository at this point in the history

  3. create basic outline of cards/colors. JS added to resize card heights… 

    … based on window size. Also create a Match class that is created every time user clicks on a card
    @oliverswitzer
    oliverswitzer committed Feb 1, 2014
    Configuration menu
    Copy the full SHA
    77a6c9f View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2014

  1. wrote code to differentiate between cases in which user trys to match… 

    … two of kind, three of a kind, four of a kind. Currently not working because havent figured out how to reset cards to backside based on number of cards left of that type
    @oliverswitzer
    oliverswitzer committed Feb 2, 2014
    Configuration menu
    Copy the full SHA
    dcf209d View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2014

  1. create four states based on the variable chances. Chances = 0, user m… 

    …ust select the type of card. Chances = 2-4, user has selected a card of type 2-4 and is now trying to match all cards of that type. Logic is exhibited in the .on click jquery function
    @oliverswitzer
    oliverswitzer committed Feb 3, 2014
    Configuration menu
    Copy the full SHA
    12cd099 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2014

  1. game now keeps track of score. Create addPoints func in JS that adds … 

    …point to score div based on which cards were matched
    @oliverswitzer
    oliverswitzer committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    5b591aa View commit details
    Browse the repository at this point in the history

  2. each card now says how many cards it should be matched with

    @oliverswitzer
    oliverswitzer committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    5a77794 View commit details
    Browse the repository at this point in the history

  3. fix bug where score was eval to NaN

    @oliverswitzer
    oliverswitzer committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    16345a1 View commit details
    Browse the repository at this point in the history

  4. bug fix so you cant click in the same card or played cards and rack u… 

    …p points
    @oliverswitzer
    oliverswitzer committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    a980c81 View commit details
    Browse the repository at this point in the history

  5. git merge changes to score tracker logic and bug fixes for double cli… 

    …cking cards
    @oliverswitzer
    oliverswitzer committed Feb 4, 2014
    Configuration menu
    Copy the full SHA
    507cdad View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2014

  1. add timer which will countdown from 30 seconds and make all the cards… 

    … disappear after the 30 seconds is up
    @oliverswitzer
    oliverswitzer committed Feb 6, 2014
    Configuration menu
    Copy the full SHA
    23fc4b9 View commit details
    Browse the repository at this point in the history

  2. when timer is up, cards removed and game over is displayed in header … 

    …with total score
    @oliverswitzer
    oliverswitzer committed Feb 6, 2014
    Configuration menu
    Copy the full SHA
    338e939 View commit details
    Browse the repository at this point in the history

  3. change timer to 30 sec

    @oliverswitzer
    oliverswitzer committed Feb 6, 2014
    Configuration menu
    Copy the full SHA
    d0ca980 View commit details
    Browse the repository at this point in the history

  4. change description of how game works

    @oliverswitzer
    oliverswitzer committed Feb 6, 2014
    Configuration menu
    Copy the full SHA
    5f93054 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2014

  1. bundle + updated readme

    @oliverswitzer
    oliverswitzer committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    f063dd0 View commit details
    Browse the repository at this point in the history

  2. remove debugger gem

    @oliverswitzer
    oliverswitzer committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    f97a9fa View commit details
    Browse the repository at this point in the history

  3. fix bug where root path was returning error because couldnt find righ… 

    …t haml file to render
    @oliverswitzer
    oliverswitzer committed Jul 22, 2014
    Configuration menu
    Copy the full SHA
    802eee7 View commit details
    Browse the repository at this point in the history