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

813 Commits

Author SHA1 Message Date
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 ) 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
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
Alain Pitiot
87ff0ea98c
Merge branch '2021.3.0' into 2021.3.0 2021-07-26 14:41:44 +02:00
Alain Pitiot
9c3c27201d added MultiStairHandler 2021-07-26 14:32:09 +02:00
Alain Pitiot
a814c972aa
Merge pull request #437 from thewhodidthis/bf435-dialog
css: override ui-dialog inline styles, use percentage height on body
2021-07-26 13:17:31 +02:00
Alain Pitiot
8943dee36b
Merge pull request #442 from psychopy/2021.2.1
merge from 2021.2.1
2021-07-23 08:44:39 +02:00
Alain Pitiot
5ceec31ea3
Merge pull request #441 from apitiot/master
polished up QuestHandler, various cosmetic improvements
2021-07-23 08:41:32 +02:00
Alain Pitiot
798611e91f
Update package.json 2021-07-23 08:39:57 +02:00
Alain Pitiot
dd0c46ccd0 improved documentation for FaceDetector, Camera, and QuestHandler 2021-07-23 08:33:09 +02:00
Alain Pitiot
b6125d5b16 polished up QuestHandler, various comestic improvements, small fixes to Camera 2021-07-23 08:00:20 +02:00
Alain Pitiot
8ed91c97d9
Merge pull request #2 from psychopy/main
merge in Sotiri's cosmetic changes
2021-07-23 07:44:06 +02:00
Alain Pitiot
7975dd8df0
Merge branch 'master' into main 2021-07-23 07:42:29 +02:00
Sotiri Bakagiannis
636506e43e css: override ui-dialog element inline styles, use percentage height on body 2021-07-15 19:48:38 +01:00
Alain Pitiot
0a7d15077c added a first prototype of the Quest Trial Handler 2021-07-14 14:52:03 +02:00
Sotiri Bakagiannis
9992bbde93 util/Pixi: import missing Util.to_px 2021-07-14 11:07:34 +01:00
Alain Pitiot
86cbc73c94 added FaceDetector with linking to MovieStim, little fixed here and there 2021-07-12 08:54:13 +02:00
Sotiri Bakagiannis
f96cff27d3 core: format 2021-07-09 14:09:14 +01:00
Sotiri Bakagiannis
27d08ba42f data: enforce formatting rules 2021-07-09 14:08:08 +01:00
Sotiri Bakagiannis
5468898716 sound: enforce formatting rules 2021-07-09 14:07:55 +01:00
Sotiri Bakagiannis
57a590c536 util: enforce formatting rules 2021-07-09 14:07:40 +01:00
Sotiri Bakagiannis
c9cb3c8412 visual: enforce consistent formatting 2021-07-09 14:07:04 +01:00
Sotiri Bakagiannis
61fb7744a1 dprint: prefer double quotes only if it makes sense 2021-07-09 14:06:22 +01:00
Sotiri Bakagiannis
6c92771864
Merge pull request #431 from thewhodidthis/main
Fix import paths
2021-07-09 13:51:30 +01:00
Sotiri Bakagiannis
67873dabd4 visual: fix import paths 2021-07-09 13:50:36 +01:00