2423 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	a2c124531f	add page on video tutorials	2021-02-10 10:02:16 -05:00
Josh de Leeuw	418e15db3d	Merge branch 'master' of https://github.com/jspsych/jsPsych	2021-02-10 09:05:06 -05:00
Josh de Leeuw	8c4d17d675	fix a few test console.log and console.error messages	2021-02-10 09:05:02 -05:00
Becky Gilbert	68c4a466ed	Merge pull request #1497 from jspsych/feature-nested-function-parameters ... Merge feature-nested-function-parameters branch - fixes #988	2021-02-09 17:42:52 -08:00
Becky Gilbert	c51d30485a	add minor comment to example in docs	2021-02-09 17:35:52 -08:00
Becky Gilbert	92eb7d90dc	add note about protected functions	2021-02-09 17:30:31 -08:00
Becky Gilbert	45f5331156	add docs for nested function parameters	2021-02-09 17:17:33 -08:00
Becky Gilbert	d465c20b05	add tests	2021-02-09 17:17:08 -08:00
Josh de Leeuw	a1fe96d9eb	tutorial edits	2021-02-09 19:35:53 -05:00
Becky Gilbert	7e288d4481	change keyCodes to keys in calls to utils.pressKey()	2021-02-09 15:29:02 -08:00
Becky Gilbert	d01881c692	merge changes from master and fix merge conflict	2021-02-09 15:23:40 -08:00
Becky Gilbert	e81b2b1d37	Merge pull request #1496 from jspsych/feature-preload-plugin ... Merge preload plugin branch into master	2021-02-09 14:27:56 -08:00
Becky Gilbert	51ee542e2e	update with changes to master and fix merge conflict	2021-02-09 14:22:59 -08:00
Becky Gilbert	a106dbbd13	fix tests for addNodeToEndOfTimeline (no longer accepts callback)	2021-02-09 14:18:31 -08:00
Becky Gilbert	2e6378d7e2	change keyCodes to keys passed to utils.pressKey()	2021-02-09 14:12:28 -08:00
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