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

Mono Color

• 120060cbab removed unused uniform uMaskTex; lgtst 2022-01-28 18:06:28 +0300
• e4eb6f04c8 sin range chnged to [0, 1] for proper gabor patch; lgtst 2022-01-28 16:13:25 +0300
• bf2c4c44e5
  Merge 5e3bd47b42 into 4fea70f605 #434 Sotiri Bakagiannis 2022-01-26 23:08:22 +0300
• 821725a45e Merge branch 'main' into GratingStim_class_implementation lgtst 2022-01-26 00:32:26 +0300
• e050eaf906 GratingStim implementation first take; lgtst 2022-01-26 00:31:03 +0300
• 3424b24b43 Merge branch '2022.1.0' of github.com:apitiot/psychojs into 2022.1.0 Alain Pitiot 2022-01-25 11:40:44 +0100
• e9ebcba5fb ENH: prepareResources can now be use concurrently, with several batches of resources Alain Pitiot 2022-01-25 11:34:29 +0100
• 57720d6456
  Merge pull request #473 from psychopy/main Alain Pitiot 2022-01-25 11:31:59 +0100
• 4fea70f605
  Merge pull request #472 from peircej/bf-orientation-convention #473 Alain Pitiot 2022-01-25 11:26:25 +0100
• adf8a392fd BF: _pixi.rotation should be set to -this._ori to match PsychoPy (clock) ori #472 Jon Peirce 2022-01-24 17:16:55 +0000
• 16f84872c6 added user-specified filenames, opening and closing of sessions uses gitlab Id in order to benefit from the speed-up provided by the database indexes Alain Pitiot 2022-01-19 11:04:15 +0100
• a0eb577d19 Started Implementing GratingStim; lgtst 2022-01-18 00:57:25 +0300
• aeca039240 estimate of download speed Alain Pitiot 2022-01-14 11:41:29 +0100
• 96903e0266 add linspace to util.js #470 RebeccaHirst 2022-01-06 16:39:08 +0000
• 988d1c69e6
  Merge pull request #468 from apitiot/2022.1.0 Alain Pitiot 2021-12-08 08:16:31 +0100
• 874743105a _ #468 Alain Pitiot 2021-12-07 11:09:07 +0100
• 9e98be0ca2
  Merge pull request #2 from psychopy/2021.3.0 #466 Peiling Jiang 2021-09-30 14:08:07 -0400
• 0be50c3d0b Merge branch 'psychopy-2021.3.0' into 2021.3.0 Peiling Jiang 2021-09-30 14:07:42 -0400
• a1074b97cc merge from psychojs Peiling Jiang 2021-09-30 14:07:32 -0400
• 7e52aa73eb
  Merge pull request #467 from apitiot/2021.3.0 2021.3.0 Alain Pitiot 2021-09-30 10:01:05 +0200
• 2d6f994180
  Merge branch 'psychopy:2021.3.0' into 2021.3.0 #467 Alain Pitiot 2021-09-30 08:23:58 +0200
• 5dbac82d73 various fixed to Slider, add intensity to MultiStairHandler, improved background download of resources, faster TextStim Alain Pitiot 2021-09-30 08:22:47 +0200
• 4146b76046 Added parameter for adding a response to QUEST Augustin Burchell 2021-09-28 13:08:58 -0500
• fdbb2c076a
  Merge pull request #458 from apitiot/2021.3.0 Alain Pitiot 2021-08-30 11:32:38 +0200
• 860cf1f51d much tighter bounding box calculations in TextStim #458 Alain Pitiot 2021-08-30 11:31:31 +0200
• 2f072ebb9f
  Merge pull request #457 from TEParsons/_randchoice Alain Pitiot 2021-08-20 10:03:00 +0200
• 8833043f02 FF: Select random index rather than shuffling and indexing -1 #457 Todd 2021-08-19 16:22:39 +0100
• 146cf55f23 NF: Add util.randchoice to mirror Python Todd 2021-08-16 09:25:56 +0100
• cfeaf3a9e5
  Merge pull request #455 from apitiot/2021.2.3 2021.2.3 Alain Pitiot 2021-08-11 13:18:06 +0200
• 2e64d40501 ServerManager: waiting for completion of media upload #455 Alain Pitiot 2021-08-11 13:12:37 +0200
• 2e0fe28210 BF/PR453: revise to remove obsolete check for undefined #453 Sijia Zhao 2021-08-06 22:54:42 +0100
• d72f23e9fd BF: Check for empty string in completionUrl/cancellationUrl before redirecting Sijia Zhao 2021-08-03 01:21:48 +0100
• cbf475723a ENH: Converted any string values for method to corresponding QuestHandler.Method values Thomas Pronk 2021-07-28 08:45:25 +0200
• 25f8c480a1
  Fail workflow on failed join_reports tpronk 2021-07-27 11:20:52 +0200
• ff9f94865c _ Alain Pitiot 2021-07-26 15:03:06 +0200
• fd0030a8b1
  Merge pull request #446 from apitiot/2021.3.0 Alain Pitiot 2021-07-26 14:41:56 +0200
• 87ff0ea98c
  Merge branch '2021.3.0' into 2021.3.0 #446 Alain Pitiot 2021-07-26 14:41:44 +0200
• 3aea78019d
  Merge pull request #445 from apitiot/2021.2.2 2021.2.2 Alain Pitiot 2021-07-26 14:39:56 +0200
• 574c4b05b3
  Merge branch '2021.2.2' into 2021.2.2 #445 Alain Pitiot 2021-07-26 14:39:49 +0200
• 793e751d32 clean up Alain Pitiot 2021-07-26 14:36:59 +0200
• 9c3c27201d added MultiStairHandler Alain Pitiot 2021-07-26 14:32:09 +0200
• 5e3bd47b42 sound/TonePlayer: use gain to db when instantiating volume node #434 Sotiri Bakagiannis 2021-07-26 12:22:39 +0100
• a814c972aa
  Merge pull request #437 from thewhodidthis/bf435-dialog Alain Pitiot 2021-07-26 13:17:31 +0200
• f2dbead84f
  Merge pull request #443 from thewhodidthis/next next Sotiri Bakagiannis 2021-07-26 06:58:57 +0100
• 50e8d6fe6c Merge branch 'main' into next #443 Sotiri Bakagiannis 2021-07-26 06:00:13 +0100
• 8943dee36b
  Merge pull request #442 from psychopy/2021.2.1 Alain Pitiot 2021-07-23 08:44:39 +0200
• 5ceec31ea3
  Merge pull request #441 from apitiot/master #442 2021.2.1 Alain Pitiot 2021-07-23 08:41:32 +0200
• 798611e91f
  Update package.json Alain Pitiot 2021-07-23 08:39:57 +0200
• dd0c46ccd0 improved documentation for FaceDetector, Camera, and QuestHandler #441 Alain Pitiot 2021-07-23 08:33:09 +0200
• b6125d5b16 polished up QuestHandler, various comestic improvements, small fixes to Camera Alain Pitiot 2021-07-23 08:00:20 +0200
• 8ed91c97d9
  Merge pull request #2 from psychopy/main Alain Pitiot 2021-07-23 07:44:06 +0200
• 7975dd8df0
  Merge branch 'master' into main Alain Pitiot 2021-07-23 07:42:29 +0200
• 2ef144d598 git: ignore lib folder Sotiri Bakagiannis 2021-07-22 08:14:51 +0100
• 636506e43e css: override ui-dialog element inline styles, use percentage height on body #437 Sotiri Bakagiannis 2021-07-15 19:48:38 +0100
• 0a7d15077c added a first prototype of the Quest Trial Handler Alain Pitiot 2021-07-14 14:52:03 +0200
• d21e70bb6d sound/TonePlayer: impose limits and more accurately map gain to db for Tone.js Sotiri Bakagiannis 2021-07-14 12:19:55 +0100
• 9992bbde93 util/Pixi: import missing Util.to_px 2021.2.0 Sotiri Bakagiannis 2021-07-14 11:07:34 +0100
• 86cbc73c94 added FaceDetector with linking to MovieStim, little fixed here and there Alain Pitiot 2021-07-12 08:54:13 +0200
• f96cff27d3 core: format #432 Sotiri Bakagiannis 2021-07-09 14:09:14 +0100
• 27d08ba42f data: enforce formatting rules Sotiri Bakagiannis 2021-07-09 14:08:08 +0100
• 5468898716 sound: enforce formatting rules Sotiri Bakagiannis 2021-07-09 14:07:55 +0100
• 57a590c536 util: enforce formatting rules Sotiri Bakagiannis 2021-07-09 14:07:40 +0100
• c9cb3c8412 visual: enforce consistent formatting Sotiri Bakagiannis 2021-07-09 14:07:04 +0100
• 61fb7744a1 dprint: prefer double quotes only if it makes sense Sotiri Bakagiannis 2021-07-09 14:06:22 +0100
• 6c92771864
  Merge pull request #431 from thewhodidthis/main Sotiri Bakagiannis 2021-07-09 13:51:30 +0100
• 67873dabd4 visual: fix import paths #431 Sotiri Bakagiannis 2021-07-09 13:50:36 +0100
• 7f6b37d720 sound: fix import paths Sotiri Bakagiannis 2021-07-09 13:47:36 +0100
• 24f43ccbbb data: fix import paths Sotiri Bakagiannis 2021-07-09 13:45:56 +0100
• 904c6e216d core: fix import paths Sotiri Bakagiannis 2021-07-09 13:44:22 +0100
• 9d37366d5d util: fix import paths Sotiri Bakagiannis 2021-07-09 13:12:54 +0100
• 74385b7325
  Merge pull request #430 from thewhodidthis/main Sotiri Bakagiannis 2021-07-09 13:01:29 +0100
• 6b856e99c3 util/Util: add more unit tests #430 Sotiri Bakagiannis 2021-07-09 13:00:55 +0100
• 0d5cda24c7
  Merge pull request #429 from thewhodidthis/main Sotiri Bakagiannis 2021-07-09 12:35:49 +0100
• a5dbe83a3d util/visual: separate out PIXI specific util and adjust imports #429 Sotiri Bakagiannis 2021-07-09 12:34:06 +0100
• 044642c4c5
  Merge f38b0b757a into 6147cdbb8a #424 Sotiri Bakagiannis 2021-07-09 09:46:19 +0100
• 6147cdbb8a
  Merge pull request #428 from thewhodidthis/bf#427--numeric Sotiri Bakagiannis 2021-07-09 08:48:13 +0100
• 4a94508c46 util/Util: add toNumeric unit test #428 Sotiri Bakagiannis 2021-07-09 08:47:20 +0100
• f38b0b757a Merge branch 'main' into bf#297--keys #424 Sotiri Bakagiannis 2021-07-09 07:55:57 +0100
• 68333826d5 Merge branch 'main' into bf#427--numeric Sotiri Bakagiannis 2021-07-09 07:55:17 +0100
• a8c4b46ae8 scripts: fix for dprint Sotiri Bakagiannis 2021-07-09 07:54:03 +0100
• 3d635cc355 package: add fmt script Sotiri Bakagiannis 2021-07-09 07:50:50 +0100
• f6bd9b9448 package: add dprint config Sotiri Bakagiannis 2021-07-09 07:49:31 +0100
• 8e01f3f7e6 package: add dprint Sotiri Bakagiannis 2021-07-09 07:48:59 +0100
• 898e2b5749 eslint: tweak config Sotiri Bakagiannis 2021-07-09 07:47:08 +0100
• 1eecdfda5d readme: clean up Sotiri Bakagiannis 2021-07-09 07:37:53 +0100
• b02d907964 sound/TonePlayer: replace $.isNumeric Sotiri Bakagiannis 2021-07-08 17:52:36 +0100
• c2b38cb550 util/Util: add custom isNumeric func Sotiri Bakagiannis 2021-07-08 17:52:12 +0100
• 2202173bbc
  Merge pull request #396 from thewhodidthis/bf#384--text-input Sotiri Bakagiannis 2021-07-08 14:44:50 +0100
• b1af859427 Merge branch 'main' into bf#384--text-input #396 Sotiri Bakagiannis 2021-07-08 14:44:06 +0100
• ae1ef5fcce
  Merge e9bf754382 into 6211e606dd #398 Sotiri Bakagiannis 2021-07-07 16:45:50 +0200
• 850f04e7ba
  Merge a4b24145a8 into 6211e606dd #399 tpronk 2021-07-07 16:45:38 +0200
• 6211e606dd
  Update package.json Alain Pitiot 2021-07-07 16:11:35 +0200
• ebc128a2b6
  Merge pull request #420 from thewhodidthis/bf#209+210--css Sotiri Bakagiannis 2021-07-07 14:58:11 +0100
• d9c5aac1c4
  Merge pull request #426 from thewhodidthis/bf#425--clock Sotiri Bakagiannis 2021-07-07 14:43:15 +0100
• 966e7a5b39 core/ServerManager: do import Clock #426 Sotiri Bakagiannis 2021-07-07 14:42:34 +0100
• bac9731885 core/EventManager: expand pyglet key mappings Sotiri Bakagiannis 2021-07-06 01:47:56 +0100
• 72baa6f64b
  Merge pull request #423 from apitiot/master Alain Pitiot 2021-06-25 08:24:06 +0200
• 7e63f88aa4 _ #423 Alain Pitiot 2021-06-25 08:23:09 +0200
• d44919c75c
  Merge pull request #422 from apitiot/master Alain Pitiot 2021-06-25 07:43:15 +0200
• d8283885c5
  Merge branch 'psychopy:main' into master #422 Alain Pitiot 2021-06-25 07:39:31 +0200