1
0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Commit Graph

715 Commits

Author SHA1 Message Date
Alain Pitiot
1653f967bb upgraded dialog box; various small fixes; revised documentation 2022-08-01 10:12:25 +02:00
Alain Pitiot
ae4a67756e NF: many new Shelf typed primitives; ENH: easier handling of Quest intensity and staircases; NF: floating point padding to simplify Py->JS transpilation 2022-06-23 10:16:03 +02:00
Alain Pitiot
173d08947d Camera: unified API with PsychoPy, Shelf: throttling 2022-06-23 10:09:56 +02:00
Alain Pitiot
8cc27b9cc9
Merge branch 'psychopy:2022.2.0' into 2022.2.0 2022-06-23 09:41:22 +02:00
Alain Pitiot
4937ab5308
Merge pull request #507 from lightest/CU-2da76e8_incorrect_size_on_rebuild
Incorrect behavior on textbox refresh when size attribute becomes negative
2022-06-23 09:13:20 +02:00
Alain Pitiot
10bebd2bbd
Merge pull request #508 from lightest/CU-2au7jhz_snap_slidermarker_to_cursor_on_pointerdown
Slider: improved pointer events handling
2022-06-23 09:12:33 +02:00
Alain Pitiot
d88d9963a5
Merge pull request #509 from lightest/fix_for_backgroundSprite_resize
Fix for backgroundSprite resize
2022-06-17 11:33:01 +02:00
lgtst
d572a8b5b6 removed console.log; 2022-06-17 01:18:27 +03:00
lgtst
89ba4289cc fixed onchange method for color; 2022-06-17 01:16:55 +03:00
lgtst
30510c943f fox for backgroundSprite resize 2022-06-17 01:05:02 +03:00
lgtst
99d03ce3d9 corrected jsdoc comment; 2022-06-16 20:59:52 +03:00
lgtst
1e3d524192 even better pointerdown handling; 2022-06-16 20:29:02 +03:00
lgtst
d60e9273f1 improved handling of pointer events; 2022-06-16 20:10:04 +03:00
lgtst
b8bff3ca91 _getTextInputOptions() now takes into account possibility of negative size; size attr update on input only happens when fitToContent=true; 2022-06-16 17:37:26 +03:00
lgtst
7794420cff adding capacity for marker to snap to cursor started; 2022-06-16 16:18:13 +03:00
Alain Pitiot
88e7d127b3
Merge pull request #505 from lightest/CU-2e6yn8w-stim-depth-attribute-fix
Depth value negated to have proper zIndex functionality in PIXI
2022-06-15 14:18:54 +02:00
Alain Pitiot
460b564699
Merge pull request #501 from lightest/CU-2au7jh3_slider_start_val
Starting val doesn't appear online
2022-06-15 14:13:58 +02:00
lgtst
5f666e7e44 nested ternary expression replaced by if-else if statements; 2022-06-15 12:46:17 +03:00
Alain Pitiot
4d6f1e631c
Merge pull request #504 from lightest/CU-2au7jeu_orientation_for_slider
Proper orientation setter for Slider
2022-06-10 11:57:34 +02:00
lgtst
66a60460bd removed unnecessary variable creation; 2022-06-09 17:38:25 +03:00
Alain Pitiot
7630722147
Merge pull request #506 from lightest/CU-2da76e8_textbox_fixes
LanguageStyle support for TextBox
2022-06-09 13:19:23 +02:00
Alain Pitiot
cd034249a3
Merge pull request #502 from lightest/CU-2au7jff_slider_radiobuttons_size
Slider radio-buttons size to match psychopy's
2022-06-09 12:54:49 +02:00
lgtst
15920e1b94 added languageStyle support for TextBox; 2022-06-08 16:18:22 +03:00
lgtst
1f1b259249 removed accidental identation change; 2022-06-06 23:17:41 +03:00
lgtst
0e58e6a7a4 Depth value negated to have proper zIndex functionality; 2022-06-06 23:15:14 +03:00
Alain Pitiot
195991eec3 Camera: unified API with PsychoPy, Shelf: throttling 2022-05-27 13:04:48 +02:00
lgtst
43e516d7a6 added proper orientation setter that also updates the rotation of labels; 2022-05-25 23:19:09 +03:00
lgtst
5d9e59861f removed accidental newline; 2022-05-25 18:41:08 +03:00
lgtst
c0c63accb5 radio buttons size set to match psychopy's; 2022-05-25 18:39:10 +03:00
lgtst
aaddd07065 added taking into account the availability of rating value when reconstructing the stim; 2022-05-24 23:42:57 +03:00
lgtst
24ceb40491 a bit more efficient solution that directly constructs slider with the desired state; 2022-05-24 23:09:12 +03:00
lgtst
1199b200dc Added startValue to Slider stim; 2022-05-24 22:23:33 +03:00
Alain Pitiot
8a3c6c0a28
Merge pull request #500 from apitiot/2022.2.0
DOC updated the documentation
2022-05-23 12:35:44 +02:00
Alain Pitiot
3b0308a77f DOC quick fix to index.html 2022-05-23 12:34:15 +02:00
Alain Pitiot
b07d8f5b0e DOC updated the documentation 2022-05-23 12:31:01 +02:00
Alain Pitiot
d305452489
Merge pull request #499 from apitiot/2022.2.0
NF first incarnation of Shelf
2022-05-23 12:21:03 +02:00
Alain Pitiot
bd1148fb63 Merge branch '2022.2.0' of github.com:apitiot/psychojs into 2022.2.0 2022-05-23 12:18:57 +02:00
Alain Pitiot
cafc34610d NF first incarnation of Shelf 2022-05-23 12:18:47 +02:00
Alain Pitiot
f719abf58b
Merge pull request #496 from lightest/Coloring_for_image_based_Gratings
Coloring for image based gratings
2022-05-12 11:22:17 +02:00
lgtst
268dddf779 added docs for uAlpha uniform; better pixi check for setInterpolate method; 2022-05-11 22:20:56 +03:00
lgtst
51d57083a3 added coloring support for image based Gratings; added proper opacity support; 2022-05-11 21:52:40 +03:00
Alain Pitiot
49e645f280
Merge pull request #493 from lightest/1yn08hm_gamma_and_grating_improvements
Further GratingStim development.
2022-05-10 10:02:52 +02:00
Alain Pitiot
93da98f9ab
Merge branch '2022.2.0' into 1yn08hm_gamma_and_grating_improvements 2022-05-10 10:02:41 +02:00
Alain Pitiot
cd7ae161f2
Merge pull request #488 from lightest/22ybvdr_textbox_parity
22ybvdr Textbox parity between psychoJS and psychoPy
2022-05-10 10:01:18 +02:00
lgtst
908f52e941 added proper support for grating stim coloring; utils/Color extended with rgbFull(), which provides [-1, 1] rgb color space; 2022-05-07 22:16:56 +03:00
lgtst
a1effe6969 added per grating and per window contrast filter; added separate stimuli PIXI container as a result of workaround with background; added grating blend mode support; started work on grating colors; 2022-05-05 19:37:30 +03:00
lgtst
496154442f CU-1yn08hm - added contrast support; 2022-05-01 22:26:37 +03:00
lgtst
8f8867a560 Merge branch '2022.2.0' into 1yn08hm_gamma_and_grating_improvements 2022-05-01 22:16:34 +03:00
lgtst
e6a018d619 added font and letterHeight setters; 2022-05-01 01:26:32 +03:00
lgtst
112234c68a fixed text reset on add/remove from scene; added fitToContent functionality; 2022-05-01 00:25:41 +03:00