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.

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

merging jspsych's webgazer with official webgazer #1

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

Commits on Mar 5, 2021

  1. Merge pull request jspsych#2 from brownhci/master

    sync with upstream
    jodeleeuw authored Mar 5, 2021
    Configuration menu
    Copy the full SHA
    4042de6 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Configuration menu
    Copy the full SHA
    158e34a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3636f06 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Configuration menu
    Copy the full SHA
    a7c7af0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    35301e5 View commit details
    Browse the repository at this point in the history
  3. Merge pull request jspsych#3 from jspsych/loop-timing

    allow getPrediction to work when paused
    jodeleeuw authored Apr 9, 2021
    Configuration menu
    Copy the full SHA
    125013b View commit details
    Browse the repository at this point in the history