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 |
|
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 |
|
Todd
|
24829683b1
|
BF: Initialise ButtonStim with a numClicks attribute
|
2022-03-04 13:29:56 +00:00 |
|
lgtst
|
ff13338563
|
Full set of signals for grating stim; Documentation test;
|
2022-03-02 20:45:12 +03:00 |
|
Alain Pitiot
|
e9d811e59d
|
Merge pull request #482 from apitiot/2022.1.1
BF: importConditions with a selection consisting of a string, e.g. '1,2,3'
|
2022-02-22 10:58:48 +01:00 |
|
Alain Pitiot
|
590911c1c3
|
BF: importConditions with a selection consisting of a string, e.g. '1,2,3'
|
2022-02-22 10:54:00 +01:00 |
|
Alain Pitiot
|
52df4e0421
|
Merge pull request #481 from apitiot/2022.1.1
2022.1.1
|
2022-02-18 11:12:55 +01:00 |
|
Alain Pitiot
|
08a39b3b45
|
version 2022.1.1
|
2022-02-18 11:10:58 +01:00 |
|
Alain Pitiot
|
d23f2c90ba
|
Merge branch '2022.1.0' of github.com:apitiot/psychojs into 2022.1.0
|
2022-02-16 13:24:49 +01:00 |
|
Alain Pitiot
|
5c2b87d950
|
BF: make sure that the OK button of the startup dialog box is active when the experiment has no resources to load
|
2022-02-16 13:24:36 +01:00 |
|
Alain Pitiot
|
02b5b27683
|
Merge pull request #479 from apitiot/2022.1.0
DOC edits to the README.md file
|
2022-02-11 11:51:24 +01:00 |
|
Alain Pitiot
|
9da5759f57
|
Merge branch 'psychopy:2022.1.0' into 2022.1.0
|
2022-02-11 11:50:01 +01:00 |
|
Alain Pitiot
|
4b2ab80781
|
edits to the README.md file
|
2022-02-11 11:49:01 +01:00 |
|
Alain Pitiot
|
0b1f318830
|
Merge pull request #478 from apitiot/2022.1.0
FF completed the information available in the experiment data for MultiStairHandler
|
2022-02-11 11:02:56 +01:00 |
|
Alain Pitiot
|
86dee66770
|
FF completed the information available in the experiment data for MultiStairHandler
|
2022-02-11 11:01:13 +01:00 |
|