HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-11 16:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,681 Commits 14 Branches 506 Tags 58 MiB
cd7821d63c
Commit Graph

3681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
43fac3c674 minor bug 2014-03-03 11:59:01 -05:00
Josh de Leeuw
30df65e95b First pass at allowing functions as variables 2014-03-03 11:47:16 -05:00
Josh de Leeuw
c8cb4204d1 adding normalizeTrialVariables method 
method takes an object (intended to be a trial data structure) and converts any function arguments to their returned value.
 2014-03-03 10:41:24 -05:00
Josh de Leeuw
dc5081aae3 Delete jspsych-utils.js 
all functions have been moved elsewhere.
 2014-02-28 17:47:15 -05:00
Josh de Leeuw
75a61e3abd Merge pull request #33 from jodeleeuw/merge-palmer-stimuli-function 
Merge palmer stimuli function
 2014-02-28 17:46:15 -05:00
Josh de Leeuw
67910476f4 fix bug with div names 2014-02-28 17:44:44 -05:00
Josh de Leeuw
1a3ca8cc69 Add option to return flattened data object 
Related to issue #31 because it moves a utility function into the core library.
 2014-02-28 17:07:07 -05:00
Josh de Leeuw
9233f092a6 Get rid of palmer methods 
Issues #30 and #31
 2014-02-24 19:15:14 -05:00
Josh de Leeuw
aaace2dfe6 Adding generate_stimulus method 
- copied over from utils file.
- some functions not included (left commented out). need to figure out why they were there in the first place...

Related to issue #30
 2014-02-24 19:13:16 -05:00
Josh de Leeuw
f5a7c09493 Update README.md 2014-02-21 15:43:21 -05:00
Josh de Leeuw
b06a1fc5f3 Update README.md 2014-02-21 13:25:47 -05:00
Josh de Leeuw
03f70efbe2 moving stimulus creation to a separate public function so that stimuli can be generated for other plugins 2014-02-20 21:20:14 -05:00
Josh de Leeuw
eb60da88e1 automatically center grid in container 2014-02-20 19:04:23 -05:00
Josh de Leeuw
c36c46ef25 fixing padding bug 2014-02-20 18:20:22 -05:00
Josh de Leeuw
f0e4e0f4aa Merge pull request #28 from jodeleeuw/vsl-grid-scene 
VSL grid scene
 2014-02-19 14:27:11 -05:00
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