Skip to content

Commit

Permalink
Merge branch 'main' into pr/jadeddelta/2847-1
Browse files Browse the repository at this point in the history
  • Loading branch information
jadeddelta committed Jan 11, 2025
2 parents b056932 + 8ccaa5c commit b76beac
Show file tree
Hide file tree
Showing 327 changed files with 1,779 additions and 1,412 deletions.
62 changes: 0 additions & 62 deletions .changeset/violet-tools-appear.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ You can learn more about setting up a project by following the [hello world tuto

Once you've got a project set up, the [reaction time task tutorial](https://www.jspsych.org/latest/tutorials/rt-task/) is a great next step, since it covers many core topics and features.

There are also a number of [video tutorials](https://www.jspsych.org/latest/tutorials/video-tutorials) available on the website.
There are also a number of [community tutorials](https://www.jspsych.org/latest/tutorials/community-tutorials) available on the website.

## Examples

Expand Down
12 changes: 10 additions & 2 deletions contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ The following people have contributed to the development of jsPsych by writing c
* Antonia - https://github.com/Ahoidal
* aucuparia - https://github.com/aucuparia
* Xiaolu Bai - https://github.com/lbai001
* Niranjan Baskaran - https://github.com/Bankminer78
* brchristian - https://github.com/brchristian
* bjoluc - https://github.com/bjoluc
* Christian Brickhouse - https://github.com/chrisbrickhouse
* Teon L Brooks - https://github.com/teonbrooks
* Susan Buck - https://github.com/susanBuck
* Eamon Caddigan - https://github.com/eamoncaddigan
* Jason Carpenter
* Cherrie Chang - https://github.com/cherriechang
* Steve Chao - https://github.com/stchao
* Zhanwen "Phil" Chen - https://github.com/zhanwenchen
* cthorey - https://github.com/cthorey
Expand All @@ -20,15 +24,17 @@ The following people have contributed to the development of jsPsych by writing c
* Becky Gilbert - https://github.com/becky-gilbert
* Mark Gorenstein - https://github.com/mgorenstein
* Rui Han - https://github.com/hrcn
* Eitan Hemed - https://github.com/EitanHemed
* Andy Heusser - https://github.com/andrewheusser
* Angus Hughes - https://github.com/awhug
* jadeddelta - https://github.com/jadeddelta
* jade - https://github.com/jadeddelta
* Gustavo Juantorena - https://github.com/GEJ1
* Chris Jungerius - https://github.com/cjungerius
* George Kachergis - https://github.com/kachergis
* Yul Kang - https://github.com/yulkang
* Spencer King - https://github.com/spencerking
* Jana Klaus - https://github.com/janakl4us
* Ethan Knights - https://github.com/ethanknights
* Arnold Kochari - https://github.com/akochari
* Peter Jes Kohler - https://github.com/pjkohler
* kupiqu - https://github.com/kupiqu
Expand All @@ -38,6 +44,7 @@ The following people have contributed to the development of jsPsych by writing c
* madebyafox - https://github.com/madebyafox
* Shane Martin - https://github.com/shamrt
* Vijay Marupudi - https://github.com/vijaymarupudi
* Cian Monnin - https://github.com/CMonnin
* Adrian Oesch - https://github.com/adrianoesch
* Benjamin Ooghe-Tabanou - https://github.com/boogheta
* Nikolay B Petrov - https://github.com/nikbpetrov
Expand All @@ -64,4 +71,5 @@ The following people have contributed to the development of jsPsych by writing c
* Reto Wyss - https://github.com/retowyss
* Shaobin Jiang - https://github.com/Shaobin-Jiang
* Haotian Tu - https://github.com/thtTNT
* Joshua Unrau - https://github.com/joshunrau
* Joshua Unrau - https://github.com/joshunrau
* Victor Zhang - https://github.com/vzhang03
20 changes: 10 additions & 10 deletions docs/demos/eye-tracking-with-webgazer.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-keyboard-response@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-image-keyboard-response@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-webgazer-init-camera@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-webgazer-calibrate@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-webgazer-validate@2.0.0"></script>
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-keyboard-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-image-keyboard-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-webgazer-init-camera@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-webgazer-calibrate@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-webgazer-validate@2.1.0"></script>
<script src="js/webgazer/webgazer.js"></script>
<script src="https://unpkg.com/@jspsych/extension-webgazer@1.1.0"></script>
<script src="https://unpkg.com/@jspsych/extension-webgazer@1.2.0"></script>
<link
rel="stylesheet"
href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css"
href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css"
/>
<link rel="stylesheet" href="docs-demo.css" type="text/css">
</head>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-animation-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-animation@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-animation@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
<style>
#jspsych-animation-image {
height: 80% !important;
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-button-response-demo-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-button-response@2.0.2"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-button-response-demo-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-button-response@2.0.2"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-button-response-demo-3.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<!--<script src="https://unpkg.com/@jspsych/plugin-audio-button-response@2.0.2"></script>-->
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<!--<script src="https://unpkg.com/@jspsych/plugin-audio-button-response@2.1.0"></script>-->
<script src="../../packages/plugin-audio-button-response/dist/index.browser.js"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<!--<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />-->
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<!--<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />-->
<link rel="stylesheet" href="../../packages/jspsych/css/jspsych.css" />
</head>
<body></body>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-keyboard-response-demo-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-keyboard-response@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-keyboard-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-keyboard-response-demo-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-keyboard-response@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-keyboard-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-slider-response-demo-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-slider-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-slider-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
10 changes: 5 additions & 5 deletions docs/demos/jspsych-audio-slider-response-demo-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-slider-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-audio-slider-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-preload@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
8 changes: 4 additions & 4 deletions docs/demos/jspsych-browser-check-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
8 changes: 4 additions & 4 deletions docs/demos/jspsych-browser-check-demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
8 changes: 4 additions & 4 deletions docs/demos/jspsych-browser-check-demo3.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
8 changes: 4 additions & 4 deletions docs/demos/jspsych-browser-check-demo4.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-browser-check@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
8 changes: 4 additions & 4 deletions docs/demos/jspsych-call-function-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/jspsych@8.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-call-function@2.0.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.1"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.1.0/css/jspsych.css" />
<script src="https://unpkg.com/jspsych@8.2.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-call-function@2.1.0"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.1.0"></script>
<link rel="stylesheet" href="https://unpkg.com/jspsych@8.2.0/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
Loading

0 comments on commit b76beac

Please sign in to comment.