27 Commits

Author	SHA1	Message	Date
Becky Gilbert	17090f1562	Merge branch 'master' of https://github.com/jspsych/jsPsych	2021-02-20 14:11:33 -08:00
Josh de Leeuw	1c8774b935	fix virtual chinrest when viewing_distance_report is 'none'	2021-02-20 17:00:58 -05: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
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	3df3d64712	fix representation of key	2021-02-19 12:21:49 -05:00
Josh de Leeuw	dc3a8e4460	fix extra ' +	2021-02-18 10:40:45 -05:00
Josh de Leeuw	2da7e6ccaa	more refactoring	2021-02-18 10:39:08 -05:00
Josh de Leeuw	6b973402fd	remove more unused variables	2021-02-18 09:45:05 -05:00
Josh de Leeuw	ba1c830aa4	remove unused variable	2021-02-18 09:44:44 -05:00
Josh de Leeuw	631d15f3cb	rename to startBlindSpotPhase	2021-02-18 09:43:58 -05:00
Josh de Leeuw	bc33117135	refactor	2021-02-17 17:35:23 -05:00
GEJ1	a9bbc9664a	I remove: all the jQuery code, the mouse_adjustment option because use the jQuery slider.	2021-02-15 15:47:25 -03:00
GEJ1	99925639e0	Comments with jqueryToVanilla lines of code, but without change it	2021-02-14 15:53:20 -03:00
GEJ1	637f654961	Documentation completed. Also I added description in some parameters.	2021-02-02 11:26:39 -03:00
Peter J. Kohler	b038c66370	forgot to add try ... catch back into the code	2021-01-31 18:03:18 -05:00
Peter J. Kohler	2c5a45e90d	fixed mouse-based scaling	2021-01-31 18:01:44 -05:00
GEJ1	35881c1e9a	little change in prompts in order to have language consistency	2021-01-30 13:04:22 -03:00
Peter J. Kohler	24f185d3b0	button prompts added	2021-01-29 17:30:54 -05:00
Peter J. Kohler	000d64b9f6	removed unnecessary functions	2021-01-28 21:35:27 -05:00
Peter J. Kohler	9f7df71ae1	deleted one of the no longer useful functions	2021-01-28 21:27:31 -05:00
Peter J. Kohler	e4d7a7c46c	removing commented out older code	2021-01-28 20:25:21 -05:00
Peter J. Kohler	1555a9e718	blindspot measurement optional	2021-01-28 20:23:16 -05:00
GEJ1	1f813bc9f3	documentation update and resize decision (true or false)	2021-01-28 14:56:15 -03:00
Peter J. Kohler	e1d42e6a0f	resizing built-in	2021-01-27 19:41:41 -05:00
Peter J. Kohler	a4d97ceb28	function renamed	2021-01-27 18:35:14 -05:00