1
0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-12 08:38:10 +00:00
Commit Graph

118 Commits

Author SHA1 Message Date
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
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
fde29e1e59 Merge branch 'master' of github.com:psychopy/psychojs 2020-08-20 13:48:28 +02:00
Alain Pitiot
2e9ffae22f change log 2020-08-20 13:48:15 +02:00
Alain Pitiot
e15c05af31 updated copyright date 2020-08-20 13:42:36 +02:00
Alain Pitiot
a3cbc636f8
Merge pull request #147 from psychopy/2020.2
updated README
2020-08-20 13:34:34 +02:00
Alain Pitiot
4c0ee079e9 updated README 2020-08-20 13:23:28 +02:00
Alain Pitiot
c0512f1205 updated to README 2020-08-20 13:21:39 +02:00
Alain Pitiot
7732e72c40 updated copyrights 2020-08-20 13:07:39 +02:00
Alain Pitiot
3d04c899cd updated the documentation 2020-08-20 12:04:19 +02:00
Alain Pitiot
0ccf2b872d added more documentation 2020-08-20 12:02:59 +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
Alain Pitiot
8fa7fdeeab
Merge pull request #145 from thewhodidthis/bf#139--docs
visual/ImageStim: fix JSDoc typo
2020-08-20 08:47:25 +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
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
30cbdf3669
Merge pull request #102 from thewhodidthis/bf#101--css
css: center root pseudo message using tranform/translate
2020-08-03 16:45:42 +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
58947e5fa4
Merge pull request #122 from thewhodidthis/nf#121--randint
util/Util: add NumPy inspired randint method
2020-07-31 16:22:37 +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
Alain Pitiot
394311e650
Merge pull request #112 from thewhodidthis/nf#111--release
core/MinimalStim: add release method
2020-07-31 16:13:21 +02:00
Sotiri Bakagiannis
2088cf75c7 util/Util: add sum helper 2020-07-30 14:57:55 +01:00
Sotiri Bakagiannis
9308989117 util/Util: add round helper 2020-07-30 14:55:28 +01:00
Sotiri Bakagiannis
7fd83d2ead util/Util: fix randint error message 2020-07-28 21:37:24 +01:00
Sotiri Bakagiannis
97542f794a util/Util: line separate the just added function opening brace 2020-07-28 15:18:17 +01:00
Sotiri Bakagiannis
7688f8df92 util/Util: add randint helper 2020-07-28 15:02:32 +01:00
Sotiri Bakagiannis
f4b9717467 core/GUI: swap placement of OK/Cancel dialog box buttons 2020-07-27 12:14:47 +01:00
Sotiri Bakagiannis
5b69621ffa core/MinimalStim: add release method 2020-07-24 17:11:40 +01:00
Sotiri Bakagiannis
e0b7bc8d5b visual/Image/Text/Movie/Shape: call destroy on internal pixi instance before updating across stimulus classes 2020-07-24 17:00:37 +01:00
Sotiri Bakagiannis
30755dbcb2 data/util: add missing semicolons 2020-07-24 15:28:59 +01:00
Sotiri Bakagiannis
cae18a0a3b data/TrialHandler: look for arrays in square brackets when importing conditions 2020-07-24 09:51:05 +01:00
Sotiri Bakagiannis
2a6138e4da util/Util: add turnSquareBracketsIntoArrays helper 2020-07-24 09:51:00 +01:00
Sotiri Bakagiannis
43dedcb7f7 core/Mouse: clean up JSDoc 2020-07-17 16:46:36 +01:00
Sotiri Bakagiannis
2909dabf83 core/Mouse: clean up mostly JSDoc 2020-07-17 15:06:58 +01:00
Sotiri Bakagiannis
460ba1998d core/Mouse: clean up comments 2020-07-17 12:30:15 +01:00
Sotiri Bakagiannis
d023ed3b8c core/Mouse: tweak isPressedIn to cover all types of arguments
Bring in line with PsychoPy by accepting arguments as follows:
(a) mouse.isPressedIn({"shape": myStim, "buttons": 1})
(b) mouse.isPressedIn(myStim, {"buttons": 1})
(c) mouse.isPressedIn(myStim, 1)
2020-07-16 17:21:04 +01:00
Jon Peirce
d3a71cd18d BF: allow UK English names for colours. Any others? 2020-07-16 16:50:28 +01:00
Sotiri Bakagiannis
e37eb5270a core/Mouse: add isPressedIn method 2020-07-14 12:57:20 +01:00
Sotiri Bakagiannis
e72da164ea css: center root pseudo message using tranform/translate
Should work unprefixed down to IE11.
2020-07-07 11:08:07 +01:00