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

844 Commits

Author SHA1 Message Date
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
lgtst
45bcb3633c [WIP] fitToContent prototype; 2022-04-24 04:23:51 +03:00
lgtst
783047de12 removed redundant tab symbol; 2022-04-14 19:55:11 +03:00
lgtst
f7171287fc 22ybz82 "greedy" focus fix, also window#rootContainer now has sortableChildren=true; 2022-04-14 19:53:03 +03:00
lgtst
fb89db2b6c Merge branch '2022.2.0' of https://github.com/lightest/psychojs into 22ybvdr_textbox_parity 2022-04-12 14:31:59 +03:00
lgtst
c6aacad99c phase parameter for grating functions is now multiples of those function's periods 2022-04-12 14:29:55 +03:00
Nikita Agafonov
f642573237
Merge branch 'psychopy:2022.2.0' into 2022.2.0 2022-04-12 14:26:26 +03:00
Alain Pitiot
df3f509402
Merge pull request #490 from apitiot/2022.2.0
2022.2.0
2022-04-12 09:21:55 +02:00
lgtst
e8d50104c4 added depth parameter and pointer-events:"none" for TextBox; 2022-04-07 00:00:17 +03:00
Nikita Agafonov
b0c7493a57
Merge branch 'psychopy:2022.2.0' into 2022.2.0 2022-04-06 23:46:22 +03:00
Alain Pitiot
837c6775e6 [BF] fix issue with saving to database 2022-03-31 13:29:54 +02:00
lgtst
d0ed55758b textBox#setAlignment method added to avoid complete reconstruction when changing text alignment 2022-03-30 23:56:54 +03:00
lgtst
08b71731d1 anchoring and alignment fixed; 2022-03-30 22:39:47 +03:00
lgtst
0259fe2518 Merge branch '2022.2.0' of https://github.com/lightest/psychojs into 22ybvdr_textbox_parity 2022-03-30 14:08:38 +03:00
Alain Pitiot
6761e7c0bd Update README.md
added Nikita Agafonov as contributor
2022-03-30 14:08:34 +03:00
lgtst
328601b0d2 indentation change - spaces to tabs 2022-03-30 14:08:34 +03:00
lgtst
5baa60dbee rebasing branches 2022-03-30 14:06:31 +03:00
lgtst
cb7b0617b6 Full set of signals for grating stim; Documentation test; 2022-03-30 14:03:52 +03:00
lgtst
ac13de28c3 added spatial frequency and phase support for image based grating stims; 2022-03-30 14:03:52 +03:00
lgtst
948b14bb41 removed unused uniform uMaskTex; 2022-03-30 14:03:52 +03:00
lgtst
e822675cde sin range chnged to [0, 1] for proper gabor patch; 2022-03-30 14:03:52 +03:00
lgtst
f032d4c34a GratingStim implementation first take; 2022-03-30 14:03:52 +03:00
lgtst
ea80090e6f Started Implementing GratingStim; 2022-03-30 14:03:52 +03:00