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
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
Alain Pitiot
4fea70f605
Merge pull request #472 from peircej/bf-orientation-convention
...
BF: _pixi.rotation should be set to -this._ori to match PsychoPy (clock) ori
2022-01-25 11:26:25 +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
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
RebeccaHirst
96903e0266
add linspace to util.js
2022-01-06 16:39:08 +00: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
Alain Pitiot
5dbac82d73
various fixed to Slider, add intensity to MultiStairHandler, improved background download of resources, faster TextStim
2021-09-30 08:22:47 +02:00
Alain Pitiot
fdbb2c076a
Merge pull request #458 from apitiot/2021.3.0
...
2021.3.0
2021-08-30 11:32:38 +02:00
Alain Pitiot
860cf1f51d
much tighter bounding box calculations in TextStim
2021-08-30 11:31:31 +02:00
Alain Pitiot
2f072ebb9f
Merge pull request #457 from TEParsons/_randchoice
...
NF: Add `util.randchoice` to mirror Python
2021-08-20 10:03:00 +02:00
Todd
8833043f02
FF: Select random index rather than shuffling and indexing -1
2021-08-19 16:22:39 +01:00
Todd
146cf55f23
NF: Add util.randchoice to mirror Python
...
In Python, we import `numpy.random.choice` as `randchoice`, so this adds an equivalent function to the JS side.
2021-08-16 09:25:56 +01:00
Thomas Pronk
cbf475723a
ENH: Converted any string values for method to corresponding QuestHandler.Method values
2021-07-28 08:45:25 +02:00
tpronk
25f8c480a1
Fail workflow on failed join_reports
...
Fixes https://github.com/psychopy/psychojs_testing/issues/7
2021-07-27 11:20:52 +02:00
Alain Pitiot
ff9f94865c
_
2021-07-26 15:03:06 +02:00
Alain Pitiot
fd0030a8b1
Merge pull request #446 from apitiot/2021.3.0
...
merge from apitiot 2021.3.0
2021-07-26 14:41:56 +02:00
