HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-11 16:18:10 +00:00
Code Actions Packages Releases Activity
676 Commits 51 Branches 0 Tags 15 MiB
268dddf779
Commit Graph

676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lgtst
3b57bd76b4 added onChange() callback to properly reflect changes of the _gamma value in adjustmentFilter; 2022-03-30 14:03:52 +03:00
lgtst
9c332e8dde gamma correction introduced; 2022-03-30 14:03:52 +03:00
lgtst
62293ff474 Merge branch '2022.2.0' of https://github.com/lightest/psychojs into 22ybvdr_textbox_parity 2022-03-30 13:57:44 +03:00
Nikita Agafonov
7b043a4eb2
Merge branch 'psychopy:2022.2.0' into 2022.2.0 2022-03-30 13:39:09 +03:00
Alain Pitiot
c63b5accc5
Merge pull request #4 from psychopy/2022.2.0 
2022.2.0
 2022-03-30 06:57:37 +02:00
Alain Pitiot
df7b819e2b
Merge pull request #3 from psychopy/2022.1.2 
2022.1.2
 2022-03-30 06:55:38 +02:00
lgtst
b7c7ae7381 TextBox fillColor, borderColor and color are now becoming transparent if no color specified, also undefined is the default color value; 2022-03-25 15:56:52 +03:00
Alain Pitiot
14dcfbca7a
Update README.md 
added Nikita Agafonov as contributor
 2022-03-23 13:42:38 +01:00
Alain Pitiot
9e5d56863e
Merge pull request #475 from lightest/gamma_correction_implementation 
Gamma correction implementation
 2022-03-23 13:38:44 +01:00
Nikita Agafonov
7298de0fea
Merge branch '2022.x' into gamma_correction_implementation 2022-03-22 18:30:58 +03:00
Alain Pitiot
651d803393
Merge pull request #474 from lightest/GratingStim_class_implementation 
Grating stim class implementation
 2022-03-22 13:26:21 +01:00
lgtst
2ce87e2224 indentation change - spaces to tabs 2022-03-22 12:48:38 +03:00
lgtst
3ebd9c4943 new documentation for GratingStim, variables and methods renamed to match psychoPy 2022-03-21 23:28:54 +03:00
Alain Pitiot
d5d9d125d9
Merge pull request #487 from apitiot/2022.1.2 
version 2022.1.2
 2022-03-21 14:02:22 +01:00
Alain Pitiot
8407c8e90f version 2022.1.2 2022-03-21 14:00:34 +01:00
Alain Pitiot
9ebfaedd86
Merge pull request #484 from psychopy/2022.1.1 
2022.1.1
 2022-03-06 10:15:53 +01:00
Alain Pitiot
cd4b76c1cb
Merge pull request #483 from TEParsons/_numClicks 
BF: Initialise ButtonStim with a `numClicks` attribute
 2022-03-06 10:14:18 +01:00