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

200 Commits

Author SHA1 Message Date
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
e8d50104c4 added depth parameter and pointer-events:"none" for TextBox; 2022-04-07 00:00:17 +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
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
Alain Pitiot
c63b5accc5
Merge pull request #4 from psychopy/2022.2.0
2022.2.0
2022-03-30 06:57:37 +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
Nikita Agafonov
7298de0fea
Merge branch '2022.x' into gamma_correction_implementation 2022-03-22 18:30:58 +03: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
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
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
08a39b3b45 version 2022.1.1 2022-02-18 11:10:58 +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
86dee66770 FF completed the information available in the experiment data for MultiStairHandler 2022-02-11 11:01:13 +01:00
lgtst
88b7345535 added spatial frequency and phase support for image based grating stims; 2022-02-10 19:54:52 +03:00
lgtst
3594405efe added onChange() callback to properly reflect changes of the _gamma value in adjustmentFilter; 2022-01-28 23:51:47 +03:00
lgtst
f7e4b2ec53 gamma correction introduced; 2022-01-28 19:33:05 +03:00
lgtst
120060cbab removed unused uniform uMaskTex; 2022-01-28 18:06:28 +03:00
lgtst
e4eb6f04c8 sin range chnged to [0, 1] for proper gabor patch; 2022-01-28 16:13:25 +03:00
lgtst
821725a45e Merge branch 'main' into GratingStim_class_implementation 2022-01-26 00:32:26 +03:00
lgtst
e050eaf906 GratingStim implementation first take; 2022-01-26 00:31:03 +03:00
Alain Pitiot
3424b24b43 Merge branch '2022.1.0' of github.com:apitiot/psychojs into 2022.1.0 2022-01-25 11:40:44 +01:00
Alain Pitiot
e9ebcba5fb ENH: prepareResources can now be use concurrently, with several batches of resources 2022-01-25 11:34:29 +01:00
Alain Pitiot
57720d6456
Merge pull request #473 from psychopy/main
BF: _pixi.rotation should be set to -this._ori to match PsychoPy (clock) ori
2022-01-25 11:31:59 +01:00
Jon Peirce
adf8a392fd BF: _pixi.rotation should be set to -this._ori to match PsychoPy (clock) ori
In PsychoPy @peircej chose to use clock/compass convention for ori rather than
engineering/maths convention, so +ve changes move clockwise not anti.

A previous change ( f12ccafff3 ) to the setOri function doesn't appear to have any
effect on the stimuli using the current rendering method
2022-01-24 17:16:55 +00:00
Alain Pitiot
16f84872c6 added user-specified filenames, opening and closing of sessions uses gitlab Id in order to benefit from the speed-up provided by the database indexes 2022-01-19 11:04:15 +01:00
lgtst
a0eb577d19 Started Implementing GratingStim; 2022-01-18 00:57:25 +03:00
Alain Pitiot
aeca039240 estimate of download speed 2022-01-14 11:41:29 +01:00
Alain Pitiot
988d1c69e6
Merge pull request #468 from apitiot/2022.1.0
2022.1.0
2021-12-08 08:16:31 +01:00
Alain Pitiot
874743105a _ 2021-12-07 11:09:07 +01:00
Alain Pitiot
2d6f994180
Merge branch 'psychopy:2021.3.0' into 2021.3.0 2021-09-30 08:23:58 +02:00