Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ishback/talking
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ishback/talking
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: final
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 20, 2013

  1. changed camera size and frame rate, first attempt at switching modes

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    d56e4c3 View commit details
    Browse the repository at this point in the history

  2. added debug data

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    f1fcf8f View commit details
    Browse the repository at this point in the history

  3. adjusted transition from pong to cursor and progress bar

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    1c8cad2 View commit details
    Browse the repository at this point in the history

  4. updated switch from pong to cursor/progress

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    8282d19 View commit details
    Browse the repository at this point in the history

  5. catchup

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    a4217c7 View commit details
    Browse the repository at this point in the history

  6. code for exhibit

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    bbd6b90 View commit details
    Browse the repository at this point in the history

  7. code for exhibit

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    e10c7e7 View commit details
    Browse the repository at this point in the history

  8. switch between pong and progress/cursor not working...

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    280da0f View commit details
    Browse the repository at this point in the history

  9. starting cursorcheck

    ishback authored and ishback committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    7125d51 View commit details
    Browse the repository at this point in the history

  10. added check for cursor before switching to paddle or ball, added rand… 

    …om switch from paddle to cursor or ball
    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    b437a12 View commit details
    Browse the repository at this point in the history

  11. should go to cursor after loss

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    cf7b81f View commit details
    Browse the repository at this point in the history

  12. switching back from progressbar/cursor

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    bc6c3f2 View commit details
    Browse the repository at this point in the history

  13. switching back from progressbar/cursor 2

    @jmwohl
    jmwohl committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    4c8abfe View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2013

  1. catchup

    @jmwohl
    jmwohl committed Nov 21, 2013
    Configuration menu
    Copy the full SHA
    0873ae3 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2013

  1. working between pong and cursor/progress

    @jmwohl
    jmwohl committed Nov 22, 2013
    Configuration menu
    Copy the full SHA
    a7bfb41 View commit details
    Browse the repository at this point in the history

  2. merged final_b into final

    @jmwohl
    jmwohl committed Nov 22, 2013
    Configuration menu
    Copy the full SHA
    e96c1ca View commit details
    Browse the repository at this point in the history

  3. added checkOtherIsBallAtCenter method

    @jmwohl
    jmwohl committed Nov 22, 2013
    Configuration menu
    Copy the full SHA
    c19c97c View commit details
    Browse the repository at this point in the history

  4. final cleanup fo realz

    @jmwohl
    jmwohl committed Nov 22, 2013
    Configuration menu
    Copy the full SHA
    075c24e View commit details
    Browse the repository at this point in the history

  5. threshold on mouseY

    @jmwohl
    jmwohl committed Nov 22, 2013
    Configuration menu
    Copy the full SHA
    645d5a5 View commit details
    Browse the repository at this point in the history

  6. minor adjustments

    @jmwohl
    jmwohl committed Nov 22, 2013
    Configuration menu
    Copy the full SHA
    85e6bba View commit details
    Browse the repository at this point in the history
Loading