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

311 Commits

Author SHA1 Message Date
Alain Pitiot
60cfc55627 _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
8ea6aee1b4 Merge branch 'master' of github.com:psychopy/psychojs 2021-04-27 08:20:44 +02:00
Alain Pitiot
73cb6f6e40 _ 2021-04-27 08:20:15 +02:00
Alain Pitiot
980519c84c
Merge pull request #305 from thewhodidthis/nf#304--eslint
Switch to ESlint
2021-04-21 06:00:14 +02:00
Thomas Pronk
7f527e0f5c Add cross-var dependency and prefix build:cc with cross-var
This fixes the $npm_package_version variable on Windows CMD. See: https://stackoverflow.com/a/48619640
2021-04-19 19:54:12 +01:00
Sotiri Bakagiannis
8721b064eb git/package: add eslint config 2021-04-16 09:30:09 +01:00
Sotiri Bakagiannis
dd0d63663f package: bring in eslint to replace jshint 2021-04-16 09:29:54 +01:00
Alain Pitiot
5f4496ebdf
Merge pull request #303 from thewhodidthis/nf#174--repackaging
Bring packaging up to date with master latest
2021-04-15 17:31:25 +02:00
Sotiri Bakagiannis
8f0510dfda package: up version 2021-04-15 14:03:47 +01:00
Sotiri Bakagiannis
752337184a core/Window: fix import paths for rollup 2021-04-15 13:59:56 +01:00
Sotiri Bakagiannis
678712b26e css: clean up 2021-04-15 13:49:20 +01:00
Sotiri Bakagiannis
d03d1be59f editorconfig: use spaces for css 2021-04-15 13:49:08 +01:00
Sotiri Bakagiannis
3adfe76621 git: move stylesheet into src dir 2021-04-15 13:48:11 +01:00
Sotiri Bakagiannis
5cc32f2f50 git: ignore dist dir 2021-04-15 13:47:22 +01:00
Sotiri Bakagiannis
3587c689e8 git: add package.json, rollup build script 2021-04-15 13:46:44 +01:00
Sotiri Bakagiannis
e1df2bc19c js/src: add index files to re-export components from each module folder 2021-04-15 13:45:13 +01:00
Sotiri Bakagiannis
bcbf62e724 git: rename js folder to src 2021-04-15 13:39:02 +01:00
Alain Pitiot
1a8653aa39 documentation for 2021.1.4 2021-04-09 13:59:44 +02:00
Alain Pitiot
328127979a Merge branch 'master' of github.com:psychopy/psychojs 2021-04-09 13:57:42 +02:00
Alain Pitiot
4208fc5e9a changed version number and copyright 2021-04-09 13:57:33 +02:00
Alain Pitiot
a1bcbfe2e2
Merge pull request #302 from thewhodidthis/bf#301--textbox
core/Keyboard: re-allow default behaviour on keydown
2021-04-09 13:57:15 +02:00
Sotiri Bakagiannis
599da154aa core/Keyboard: re-allow default behaviour on keydown 2021-04-09 12:52:44 +01:00
Alain Pitiot
9183221e28 Merge branch 'master' of github.com:psychopy/psychojs 2021-04-09 13:44:55 +02:00
Alain Pitiot
9b9d4e335e _ 2021-04-09 13:44:26 +02:00
Alain Pitiot
8b1ee8afeb
Merge pull request #154 from thewhodidthis/nf#132--sound
sound/Sound: add setSound method
2021-04-09 13:20:33 +02:00
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