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
386 Commits 51 Branches 0 Tags 15 MiB
6354cd95f6
Commit Graph

386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alain Pitiot
bdcd4ac278
Merge pull request #203 from thewhodidthis/bf#202--opacity 
visual/VisualStim: Enable pixi updates when setting opacity
 2021-04-09 13:19:15 +02:00
Alain Pitiot
55b1789e2f
Merge pull request #281 from thewhodidthis/bf#280--forms 
visual/Form: support the radio type, same as choice
 2021-04-09 13:18:48 +02:00
Alain Pitiot
e9d6119a21
Merge pull request #292 from thewhodidthis/bf#291--set-image 
visual/ImageStim: check if image attribute different before onChange() call
 2021-04-09 13:17:59 +02:00
Alain Pitiot
45ae6d9a8a
Merge pull request #296 from thewhodidthis/nf#294--fades 
sound/TrackPlayer: add fades on play / stop
 2021-04-09 13:17:17 +02:00
Sotiri Bakagiannis
a00211478c visual/MovieStim: drop set opacity attribute from constructor (no effect) 2021-04-08 16:11:10 +01:00
Sotiri Bakagiannis
fcac8d42bb sound/TrackPlayer: fix typo, add JSDoc comments for fadeDuration 2021-03-29 17:01:57 +01:00
Sotiri Bakagiannis
e6a21d3cc3 sound/TrackPlayer: add fades on play / stop 2021-03-29 16:53:35 +01:00
Sotiri Bakagiannis
f19b46272e visual/ImageStim: check against the 'src' attribute 2021-03-24 13:05:50 +00:00
Sotiri Bakagiannis
987244e9fb Merge branch 'master' into bf#202--opacity 2021-03-19 06:56:06 +00:00
Sotiri Bakagiannis
5d202b7526 visual/ImageStim: check if image attribute different before onChange call 2021-03-18 18:09:57 +00:00
Sotiri Bakagiannis
872f5e71f1
Merge pull request #249 from thewhodidthis/bf#238--slider 
visual/Slider: estimate bounding box at the top of update calls
 2021-03-17 14:25:50 +00:00
Sotiri Bakagiannis
99be6f5419
Merge pull request #93 from sijiazhao/master 
BF: Prevent user from unintentionally reloading the page when attempting to submit GUI.dlgFromDict by pressing Enter
 2021-03-02 21:48:46 +00:00
Sotiri Bakagiannis
1c72866eca
Merge branch 'master' into master 2021-03-02 21:46:33 +00:00
Sotiri Bakagiannis
8bb7884493
Merge pull request #274 from sijiazhao/clearEvents-fix 
BF: When closing DlgFromDict, call eventmanager.clearEvents to clear events accumulated during dialog to prevent subsequent routines picking up keypresses belonging to DlgFromDict
 2021-02-28 12:31:20 +00:00
Sijia Zhao
0789711228 Remove unnecessary argument: undefined 2021-02-27 00:16:43 +00:00
Alain Pitiot
e95fcb7201 Merge branch 'master' of github.com:psychopy/psychojs 2021-02-25 16:55:39 +01:00
Alain Pitiot
a3443f64bb version 2021.1.1 2021-02-25 16:55:33 +01:00
Alain Pitiot
a2229ea483
Merge pull request #285 from thewhodidthis/bf#283--image-textures 
visual/ImageStim: tweak texture related PIXI calls
 2021-02-25 16:47:30 +01:00
Sotiri Bakagiannis
88531a2cb8 visual/ImageStim: tweak texture related PIXI calls 2021-02-25 15:40:19 +00:00
Sotiri Bakagiannis
225030cd16 visual/Form: support the radio type, same as choice 2021-02-24 12:00:10 +00:00
Alain Pitiot
58d412f10c
Merge pull request #278 from apitiot/master 
updated the documentation
 2021-02-20 13:03:34 +01:00
Alain Pitiot
867add56a4 updated the documentation 2021-02-20 13:02:55 +01:00
Alain Pitiot
54bed68e64
Merge pull request #277 from apitiot/master 
changed version number to 2021.1.0
 2021-02-20 12:20:34 +01:00
Alain Pitiot
92c4d1d0b9 changed version number to 2020.1.0 2021-02-20 12:18:07 +01:00
Alain Pitiot
6c293c1cbd
Merge pull request #252 from thewhodidthis/bf#215--css-escape 
core/GUI: refactor CSS naming of dialog box input elements
 2021-02-20 08:53:24 +01:00
Alain Pitiot
5374d199e3
Merge pull request #251 from thewhodidthis/bf#246--line-breaks 
data/TrialHandler: allow for doubly escaped LFs in xlsx cells
 2021-02-20 08:50:38 +01:00
Sotiri Bakagiannis
79461914bc core/GUI: save whole element ids in required keys 2021-02-19 14:27:21 +00:00
Sotiri Bakagiannis
a2db2f2851 data/TrialHandler: tweak numerical string typecasting 2021-02-19 14:11:08 +00:00
Sotiri Bakagiannis
a603a58521 data/TrialHandler: reorder assignments in importConditions() 2021-02-18 16:46:49 +00:00
Alain Pitiot
bed6ff240e
Merge pull request #262 from thewhodidthis/bf#205--util 
Allow for parsing of array-like strings when setting visual stimulus position or size
 2021-02-18 15:32:34 +01:00
Alain Pitiot
3ed9dc1153
Update Util.js 2021-02-18 15:31:41 +01:00
Alain Pitiot
ab2e1608a5
Merge pull request #247 from thewhodidthis/bf#134--fullrandom 
data/TrialHandler: add FULLRANDOM alias to mirror PP output
 2021-02-18 14:17:19 +01:00
Alain Pitiot
aa5a47a7d7
Merge pull request #261 from thewhodidthis/bf#114--pixi 
Clean up PIXI.Texture and Sprite creation & removal for movies and images
 2021-02-18 13:23:18 +01:00
Alain Pitiot
7020ee1752
Merge branch 'master' into bf#114--pixi 2021-02-18 13:23:12 +01:00
Alain Pitiot
38ab3444aa
Merge pull request #260 from thewhodidthis/bf#196--video 
visual/MovieStim: do tell PIXI base texture to respect autoplay
 2021-02-18 13:22:11 +01:00
Alain Pitiot
f4c9d6ce33
Merge pull request #267 from thewhodidthis/nf#230--remotes 
core/PsychoJS: enable whitelisting of config.json hosts
 2021-02-18 13:21:40 +01:00
Alain Pitiot
365ebbe86d
Merge pull request #268 from thewhodidthis/bf#257--frame-rate 
Implement Window.getActualFrameRate() to dynamically update monitorFramePeriod
 2021-02-18 13:19:50 +01:00
Sotiri Bakagiannis
50547455bf util/Util: roll back to parseFloat when converting to number 2021-02-15 23:43:27 +00:00
Sotiri Bakagiannis
5eeda1aed4 visual/Movie/ImageStim: avoid blanket texture cache reset 2021-02-15 21:07:41 +00:00
Sotiri Bakagiannis
c679174923 util/Scheduler: clean up rAF last timestamp assignment 2021-02-15 18:36:18 +00:00
Sotiri Bakagiannis
0d56e598d3 core/Window: simplify fps calc 2021-02-15 18:33:07 +00:00
Sotiri Bakagiannis
414f9324e0 data/TrialHandler: use a separate key instead of a getter 2021-02-15 18:10:21 +00:00
Sotiri Bakagiannis
2d20c9303b data/TriaHandler: merge string type checking when parsing data rows 2021-02-15 14:43:37 +00:00
Sotiri Bakagiannis
98169cc6bf core/PsychoJS: tweak variable naming 2021-02-15 13:36:38 +00:00
Alain Pitiot
c5dee121c9
Merge pull request #125 from thewhodidthis/bf#124--duplicates 
data/ExperimentHandler: remove duplicate isEntryEmpty method
 2021-02-15 10:47:53 +01:00
Alain Pitiot
2e856a5851
Merge pull request #250 from thewhodidthis/bf#233--shape 
visual/ShapeStim: take contrast into account when calling beginFill
 2021-02-15 10:46:46 +01:00
Alain Pitiot
68c85f8460
Merge pull request #255 from thewhodidthis/bf#224--add-attributes 
core/data/sound/util: drop PsychObject._addAttributes() and refs thereof
 2021-02-15 10:13:51 +01:00
Alain Pitiot
eb35796416
Merge pull request #254 from thewhodidthis/bf#253--text-input 
visual/TextInput: replace for...in with a forEach loop
 2021-02-15 09:52:06 +01:00
Alain Pitiot
bfa460e419
Merge pull request #245 from thewhodidthis/bf#244--close-shape 
visual/ShapeStim: set closeStroke on PIXI polygon creation
 2021-02-15 09:50:51 +01:00
Alain Pitiot
ef98dc617f
Merge pull request #243 from nabaruns/master 
Update README.md
 2021-02-15 09:48:18 +01:00