Becky Gilbert
|
c8298e226f
|
merge master into preload plugin branch and fix merge conflict
|
2021-02-09 10:57:46 -08:00 |
|
Josh de Leeuw
|
b10c69eb21
|
Merge branch 'master' into feature-key-code-update
|
2021-02-08 22:00:09 -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 |
|
Becky Gilbert
|
bc585ee64a
|
fix minor errors in plugin/parameter descriptions
|
2021-02-02 15:02:26 -08:00 |
|
Becky Gilbert
|
41bc9d725e
|
switch to only using strings for keyboard keys, change keyboard key parameter types/defaults, remove compareKeys fn #396
|
2021-02-02 15:01:38 -08:00 |
|
Becky Gilbert
|
9ea3c6517a
|
change KEYCODE parameter type to KEY #396
|
2021-02-02 12:30:15 -08:00 |
|
Becky Gilbert
|
fd097e996d
|
switch from keyCodes to key strings, fix param description errors and typos
|
2021-02-01 17:48:52 -08:00 |
|
Becky Gilbert
|
56abce0a2f
|
revert webgazer commits #396
|
2021-01-29 17:42:16 -08:00 |
|
Becky Gilbert
|
87cde65fce
|
add cancelPreloads calls, fix logic, load all media types regardless of loading failures #1351
|
2021-01-28 16:10:39 -08:00 |
|
Becky Gilbert
|
8279cba460
|
switch to file load/error callbacks, improve logic, add detailed errors, add success/error callback params, add param descriptions #1351
|
2021-01-27 16:33:39 -08:00 |
|
Becky Gilbert
|
661df3e078
|
add success and timeout flags to data, record failed files, clear display, separate functions for timeout and success #1351
|
2021-01-19 16:57:34 -08:00 |
|
Josh de Leeuw
|
6afe9ce086
|
fixes #1380
|
2021-01-19 16:51:43 -05:00 |
|
Josh de Leeuw
|
74fae253cc
|
update locations in docs where keyCode is used
|
2021-01-15 21:53:38 -05:00 |
|
Josh de Leeuw
|
6a2dc21bc8
|
replaces keyCode with .key, gets all tests working
|
2021-01-15 17:55:12 -05:00 |
|
Josh de Leeuw
|
b78efaac73
|
adding a validation accuracy metric
|
2021-01-14 15:33:41 -05:00 |
|
Josh de Leeuw
|
42f54f0fb3
|
tweaking calibration and validation scripts
|
2021-01-13 09:47:11 -05:00 |
|
Josh de Leeuw
|
6006293416
|
fixes circle drawing problem
|
2021-01-13 09:23:05 -05:00 |
|
Josh de Leeuw
|
b146037af3
|
calibration + validation sort of working...
|
2021-01-12 17:52:41 -05:00 |
|
Josh de Leeuw
|
cf9fd335bb
|
working on plugin modes
|
2021-01-12 09:27:04 -05:00 |
|
Becky Gilbert
|
4610a7ac83
|
add img onload fn to draw image when loaded - fixes #1305
|
2021-01-09 11:18:57 -08:00 |
|
Josh de Leeuw
|
57c04dac10
|
improvements to calibration using MutationObserver
|
2021-01-08 14:22:21 -05:00 |
|
Josh de Leeuw
|
d5d462d4c8
|
switch auto_preload to bool, add trials parameter, implement working tests
|
2021-01-07 22:15:38 -05:00 |
|
Josh de Leeuw
|
e892d58e2e
|
remove preloading from jsPsych.init
|
2021-01-07 15:54:05 -05:00 |
|
Josh de Leeuw
|
ba1e7a72c9
|
core of preload plugin
|
2021-01-07 10:05:47 -05:00 |
|
Josh de Leeuw
|
d4830275d5
|
working on shifting preload stuff
|
2021-01-07 09:19:16 -05:00 |
|
Josh de Leeuw
|
3a08b15fc9
|
start implementing plugin, didn't get far yet
|
2021-01-06 18:54:28 -05:00 |
|
Josh de Leeuw
|
fdb0209bb0
|
working on webgazer stuff
|
2021-01-06 18:41:37 -05:00 |
|
Josh de Leeuw
|
562e993f9c
|
adding a calibration routine, but it's not great
|
2021-01-02 17:20:21 -05:00 |
|
Becky Gilbert
|
42962039af
|
JSON stringify the stimulus array in the trial data
|
2020-12-08 15:31:44 -08:00 |
|
Becky Gilbert
|
c70c36cbbe
|
add missing var to startTime definition
|
2020-12-07 16:22:23 -08:00 |
|
Becky Gilbert
|
074aca788c
|
fix start_time/startTime typo, use WebAudio clock for RT
|
2020-12-07 16:19:34 -08:00 |
|
Becky Gilbert
|
df8c28f397
|
Merge pull request #1171 from mgorenstein/fix-video-plugin-preload
Fix stimulus parameter naming in video response plugins
|
2020-12-01 16:48:37 -08:00 |
|
Mark Gorenstein
|
d63012706f
|
video files stored in 'stimulus' var for consistency with other plugins
|
2020-11-25 14:47:32 -08:00 |
|
Becky Gilbert
|
32cdeae645
|
Merge branch 'master' into fix-consecutive-images
|
2020-11-25 10:50:26 -08:00 |
|
Becky Gilbert
|
bbef9ef9d2
|
Merge pull request #1203 from jspsych/freesort
Updates to free-sort plugin
|
2020-11-25 09:48:05 -08:00 |
|
Becky Gilbert
|
6471e4bb4f
|
make button style consistent with other plugins, add space between button and sort area
|
2020-11-25 09:46:26 -08:00 |
|
Becky Gilbert
|
8c81c9f420
|
Merge branch 'master' into slider-positions
|
2020-11-25 09:26:00 -08:00 |
|
Becky Gilbert
|
6673c9e903
|
add IDs to label/alternative text
|
2020-11-20 15:52:47 -08:00 |
|
Becky Gilbert
|
1aaee22324
|
Merge pull request #1136 from awhug/master
Add maxdiff plugin
|
2020-11-20 15:09:39 -08:00 |
|
Angus Hughes
|
bcb3b3653c
|
Fix error when required is false to return null response
|
2020-11-20 11:19:53 +08:00 |
|
Becky Gilbert
|
dc00efd0ea
|
add counter text and stim_starts_inside params, fix missed hardcoded colors
|
2020-11-19 18:24:44 -08:00 |
|
Becky Gilbert
|
4c0dab0122
|
add new border/background color parameters
|
2020-11-19 16:07:35 -08:00 |
|
Becky Gilbert
|
175eaab10d
|
Merge pull request #1018 from kohler-visual-neuroscience-lab/master
updates to free-sort plugin, new functionality
|
2020-11-18 17:46:02 -08:00 |
|
Peter J. Kohler
|
a1ca6a8406
|
fixed above/below
|
2020-11-18 19:41:43 -05:00 |
|
Becky Gilbert
|
3424f386ff
|
fix slider label positioning with custom track/thumb CSS & calc - fixes #695
|
2020-11-14 16:57:01 -08:00 |
|
Becky Gilbert
|
b2c845fa19
|
remove div container for prompt
|
2020-11-11 11:05:40 -08:00 |
|
Becky Gilbert
|
5f18091058
|
remove div containers for prompts
|
2020-11-11 10:53:03 -08:00 |
|
Becky Gilbert
|
8104d356c5
|
minor changes for clarity and consistency with other v6.2 plugins
|
2020-11-10 14:01:21 -08:00 |
|
Becky Gilbert
|
ece6e3b57e
|
Merge pull request #700 from cjungerius/feature/canvas
Add canvas keyboard/button/slider plugins
|
2020-11-09 15:38:50 -08:00 |
|