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

882 Commits

Author SHA1 Message Date
lightest
328cb54d53 merge with 2024.2.0 2024-04-03 21:28:36 +01:00
Nikita Agafonov
74111a894f
Merge pull request #574 from psychopy/youtube_support_for_moviestim
Youtube support for moviestim.
2024-03-29 21:00:52 +00:00
lightest
b45d8d7e3c minor corrections. 2024-03-29 20:59:23 +00:00
lightest
a897cf5945 merge with 2024.2.0 2024-03-29 19:33:29 +00:00
lightest
2788379a6f verbump and proper test_experiment.js ignore 2024-03-29 02:51:14 +00:00
Nikita Agafonov
b43a16ac1e
Merge pull request #573 from psychopy/imagestim_missing_size_dimension_handling
ImageStim missing size dimension derivation mechanics.
2024-03-29 02:38:48 +00:00
Nikita Agafonov
122c84d9fe
Merge pull request #595 from psychopy/psychojs_window_bg_image
Psychojs window bg image support
2024-03-29 01:50:55 +00:00
lightest
4132708ee0 test_experiment correction. 2024-03-29 01:38:10 +00:00
lightest
8062a55029 merge with 2024.2.0 2024-03-29 01:25:12 +00:00
lightest
d24b8cbb9d sync 2024-03-29 00:53:37 +00:00
Nikita Agafonov
2de53fcf44
Merge pull request #594 from psychopy/multitouch
Multitouch support
2024-03-28 21:26:14 +00:00
lightest
9dc0fa185b merge with 2024.2.0 2024-03-28 20:55:42 +00:00
Nikita Agafonov
465dcec620
Merge pull request #516 from lightest/CU-2j4rb2p_gif_support
Gif support
2024-03-28 20:20:19 +00:00
lightest
d794804437 added custom setSize for gifstim, added resources for tests 2024-03-28 20:12:53 +00:00
lightest
8535396eee removed unused code from gif parser 2024-03-28 16:06:12 +00:00
lightest
58063a2645 Merge branch '2024.2.0' into CU-2j4rb2p_gif_support 2024-03-28 15:41:09 +00:00
lightest
a8076a1cdf merge with main 2024-03-28 15:39:53 +00:00
lightest
a89346dd14 proper test experiment library imports. 2024-03-13 16:24:27 +00:00
lightest
d19718a109 added vite build environment 2024-03-13 16:19:01 +00:00
Alain Pitiot
702cbc57b0
Merge pull request #588 from psychopy/2023.2.4
Merge 2023.2.4 into main
2024-01-02 15:56:46 +01:00
Alain Pitiot
b52bd9f9f9
Merge branch 'main' into 2023.2.4 2024-01-02 15:55:50 +01:00
Alain Pitiot
273cfc6cbe
Merge pull request #583 from apitiot/2023.2.3
_
2023-09-26 15:45:55 +02:00
Alain Pitiot
5c6408e1da _ 2023-09-26 15:43:11 +02:00
Alain Pitiot
8a6b635b8f
Merge pull request #582 from apitiot/2023.2.2
Merge pull request #7 from psychopy/2023.2.1
2023-09-01 15:25:22 +03:00
Nikita Agafonov
2bad0b34f1
Update main.yml 2023-08-29 15:56:08 +01:00
Nikita Agafonov
c0ae77d55c
Update main.yml 2023-08-29 15:52:32 +01:00
Nikita Agafonov
1cd6c336ff
Update main.yml 2023-08-29 15:50:02 +01:00
Nikita Agafonov
b7b7019406
Update main.yml 2023-08-29 15:46:15 +01:00
Nikita Agafonov
98da2ef3e6
Update main.yml 2023-08-29 15:40:08 +01:00
Nikita Agafonov
60452d149f
Update main.yml 2023-08-29 15:35:47 +01:00
Nikita Agafonov
3575cfd5b5
Update main.yml 2023-08-29 15:27:37 +01:00
Nikita Agafonov
fc14ca2b4d
Update main.yml 2023-08-29 14:51:27 +01:00
Nikita Agafonov
9f68f112ec
Update main.yml 2023-08-29 14:49:32 +01:00
Nikita Agafonov
30b53c5674
Merge pull request #580 from psychopy/workflow_test2
Create main.yml
2023-08-29 14:44:01 +01:00
Nikita Agafonov
4e848b03c9
Create main.yml 2023-08-29 14:43:18 +01:00
Nikita Agafonov
d1ccc86c1b
Merge pull request #579 from psychopy/gh_actions_experiments
working on workflows
2023-08-29 14:20:28 +01:00
lightest
376f03537b working on workflows 2023-08-29 14:17:05 +01:00
Nikita Agafonov
ee2a20be4b
Merge pull request #578 from psychopy/gh_actions_experiments
Gh actions experiments
2023-08-29 14:16:01 +01:00
lightest
6c3fcfa99d working on workflows. 2023-08-29 14:13:50 +01:00
lightest
d7abfc267d working on gh actions. 2023-08-29 14:10:09 +01:00
Nikita Agafonov
8ffeee3c66
Merge pull request #577 from psychopy/workflow_test
Testing workflows
2023-08-29 14:01:59 +01:00
Nikita Agafonov
4ab2af527f
Testing workflows 2023-08-29 14:01:13 +01:00
Alain Pitiot
10df4a71b3
Merge pull request #7 from psychopy/2023.2.1
2023.2.1
2023-08-24 10:04:45 +02:00
Nikita Agafonov
da0077f7b2
Merge pull request #576 from psychopy/progressbar_improvements
Progress bar bugfix.
2023-08-23 23:12:14 +01:00
lightest
2688e8e3e0 Proper rendering for progress bar. 2023-08-23 23:08:37 +01:00
lightest
ebf71cea18 Added proper coverage for cases with multiple movie stims try to access youtube. Proper positioning and volume applications. 2023-08-11 18:00:16 +01:00
Alain Pitiot
aabd9fd43d
Merge pull request #575 from apitiot/2023.2.1
updated package.json
2023-08-11 16:40:38 +02:00
Alain Pitiot
af6e9ab2a7 updated package.json 2023-08-11 16:39:03 +02:00
lightest
6e03ccfea9 youtube support for moviestim. 2023-07-28 15:28:14 +01:00
lightest
c4761ff1ae missing size dimension derivation mechanics. 2023-07-28 15:20:32 +01:00