HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-11 16:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,462 Commits 14 Branches 506 Tags 58 MiB
feature-plugintrial-raf-hide-stim
Commit Graph

2462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
d330c4ad7d separate camera init from experiment init; dot size options 2021-03-01 10:16:42 -05:00
Becky Gilbert
80f86a4673 first pass at #75 - work in progress 2021-02-26 11:18:43 -08:00
Becky Gilbert
4a59c863aa fix more webgazer links in docs #1562 2021-02-24 12:45:30 -08:00
Becky Gilbert
e8a326ee5f fix webgazer links in docs #1562 2021-02-24 12:21:27 -08:00
Becky Gilbert
7e8b83825d fix link 2021-02-21 15:05:37 -08:00
Becky Gilbert
f96fc0f114 fix links 2021-02-21 14:56:47 -08:00
Becky Gilbert
3a4ad0c3ee fix links 2021-02-21 14:51:48 -08:00
Becky Gilbert
65b6de4b82 edit code comments 2021-02-21 14:45:33 -08:00
Becky Gilbert
723952879c edit admonition 2021-02-21 14:45:19 -08:00
Becky Gilbert
0b776ab3f8 remove preloading from experiment options docs 2021-02-21 14:37:19 -08:00
Becky Gilbert
bb10f7feb0 edit text, fix note formatting 2021-02-21 14:34:51 -08:00
Becky Gilbert
25d08f4579 fix heading level 2021-02-21 14:33:58 -08:00
Becky Gilbert
5236b6470a add missing links, fix markdown errors 2021-02-21 14:25:11 -08:00
Becky Gilbert
5e83cf0871 remove duplicate plugin import 2021-02-21 14:03:05 -08:00
Becky Gilbert
19fc9e35c9 minor edit to text 2021-02-21 13:51:45 -08:00
Becky Gilbert
a713c5a1fc fix placeholder pretty name 2021-02-21 13:45:52 -08:00
Becky Gilbert
5fbc74b869
Merge pull request #672 from alexanderrobertson/patch-1 
Fix placeholder param name error in jspsych-survey-text.md
 2021-02-21 13:40:42 -08:00
Becky Gilbert
5b0dcfd801
Merge pull request #1401 from pablobernabeu/patch-4 
Update style.md
 2021-02-21 13:37:17 -08:00
Becky Gilbert
919524b5c8
Merge pull request #1555 from jspsych/feature-params-in-data 
Adds save_trial_parameters parameter - fixes #823
 2021-02-20 15:52:52 -08:00
Becky Gilbert
8a3c6fa7ea add save_trial_parameters to docs, add sections/examples for save_trial_parameters and css_classes #823 2021-02-20 15:43:25 -08:00
Becky Gilbert
4b5c90fdf1 tweak example and comments 2021-02-20 15:10:04 -08:00
Becky Gilbert
96bdaceefc add save-trial-parameters example #823 2021-02-20 14:57:29 -08:00
Becky Gilbert
101508863c remove numeric keyCodes from tests (missed one) 2021-02-20 14:25:45 -08:00
Becky Gilbert
c6e09d7578 remove numeric keyCodes from tests 2021-02-20 14:24:36 -08:00
Becky Gilbert
17090f1562 Merge branch 'master' of https://github.com/jspsych/jsPsych 2021-02-20 14:11:33 -08:00
Josh de Leeuw
f2d2ced2a6 fix test to expect non-stringified data 2021-02-20 17:10:39 -05:00
Josh de Leeuw
3713be80f4 Merge branch 'master' into feature-params-in-data 2021-02-20 17:09:33 -05:00
Josh de Leeuw
1c8774b935 fix virtual chinrest when viewing_distance_report is 'none' 2021-02-20 17:00:58 -05:00
Becky Gilbert
e0beed63aa minor edits to text 2021-02-20 12:19:32 -08:00
Becky Gilbert
da297ba0bb tweak text for clarity 2021-02-20 12:11:24 -08:00
Becky Gilbert
c803baec86 remove unused blindspot_start_prompt param, minor edits to text for clarity 2021-02-20 11:53:59 -08:00
Becky Gilbert
ece12d9c22
Merge pull request #1553 from jspsych/readme-update 
Readme update
 2021-02-19 22:08:05 -08:00
Becky Gilbert
546753e8fa fix bug that caused preload plugin to stop experiment when there are no files to load 2021-02-19 18:23:59 -08:00
Becky Gilbert
4c9bd25f5c remove unused CSS 2021-02-19 18:22:36 -08:00
Becky Gilbert
0675af8fff remove unused CSS 2021-02-19 18:22:12 -08:00
Becky Gilbert
91fc6205fc switch to css_classes parameter for stim font sizes 2021-02-19 18:21:40 -08:00
Becky Gilbert
0820abd2c0 remove unused plugin file 2021-02-19 18:20:58 -08:00
Becky Gilbert
c033d31643 add/fix preload trials in examples 2021-02-19 18:20:26 -08:00
Becky Gilbert
90468887d7 minor edits to text, fix section header 2021-02-19 14:42:53 -08:00
Becky Gilbert
af05ce78f7 add more text and links to readme, fix old GH links 2021-02-19 14:28:53 -08:00
Josh de Leeuw
2e50b1319e
Merge pull request #1442 from GEJ1/master 
virtual-chinrest plugin, with resizing ability
 2021-02-19 17:26:33 -05:00
Josh de Leeuw
93022f59fa add virtual chinrest to list of plugins 2021-02-19 17:21:38 -05:00
Becky Gilbert
223152c43a
Merge pull request #1546 from jspsych/freesort 
Merge freesort touchscreen updates from #1228
 2021-02-19 14:19:30 -08:00
Josh de Leeuw
0ed04b412a break when incompatible parameters 2021-02-19 17:17:52 -05:00
Josh de Leeuw
14a1891f13 fix distance calculation 2021-02-19 17:03:33 -05:00
Josh de Leeuw
25ee508ea1 add test stimulus at the end of the trial 2021-02-19 16:53:42 -05:00
Josh de Leeuw
89ad34c8ea fix admonition format 2021-02-19 16:47:18 -05:00
Becky Gilbert
e117dba964 remove unnecessary parentheses 2021-02-19 12:14:39 -08:00
Becky Gilbert
2f3e6170f7 add freesort column_spread_factor parameter to control compression/expansion of image columns along x-axis 2021-02-19 12:07:44 -08:00
Becky Gilbert
d8b80fbe0e update docs with column_spread_factor parameter and mobile compatibility 2021-02-19 12:06:16 -08:00