HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-12 08:38:10 +00:00
Code Actions Packages Releases Activity
150 Commits 51 Branches 0 Tags 15 MiB
c203524c06
Commit Graph

112 Commits

Author SHA1 Message Date
Alain Pitiot
c203524c06
Merge pull request #177 from thewhodidthis/bf#176--image 
visual/ImageStim: tweak _estimateBoundingBox() to use size over this._size
 2020-10-09 10:25:49 +02:00
Alain Pitiot
987ef20629
Merge pull request #194 from thewhodidthis/bf#193--gui 
core/GUI: make sure _setRequiredKeys exists before accessing its size
 2020-10-09 10:07:08 +02:00
Alain Pitiot
bcba1faa48
Merge pull request #180 from thewhodidthis/bf#171--window 
Give the PsychoJS.start() expInfo option a default value
 2020-10-09 10:06:20 +02:00
Sotiri Bakagiannis
011bebbe7c util/Util: tweak toNumerical error throwing to not rely on this._gui 2020-10-09 08:15:03 +01:00
Sotiri Bakagiannis
717aa3ca4f core/GUI: make sure _setRequiredKeys exists before accessing its size 2020-09-29 20:50:54 +01:00
Sotiri Bakagiannis
1b1dabffb8 core/PsychoJS: make an empty object literal the default expInfo value on start() 2020-09-18 16:00:00 +01:00
Sotiri Bakagiannis
54166f0cd2 visual/ImageStim: tweak _estimateBoundingBox() to use size over this._size 2020-09-18 12:06:52 +01:00
Sotiri Bakagiannis
d069665571 data/TrialHandler: clean up comment 2020-09-08 16:23:57 +01:00
Sotiri Bakagiannis
b65c9b8489 data/TrialHandler: clear up comment 2020-09-07 22:41:48 +01:00
Sotiri Bakagiannis
03e7e48d6e data/TrialHandler: reorder parsing of cell value, clean up 2020-09-07 22:37:02 +01:00
Sotiri Bakagiannis
968070436a data/TrialHandler: fix attempted destructuring on non arrays 
When calling `Util.turnSquareBracketsIntoArrays()`, forget
about destructuring ahead of checking whether the result
is an array, just take the first element if it is.
 2020-09-07 18:20:02 +01:00
Sotiri Bakagiannis
6523a4a404 util/Util: do export turnSquareBracketsIntoArrays 2020-09-07 18:18:39 +01:00
Alain Pitiot
e48d485ad2
Merge pull request #163 from thewhodidthis/nf#118--gui 
core/GUI: give the OK button focus if enabled
 2020-09-04 22:47:28 +02:00
Alain Pitiot
567b3e0338
Merge pull request #162 from thewhodidthis/bf#155--sound 
sound/TonePlayer: fix triggerRelease
 2020-09-04 22:42:53 +02:00
Sotiri Bakagiannis
a0de6a5921 core/GUI: give the OK button focus if enabled 2020-09-04 10:05:59 +01:00
Sotiri Bakagiannis
b74451ed77 sound/TonePlayer: give triggerRelease the note value that it needs when stopping 2020-09-04 09:56:45 +01:00
Sotiri Bakagiannis
ac522f1660 visual/MovieStim: Tweak _estimateBoundingBox() to use size instead of this._size 2020-09-01 14:30:56 +01:00
Alain Pitiot
8a9b59b1c8
Merge pull request #156 from thewhodidthis/bf#131--sound 
sound/TrackPlayer: add setDuration()
 2020-08-30 11:04:21 +02:00
Alain Pitiot
3265b39e2d
Merge pull request #152 from thewhodidthis/bf#142--movie 
visual/MovieStim: tweak options when destroying pixi sprite
 2020-08-30 10:56:49 +02:00
Alain Pitiot
a92b01ca18
Merge pull request #151 from thewhodidthis/bf#150--interpolate 
visual/MovieStim: add interpolate when destructuring options on init
 2020-08-30 10:48:06 +02:00
Alain Pitiot
48edbc5d34
Merge pull request #141 from thewhodidthis/bf#140--movie 
visual/MovieStim: DOM clone video baseTexture during setMovie call
 2020-08-30 10:33:47 +02:00
Alain Pitiot
80d55d43b2
Merge branch 'master' into bf#73--arrays 2020-08-30 10:31:58 +02:00
Alain Pitiot
a758619bc4
Merge pull request #149 from thewhodidthis/bf#148--colormixin 
util/ColorMixin: force a PIXI update when setting color or contrast
 2020-08-30 10:27:49 +02:00
Sotiri Bakagiannis
caecac487b sound/TrackPlayer: tweak comment 2020-08-28 22:41:52 +01:00
Sotiri Bakagiannis
24cf07b207 sound/TrackPlayer: add a setDuration method for adjusting Howler's default sprite 2020-08-26 13:43:25 +01:00
Sotiri Bakagiannis
932572a0f7 sound/TonePlayer: fix JSDoc typo 2020-08-26 13:37:04 +01:00
Sotiri Bakagiannis
6b2e772c89 sound/Sound: fix JSDoc typos 2020-08-26 13:36:43 +01:00
Sotiri Bakagiannis
0e38278e01 visual/MovieStim: tweak options when destroying pixi sprite 
Destroy main texture and children, but leave baseTexture untouched.
 2020-08-21 10:24:38 +01:00
Sotiri Bakagiannis
8f926c8cf1 visual/MovieStim: add interpolate when destructuring options on init 2020-08-21 09:58:14 +01:00
Sotiri Bakagiannis
e723b2ac75 util/ColorMixin: force a PIXI update when setting color or contrast 
Have `ColorMixin` reflect that for visual components like `TextStim`
updating 'color' and 'contrast' attributes needs PIXI.
 2020-08-20 17:06:57 +01:00
Alain Pitiot
e15c05af31 updated copyright date 2020-08-20 13:42:36 +02:00
Alain Pitiot
7732e72c40 updated copyrights 2020-08-20 13:07:39 +02:00
Alain Pitiot
2eb38f0705 _ 2020-08-20 12:02:37 +02:00
Alain Pitiot
6e8f3bf612 revised the attribute mechanisms; various bug fixes and performance improvements 2020-08-20 11:59:56 +02:00
Alain Pitiot
6883ffa0fc
Merge pull request #135 from thewhodidthis/bf#133--seeking 
visual/Movie: add currentTime fallback when video seeking
 2020-08-20 09:41:55 +02:00
Alain Pitiot
6bdc7668a1
Merge pull request #143 from thewhodidthis/bf#116--movie 
core/Window: lose gl extension context before PIXI renderer
 2020-08-20 09:40:26 +02:00
Alain Pitiot
7bcec8394d
Merge pull request #137 from thewhodidthis/bf#2299--csv 
data/TrialHandler: PR#95 follow up decoding .csv conditions imports
 2020-08-20 08:50:01 +02:00
Sotiri Bakagiannis
7ae5d6ad88 visual/ImageStim: fix JSDoc typo 2020-08-18 17:32:02 +01:00
Sotiri Bakagiannis
cd3163b444 core/Window: lose gl extension context before PIXI renderer 2020-08-17 10:43:11 +01:00
Sotiri Bakagiannis
590e9c8e2e visual/MovieStim: DOM clone video baseTexture during setMovie call 
Workaround required because of the way movie status is
updated outside any video playback event listeners.
 2020-08-17 09:43:27 +01:00
Sotiri Bakagiannis
cffabdd0df data/TrialHandler: cleanup PR#95 to do with decoding .csv conditions imports 2020-08-05 15:15:45 +01:00
Sotiri Bakagiannis
7f4cc1eaf4 visual/Movie: add currentTime fallback when seeking 2020-08-05 08:56:58 +01:00
Alain Pitiot
fa39a7bfbc added Form and TextBox; added boundingBox attribute and contains method to VisualStim; various performance improvements to all visual stimuli 2020-08-05 09:32:53 +02:00
Alain Pitiot
640ae93a04
Merge pull request #105 from thewhodidthis/nf#104--mouse 
core/Mouse: add isPressedIn method
 2020-08-03 16:47:32 +02:00
Alain Pitiot
88548e23d8
Merge pull request #100 from thewhodidthis/bf#87--orientation 
visual/VisualStim: flip rotations to reflect psychopy convention
 2020-07-31 16:24:26 +02:00
Alain Pitiot
e3f8e7593c
Merge pull request #119 from thewhodidthis/bf#115--gui 
core/GUI: swap placement of OK/Cancel dialog box buttons
 2020-07-31 16:23:34 +02:00
Alain Pitiot
770d02d156
Merge branch 'master' into nf#121--randint 2020-07-31 16:22:25 +02:00
Alain Pitiot
8bb4753d20
Merge pull request #107 from peircej/master 
BF: allow UK English names for colours. Any others?
 2020-07-31 16:17:45 +02:00
Alain Pitiot
a447a495e5
Merge pull request #129 from thewhodidthis/nf#128--math 
util/Util: add Crib Sheet math extras
 2020-07-31 16:16:29 +02:00
Sotiri Bakagiannis
2088cf75c7 util/Util: add sum helper 2020-07-30 14:57:55 +01:00