Commit Graph

3166 Commits

Author SHA1 Message Date
Josh de Leeuw
1db1cb8c52 require 0 for blank elements, so that grid size can be automatically determined 2014-02-19 14:22:36 -05:00
Josh de Leeuw
9e5592b662 initial commit of vsl-grid-scene plugin 2014-02-19 12:12:45 -05:00
Josh de Leeuw
9f39bd80e2 closes #26 2014-02-13 11:03:30 -05:00
Josh de Leeuw
d7e93c612a Merge pull request #25 from jodeleeuw/vsl_animate_occlusion
VSL animate occlusion
2014-02-12 18:12:32 -05:00
Josh de Leeuw
b56e1cc3aa adding parameter list to header doc 2014-02-12 17:46:41 -05:00
Josh de Leeuw
5e136e679a a few bug fixes 2014-02-12 17:27:53 -05:00
Josh de Leeuw
a3a08cf00c initial commit of vsl-animate-occlusion plugin 2014-02-12 17:04:33 -05:00
Josh de Leeuw
ea2c978094 css fix was applied incorrectly to survey-likert, resulting in a bug that failed to show slider labels 2014-02-04 19:38:16 -05:00
Josh de Leeuw
02229c8e3b Merge pull request #21 from jodeleeuw/rt-key-down
changing keyup to keydown
2014-01-28 11:04:54 -08:00
Josh de Leeuw
9558914b82 changing keyup to keydown 2014-01-27 15:20:03 -05:00
Josh de Leeuw
f68b475552 Merge pull request #20 from jodeleeuw/timing-zero-fix
Timing zero fix
2014-01-27 12:09:02 -08:00
Josh de Leeuw
e76284acb2 fixing timing_post_trial = 0 issue #15 2014-01-27 15:05:16 -05:00
Josh de Leeuw
76457f11be timing_post_trial fix (#15) 2014-01-27 13:30:42 -05:00
Josh de Leeuw
1fe60bff01 timing_post_trial fix (#15) 2014-01-23 09:44:59 -05:00
Josh de Leeuw
b6db7c08f9 fixing issues with 0 as timing parameter (#15) 2014-01-22 23:28:14 -05:00
Josh de Leeuw
f906a7b8d5 Merge pull request #18 from jodeleeuw/css-cleanup
Appending all CSS classes and IDs with jspsych-pluginname
2014-01-22 20:19:05 -08:00
Josh de Leeuw
36f5757a66 css cleanup (#13) 2014-01-22 23:15:59 -05:00
Josh de Leeuw
968b4ea549 css cleanup (#13) 2014-01-22 19:04:26 -05:00
Josh de Leeuw
53ad86bf20 css cleanup (#13) 2014-01-22 18:36:12 -05:00
Josh de Leeuw
124840d9fa css cleanup (#13) 2014-01-20 16:17:37 -05:00
Josh de Leeuw
98e9f43af0 css cleanup (#13) 2014-01-20 16:12:15 -05:00
Josh de Leeuw
a1d882d385 cleanup css (#13) 2014-01-20 14:43:28 -05:00
Josh de Leeuw
54c0043e62 update css (#13) 2014-01-17 17:22:41 -05:00
Josh de Leeuw
719b5c9196 cleanup css (#13) 2014-01-17 16:17:18 -05:00
Josh de Leeuw
6c3c49af33 cleanup css names (#13) 2014-01-17 16:15:16 -05:00
Josh de Leeuw
e2e60e8048 Change from keyup to keydown 2014-01-16 10:08:56 -05:00
Josh de Leeuw
c118a4034c Merge pull request #14 from jodeleeuw/animation-rework
Animation rework
2014-01-13 12:07:26 -08:00
Josh de Leeuw
478da23caf record current stim in response 2014-01-13 14:42:37 -05:00
Josh de Leeuw
4943c140ec adding response collection capability, ability to add blank interval between frames 2014-01-13 14:35:04 -05:00
Josh de Leeuw
5554018c6b adding response collection capability, ability to add blank interval between frames 2014-01-13 14:29:17 -05:00
Josh de Leeuw
0c2fdbd2e8 testing branch setup on cloud9 2014-01-13 13:37:37 -05:00
Josh de Leeuw
f74752a23f updating header doc 2013-12-10 13:02:52 -05:00
Josh de Leeuw
0da9a164a3 moving visibility reveal after content is updated 2013-12-10 13:00:05 -05:00
Josh de Leeuw
90cc26a44e visible property bug 2013-12-10 12:33:28 -05:00
Josh de Leeuw
fae8ee7880 fixing height of labels container 2013-12-10 11:27:14 -05:00
Josh de Leeuw
6aed75b9d1 revising sim plugin to provide more flexibility in how the trial unfolds - related to #12 2013-12-10 11:21:20 -05:00
Josh de Leeuw
07a667307b rt was not being recorded correctly when continue_after_response was false 2013-12-07 15:02:51 -05:00
Josh de Leeuw
1c3a0bab9a bug fix with continue_after_response 2013-12-05 20:50:15 -05:00
Josh de Leeuw
7553c98bcd bug fix with continue_after_response 2013-12-05 20:45:51 -05:00
Josh de Leeuw
09af7112ec moving categorize animation into the main folder 2013-12-03 12:21:31 -05:00
Josh de Leeuw
31347c15d6 updating categorize-animation plugin to match standards of other plugins 2013-12-03 11:00:23 -05:00
Josh de Leeuw
99e7cb58ba Adding an extra value for identifying when page is loaded outside of Turk context (relevant to #10) 2013-11-21 15:08:20 -05:00
Josh de Leeuw
b6a89b935c Adding jsPsych.turkInfo() method (addresses issue #10) 2013-11-20 15:07:32 -05:00
Josh de Leeuw
4bdf7a2dce fixing naming of stimulus elements in data 2013-11-18 22:24:36 -05:00
Josh de Leeuw
635bfadf92 Adding a template for creating a new plugin 2013-11-18 12:17:49 -05:00
Josh de Leeuw
60ef236dc6 Merge branch 'master' of github.com:jodeleeuw/jsPsych
README file was updated separately from codebase
2013-11-14 11:42:56 -05:00
Josh de Leeuw
5e75ea964d Adding a keydown requirement so that plugin will not advance if key is already pressed when user arrives at plugin page 2013-11-14 11:40:32 -05:00
Josh de Leeuw
d6c02e7361 Update README.md 2013-11-13 11:58:58 -05:00
Josh de Leeuw
18850e664e Update README.md 2013-11-13 11:58:10 -05:00
Josh de Leeuw
75da56a591 bug fix string' 2013-11-12 12:22:06 -05:00