psychojs

HoshinoKoji/psychojs

Fork 0

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

Commit Graph

Select branches

Hide Pull Requests

2020.1

2020.2

2021.1.0

2021.2.0

2021.2.1

2021.2.2

2021.2.3

2021.3.0

2022.1.0

2022.1.1

2022.1.2

2022.1.3

2022.2.0

2022.2.3

2022.2.4

2022.2.5

2022.3.0

2022.x

2023.1.0

2023.1.1

2023.1.2

2023.1.3

2023.2

2023.2.0

2023.2.1

2023.2.2

2023.2.3

2023.2.4

2024.1.0

2024.2.0

2024.2.x

3.1.4

3.1.5

CU-2j4rb2p_gif_support

CU-862j0cfkw_iphone_video_fix

background_image_support_for_psychojswindow

button_improvements

dependabot/npm_and_yarn/ansi-regex-5.0.1

dependabot/npm_and_yarn/glob-parent-5.1.2

dependabot/npm_and_yarn/markdown-it-and-jsdoc-12.3.2

dependabot/npm_and_yarn/marked-and-jsdoc-4.2.4

dependabot/npm_and_yarn/minimatch-3.1.2

dotstim

imagestim_missing_size_dimension_handling

iphone_video

main

multitouch

next

psychojs_window_bg_image

update_github_actions

youtube_support_for_moviestim

#10

#100

#102

#103

#105

#107

#109

#11

#110

#112

#119

#122

#125

#127

#129

#135

#137

#141

#143

#145

#146

#147

#149

#151

#152

#154

#156

#158

#162

#163

#164

#166

#177

#178

#180

#181

#188

#192

#194

#201

#203

#204

#207

#208

#212

#216

#221

#223

#229

#232

#236

#240

#243

#245

#247

#248

#248

#249

#250

#251

#252

#254

#255

#258

#258

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#271

#274

#276

#277

#278

#281

#282

#285

#292

#296

#302

#303

#305

#307

#308

#309

#317

#320

#324

#325

#326

#327

#330

#332

#333

#337

#338

#340

#342

#344

#345

#349

#350

#351

#352

#353

#354

#355

#358

#359

#361

#363

#365

#368

#372

#375

#376

#376

#378

#381

#382

#385

#387

#389

#390

#391

#392

#393

#394

#396

#398

#398

#399

#399

#400

#402

#403

#405

#406

#412

#414

#415

#417

#418

#420

#422

#423

#424

#424

#426

#428

#429

#430

#431

#432

#434

#434

#437

#441

#442

#443

#445

#446

#45

#453

#455

#457

#458

#46

#466

#467

#468

#47

#470

#472

#473

#474

#475

#478

#479

#481

#482

#483

#484

#485

#485

#486

#486

#487

#488

#489

#490

#491

#492

#493

#494

#496

#497

#498

#499

#500

#501

#502

#503

#503

#504

#505

#506

#507

#508

#509

#510

#511

#511

#512

#513

#514

#515

#516

#517

#518

#519

#520

#521

#522

#523

#524

#525

#527

#527

#528

#529

#530

#531

#532

#533

#534

#535

#535

#536

#537

#539

#539

#540

#540

#541

#542

#543

#544

#545

#545

#546

#546

#547

#548

#549

#550

#551

#552

#553

#554

#555

#556

#558

#559

#562

#566

#566

#567

#568

#569

#570

#573

#574

#575

#576

#577

#578

#579

#580

#581

#581

#582

#583

#586

#588

#589

#589

#591

#592

#592

#593

#594

#595

#596

#596

#597

#597

#598

#599

#60

#600

#601

#602

#602

#604

#604

#607

#607

#608

#609

#609

#62

#7

#8

#8

#86

#9

#90

#93

#95

#99

18d91222e0

Merge 167ccb784a into 9265fd8502 #609 jalfje 2025-03-28 03:08:25 +0000
167ccb784a

ImageStim: Prevent unhandled exception when setting image to undefined #609 jalfje 2025-03-27 19:56:05 -0700
b60e6d20ce BF: Handle when Sound.setSound is given a value rather than a Sound object #608 TEParsons 2025-02-19 16:52:53 +0000
adcd480029

Merge 3052ab4cee into 74111a894f #607 Todd Parsons 2025-02-06 11:55:46 +0000
3052ab4cee BF: Import Clock utils in core for parity with PsychoPy #607 TEParsons 2025-02-06 11:51:23 +0000
764d24cdf8

Merge 4cab3a8eb5 into 9265fd8502 #589 Patrick Bolger 2024-11-21 14:04:06 +0000
4bbb7a596f

Merge 5b39b2ef0c into 9265fd8502 #604 Alexanda 2024-10-28 14:41:15 +0000
5b39b2ef0c

Fix two issues of Button component #604 Alexanda 2024-10-28 22:24:42 +0800
996686403d

Merge 6acaac8064 into 9265fd8502 #602 Todd Parsons 2024-09-19 10:11:16 +0100
6acaac8064 PAR: Mirror the Clock.addTime function from PsychoPy #602 TEParsons 2024-09-19 10:10:07 +0100
52293cff0c

Merge d124306b6b into 9265fd8502 #535 stefan-f-bucher 2024-08-30 21:40:10 +0200
9265fd8502

Merge pull request #601 from psychopy/2024.2.0 main Alain Pitiot 2024-07-29 14:18:31 +0200
8eaf673081

Merge pull request #600 from apitiot/2024.2.0 #601 2024.2.0 Alain Pitiot 2024-07-29 14:17:30 +0200
2ccc301f4d

Merge pull request #599 from apitiot/2024.1.0 2024.1.0 Alain Pitiot 2024-07-29 14:16:02 +0200
a0181b70ce DOC: updated the headers and the docs #600 Alain Pitiot 2024-07-29 13:58:08 +0200
b366e6a872 NF: Simple Stair Handler Alain Pitiot 2024-07-29 11:34:11 +0200
da5e08473e ENH: If exit message is specified, don't prepend "Thank you for your patience #598 TEParsons 2024-06-07 14:40:23 +0100
8a6209b302 corrected issue with saving of partial results #599 Alain Pitiot 2024-05-21 14:20:48 +0200
130aaccb1a

Merge cc01fe3c39 into 702cbc57b0 #539 Todd Parsons 2024-05-16 13:30:10 +0100
a99191321f

Merge f7af329a28 into 74111a894f #597 Nikita Agafonov 2024-04-16 17:05:18 +0000
f7af329a28 multiline caption support with proper alignment within the button. #597 button_improvements lightest 2024-04-16 18:05:11 +0100
6c85a2056d properly organized button pt1. lightest 2024-04-11 20:33:17 +0100
ff43ba400d fixed issue with field options, e.g. |cfg, in GUI Alain Pitiot 2024-04-04 18:29:40 +0200
9232477962

Merge f42d806f76 into 74111a894f #596 Nikita Agafonov 2024-04-03 22:50:18 +0000
f42d806f76 texture instantiation moved back to update method. #596 iphone_video lightest 2024-04-03 23:48:29 +0100
328cb54d53 merge with 2024.2.0 #556 CU-862j0cfkw_iphone_video_fix lightest 2024-04-03 21:28:36 +0100
51674ab073 various fixes and feature improvements Alain Pitiot 2024-04-01 08:51:27 +0200
74111a894f

Merge pull request #574 from psychopy/youtube_support_for_moviestim #593 2024.2.x Nikita Agafonov 2024-03-29 21:00:52 +0000
b45d8d7e3c minor corrections. #574 youtube_support_for_moviestim lightest 2024-03-29 20:59:23 +0000
a897cf5945 merge with 2024.2.0 lightest 2024-03-29 19:33:29 +0000
2788379a6f verbump and proper test_experiment.js ignore lightest 2024-03-29 02:51:14 +0000
b43a16ac1e

Merge pull request #573 from psychopy/imagestim_missing_size_dimension_handling Nikita Agafonov 2024-03-29 02:38:48 +0000
122c84d9fe

Merge pull request #595 from psychopy/psychojs_window_bg_image Nikita Agafonov 2024-03-29 01:50:55 +0000
4132708ee0 test_experiment correction. #595 psychojs_window_bg_image background_image_support_for_psychojswindow lightest 2024-03-29 01:38:10 +0000
8062a55029 merge with 2024.2.0 lightest 2024-03-29 01:25:12 +0000
d24b8cbb9d sync lightest 2024-03-29 00:53:37 +0000
2de53fcf44

Merge pull request #594 from psychopy/multitouch Nikita Agafonov 2024-03-28 21:26:14 +0000
9dc0fa185b merge with 2024.2.0 #594 multitouch lightest 2024-03-28 20:55:42 +0000
465dcec620

Merge pull request #516 from lightest/CU-2j4rb2p_gif_support Nikita Agafonov 2024-03-28 20:20:19 +0000
d794804437 added custom setSize for gifstim, added resources for tests #516 CU-2j4rb2p_gif_support lightest 2024-03-28 20:12:53 +0000
8535396eee removed unused code from gif parser lightest 2024-03-28 16:06:12 +0000
58063a2645 Merge branch '2024.2.0' into CU-2j4rb2p_gif_support lightest 2024-03-28 15:41:09 +0000
a8076a1cdf merge with main lightest 2024-03-28 15:39:53 +0000
643b33cf27

Merge 2d5210e453 into a89346dd14 #592 Nikita Agafonov 2024-03-22 23:36:14 +0000
2d5210e453 added size update. #592 dotstim lightest 2024-03-22 23:36:08 +0000
3ebd48eb70 added coherence support. shape of dots changed to circles. lightest 2024-03-22 23:16:18 +0000
ce639a11f0 added basic motion, bounds check and proper screen resize support. lightest 2024-03-21 20:29:16 +0000
1efeff268e added proper dot lifecycle update for sqr and circle fields. lightest 2024-03-21 03:22:50 +0000
9308bacbfd dot stim beginngins lightest 2024-03-15 00:18:39 +0000
a89346dd14 proper test experiment library imports. #591 lightest 2024-03-13 16:24:27 +0000
d19718a109 added vite build environment lightest 2024-03-13 16:19:01 +0000
85989743bb

Merge 6c7e8cf29f into 702cbc57b0 #566 Eitan Hemed 2024-02-04 13:33:25 +0200
4cab3a8eb5 codesprint announcment on readme #589 Patrick Bolger 2024-01-12 10:37:50 +0000
c3a2b4b9f6 progress with partial saving of results Alain Pitiot 2024-01-03 09:35:14 +0100
702cbc57b0

Merge pull request #588 from psychopy/2023.2.4 Alain Pitiot 2024-01-02 15:56:46 +0100
b52bd9f9f9

Merge branch 'main' into 2023.2.4 #588 2023.2.4 Alain Pitiot 2024-01-02 15:55:50 +0100
ffc2255405 ENH: Add onFinished handling to Counterbalancer (some methods unimplemented) #586 Todd Parsons 2023-10-23 13:48:07 +0100
dffdfb3b2e NF: Counterbalancer object Todd Parsons 2023-10-05 14:50:51 +0100
273cfc6cbe

Merge pull request #583 from apitiot/2023.2.3 2023.2.3 Alain Pitiot 2023-09-26 15:45:55 +0200
5c6408e1da _ #583 Alain Pitiot 2023-09-26 15:43:11 +0200
0c53ce4ddb

Merge 1559de0c2f into 2bad0b34f1 #485 dependabot[bot] 2023-09-26 11:35:05 +0100
6188d89cee

Merge b7533edb33 into 2bad0b34f1 #540 dependabot[bot] 2023-09-03 09:44:02 -0700
69f6ac32ef

Merge a0da4bd575 into 2bad0b34f1 #545 dependabot[bot] 2023-09-03 09:44:02 -0700
7a996d505a

Merge 378ec60de8 into 2bad0b34f1 #546 dependabot[bot] 2023-09-03 09:44:02 -0700
8a6b635b8f

Merge pull request #582 from apitiot/2023.2.2 2023.2.2 Alain Pitiot 2023-09-01 15:25:22 +0300
86bdf74e98

Merge f6afa658f0 into 2bad0b34f1 #581 Todd Parsons 2023-08-31 11:51:52 +0000
f6afa658f0 Splice rather than pop to remove values when replace is false #581 Todd Parsons 2023-08-31 12:50:01 +0100
4cacf0c71d Remove value from weights too if replace is false Todd Parsons 2023-08-31 12:43:28 +0100
bfbcf72c56 Fully alias numpy.random.choice Todd Parsons 2023-08-31 12:32:08 +0100
c0cab86f3e Add replace to randchoice Todd Parsons 2023-08-31 12:10:18 +0100
cd8e06c6ff Typo Todd Parsons 2023-08-31 12:09:14 +0100
5d7528264e Add size to randchoice Todd Parsons 2023-08-31 12:00:38 +0100
03170471f0 Document size param Todd Parsons 2023-08-31 11:59:47 +0100
449ac750a7 Random consistent with randint for handling size Todd Parsons 2023-08-31 11:56:24 +0100
5e25a00189 Placeholder alias for numpy.random.normal Todd Parsons 2023-08-31 11:52:22 +0100
945ef6b7f5 Move random functions together Todd Parsons 2023-08-31 11:50:29 +0100
7f7b791837 Fully alias numpy.random.randint Todd Parsons 2023-08-31 11:49:37 +0100
2343a2705c Alias numpy.random.random Todd Parsons 2023-08-31 11:36:12 +0100
2bad0b34f1

Update main.yml Nikita Agafonov 2023-08-29 15:56:08 +0100
c0ae77d55c

Update main.yml Nikita Agafonov 2023-08-29 15:52:32 +0100
1cd6c336ff

Update main.yml Nikita Agafonov 2023-08-29 15:50:02 +0100
b7b7019406

Update main.yml Nikita Agafonov 2023-08-29 15:46:15 +0100
98da2ef3e6

Update main.yml Nikita Agafonov 2023-08-29 15:40:08 +0100
60452d149f

Update main.yml Nikita Agafonov 2023-08-29 15:35:47 +0100
3575cfd5b5

Update main.yml Nikita Agafonov 2023-08-29 15:27:37 +0100
fc14ca2b4d

Update main.yml Nikita Agafonov 2023-08-29 14:51:27 +0100
9f68f112ec

Update main.yml Nikita Agafonov 2023-08-29 14:49:32 +0100
30b53c5674

Merge pull request #580 from psychopy/workflow_test2 Nikita Agafonov 2023-08-29 14:44:01 +0100
4e848b03c9

Create main.yml #580 Nikita Agafonov 2023-08-29 14:43:18 +0100
d1ccc86c1b

Merge pull request #579 from psychopy/gh_actions_experiments 2023.2.1 2023.2 Nikita Agafonov 2023-08-29 14:20:28 +0100
376f03537b working on workflows #579 lightest 2023-08-29 14:17:05 +0100
ee2a20be4b

Merge pull request #578 from psychopy/gh_actions_experiments Nikita Agafonov 2023-08-29 14:16:01 +0100
6c3fcfa99d working on workflows. #578 lightest 2023-08-29 14:13:50 +0100
d7abfc267d working on gh actions. lightest 2023-08-29 14:10:09 +0100
8ffeee3c66

Merge pull request #577 from psychopy/workflow_test Nikita Agafonov 2023-08-29 14:01:59 +0100
4ab2af527f

Testing workflows #577 Nikita Agafonov 2023-08-29 14:01:13 +0100
10df4a71b3

Merge pull request #7 from psychopy/2023.2.1 #582 Alain Pitiot 2023-08-24 10:04:45 +0200
da0077f7b2

Merge pull request #576 from psychopy/progressbar_improvements Nikita Agafonov 2023-08-23 23:12:14 +0100
2688e8e3e0 Proper rendering for progress bar. #576 lightest 2023-08-23 23:08:37 +0100
ebf71cea18 Added proper coverage for cases with multiple movie stims try to access youtube. Proper positioning and volume applications. lightest 2023-08-11 18:00:16 +0100