14 Commits

Author	SHA1	Message	Date
Becky Gilbert	0dd813af6e	change button_pressed to response in video-button-response plugin #638	2021-02-17 16:02:34 -08:00
Becky Gilbert	94d72ddf82	merge changes from master and fix merge conflicts #670	2021-02-12 15:58:48 -08:00
Josh de Leeuw	6afe9ce086	fixes #1380	2021-01-19 16:51:43 -05:00
Josh de Leeuw	0aac702f1c	implements #670, needs further checking	2021-01-14 10:28:18 -05:00
Becky Gilbert	42962039af	JSON stringify the stimulus array in the trial data	2020-12-08 15:31:44 -08:00
Mark Gorenstein	d63012706f	video files stored in 'stimulus' var for consistency with other plugins	2020-11-25 14:47:32 -08:00
Mark Gorenstein	9af708d584	replace 'stimulus' with 'sources' in trial_data of video plugins	2020-11-05 11:54:26 -08:00
Mark Gorenstein	ec83e9cd20	replace 'stimulus' with 'sources' in registerPreload calls of video plugins	2020-11-05 10:01:11 -08:00
Becky Gilbert	dbb001c0c7	Merge branch 'master' into respond-while-playing	2020-11-04 11:27:50 -08:00
Becky Gilbert	879f6a7cb5	fix problem with non-zero video start time in FF	2020-10-31 15:37:27 -07:00
Becky Gilbert	b02e73ea21	warn about .mov files - #649	2020-10-26 16:58:45 -07:00
Becky Gilbert	6396036c9e	add response_allowed_while_playing parameter - #1137	2020-10-26 14:47:30 -07:00
Becky Gilbert	294aac623f	change button_pressed data from string to int	2020-10-20 17:49:58 -07:00
Josh de Leeuw	7e33af85cb	add video-* plugins #636	2019-07-12 11:38:21 -04:00