HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,458 Commits 14 Branches 506 Tags 58 MiB
feature-settimeout-to-raf
Commit Graph

2458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becky Gilbert
fe0b40bfd5 fix timeline callback event tests and add new tests #585 2021-02-09 13:59:28 -08:00
Becky Gilbert
daa37b7cfd correction to docs on on_timeline_start 2021-02-09 13:58:17 -08:00
Becky Gilbert
10aa0f64e2 add docs for on_timeline_start and on_timeline_finish 2021-02-09 12:47:16 -08:00
Josh de Leeuw
4899abd18b
Merge pull request #1493 from jspsych/feature-all-timeline-vars 
Add allTimelineVariables() feature
 2021-02-09 14:31:44 -05:00
Josh de Leeuw
7196bb316f fix merge mistake 2021-02-09 14:27:52 -05:00
Josh de Leeuw
0272250bb4
Merge pull request #1494 from jspsych/feature-timeline-events 
merge timeline events into all timeline vars branch
 2021-02-09 14:26:36 -05:00
Becky Gilbert
c8298e226f merge master into preload plugin branch and fix merge conflict 2021-02-09 10:57:46 -08:00
Josh de Leeuw
89a99da36f
Merge branch 'feature-all-timeline-vars' into feature-timeline-events 2021-02-09 13:32:18 -05:00
Josh de Leeuw
c167972e05 add docs for .allTimelineVariables() 2021-02-09 13:23:58 -05:00
Josh de Leeuw
e0c0cc1d08
Merge pull request #1492 from jspsych/master 
merge master updates into feature-all-timeline-vars-branch
 2021-02-09 13:16:58 -05:00
Josh de Leeuw
bb0b84d86a add samples_per_sec to validation plugin 2021-02-08 23:00:19 -05:00
Josh de Leeuw
ac5755e1dd add note about computational resources 2021-02-08 22:36:31 -05:00
Josh de Leeuw
9bfeaff84a
Merge pull request #1413 from pablobernabeu/patch-5 
Fixed typo in media-preloading.md
 2021-02-08 22:16:12 -05:00
Josh de Leeuw
b21f7c8740
Merge pull request #1465 from jspsych/feature-key-code-update 
Merge feature-key-code-update branch
 2021-02-08 22:05:58 -05:00
Josh de Leeuw
b10c69eb21
Merge branch 'master' into feature-key-code-update 2021-02-08 22:00:09 -05:00
Becky Gilbert
89833f2048 update case-sensitive example 2021-02-08 17:20:24 -08:00
Becky Gilbert
ce2e4ddc74 change key prompt to lowercase 2021-02-08 17:04:24 -08:00
Becky Gilbert
67a262eb55 change key response to lowercase when case_sensitive is false 2021-02-08 17:03:53 -08:00
Josh de Leeuw
caac84601a fix fail -> catch 2021-02-07 17:11:51 -05:00
Becky Gilbert
5fc9cfb91f add more info about webgazer functions and their use 2021-02-05 18:13:14 -08:00
Becky Gilbert
16b5c2cb6a add comments to extension template 2021-02-05 18:00:48 -08:00
Becky Gilbert
0f5a17749b add extensions option to jsPsych.init parameters in core docs 2021-02-05 17:54:04 -08:00
Becky Gilbert
e78c4573eb add extensions to experiment options docs 2021-02-05 17:47:07 -08:00
Becky Gilbert
e46f33a2b1 added basic complete code/data example to docs (data needs fixing) 2021-02-05 17:36:16 -08:00
Becky Gilbert
3e919acfc5 add webgazer example with image (for testing) 2021-02-05 16:38:08 -08:00
Josh de Leeuw
af95ebe7c1 create targets parameter for webgazer ext 2021-02-05 14:16:03 -05:00
Josh de Leeuw
18014cbe5f allow parameters for extensions in a trial 2021-02-05 14:15:51 -05:00
Josh de Leeuw
c6fe79549c update demo experiment with data saving 2021-02-05 13:31:26 -05:00
Josh de Leeuw
e4b601f39b adjust default instructions 2021-02-05 13:31:16 -05:00
Josh de Leeuw
7c7fda1959 add round_predictions parameter 2021-02-05 13:31:04 -05:00
Josh de Leeuw
fbd9e4ca85 remove media folder from tests since functions are now mocked 2021-02-05 10:57:50 -05:00
Josh de Leeuw
bb07c913c7 change tests to use mock functions 2021-02-05 10:55:52 -05:00
Josh de Leeuw
0e709cf8e0 remove console.log 2021-02-05 10:55:36 -05:00
Josh de Leeuw
bb26dc461c don't call preload methods if no files to load 2021-02-05 10:36:11 -05:00
Josh de Leeuw
7dbcfea7da add a test to ensure loop function runs only once with TVs #585 2021-02-04 21:53:55 -05:00
Josh de Leeuw
8dd61e6bed conditional_function only runs with first set of variables #585 2021-02-04 21:50:23 -05:00
Josh de Leeuw
9da9f4eaf0 the broken test should resolve when we merge in changes from feature-timeline-events branch 2021-02-04 21:41:49 -05:00
Becky Gilbert
7618bc3cbb add case_sensitive_responses parameter to docs #396 2021-02-04 17:43:00 -08:00
Becky Gilbert
711504887f add case_sensitive_responses option to jsPsych.init, add tests and example #396 2021-02-04 17:31:51 -08:00
Josh de Leeuw
d584faa71d add new plugins to mkdocs.yml 2021-02-04 17:53:12 -05:00
Josh de Leeuw
d8ee2d2b02 update example for webgazer, fix bug in validate 2021-02-04 17:41:45 -05:00
Josh de Leeuw
00cca0e52b move instructions out of validation plugin 2021-02-04 17:34:38 -05:00
Josh de Leeuw
a11550c2f6 fix case where no extensions are loaded 2021-02-04 17:25:28 -05:00
Josh de Leeuw
00d650a7de moving some functionality to init-camera plugin, adding docs 2021-02-04 17:19:34 -05:00
Josh de Leeuw
9e0cc86796 add plugin docs for webgazer 2021-02-04 16:36:44 -05:00
Josh de Leeuw
81977c15da add extension docs 2021-02-04 15:06:17 -05:00
Josh de Leeuw
21e7fa34c1 add version info to jspsych.js #1472 2021-02-04 13:49:44 -05:00
Josh de Leeuw
cac696c2a2 start docs for extensions 2021-02-04 13:44:27 -05:00
Josh de Leeuw
d63b77943e change data name 2021-02-04 10:13:19 -05:00
Becky Gilbert
278668d048 change keyCode to key in keyboard event passed to dispatchEvent 2021-02-03 11:19:46 -08:00