Code

Update from upstream#1

Code

Open

hyruuk wants to merge 213 commits intodev_inscapesMEGhyruuk/task_stimuli:dev_inscapesMEGfrom masterhyruuk/task_stimuli:masterCopy head branch name to clipboard

+13,143-978

Commits

Commits on Feb 4, 2019

• hope that this sticks

  

  courtois-neuromod-machine

  committed
  1223246

  Copy full SHA for 1223246

Commits on Feb 6, 2019

• Merge branch 'master' into mri_laptop

  

  courtois-neuromod-machine

  committed
  97d4f19

  Copy full SHA for 97d4f19

Commits on Feb 8, 2019

• Merge branch 'master' into mri_laptop

  

  courtois-neuromod-machine

  committed
  a1fc0d8

  Copy full SHA for a1fc0d8

• switch to audio filtered videos

  

  courtois-neuromod-machine

  committed
  a3bd270

  Copy full SHA for a3bd270

Commits on Feb 11, 2019

• Merge branch 'master' into mri_laptop

  

  courtois-neuromod-machine

  committed
  39dada1

  Copy full SHA for 39dada1

• Merge branch 'master' into mri_laptop

  

  courtois-neuromod-machine

  committed
  70e66f7

  Copy full SHA for 70e66f7

• use inscapes filtered

  

  courtois-neuromod-machine

  committed
  7df1db3

  Copy full SHA for 7df1db3

Commits on Nov 11, 2019

• Merge branch 'master' into mri_laptop

  

  courtois-neuromod-machine

  committed
  c437ab9

  Copy full SHA for c437ab9

Commits on Dec 16, 2019

• add friends-s2

  bpinsard

  committed
  eda4afb

  Copy full SHA for eda4afb

Commits on Dec 19, 2019

• check if power is plugged in at startup, to avoid any failed scans due to laptop shutdown

  bpinsard

  committed
  4826c76

  Copy full SHA for 4826c76

Commits on Feb 27, 2020

• working on eyetracking automatization

  bpinsard

  committed
  9e709dd

  Copy full SHA for 9e709dd

• working on push-to-talk function

  bpinsard

  committed
  c3d1958

  Copy full SHA for c3d1958

• friends s3

  bpinsard

  committed
  80566ac

  Copy full SHA for 80566ac

• test session for audio video sync

  bpinsard

  committed
  dc566e4

  Copy full SHA for dc566e4

• code to check if laptop is plugged on power outlet

  bpinsard

  committed
  23ee331

  Copy full SHA for 23ee331

• switch to MovieStim2 due to video lags in MovieStim3

  bpinsard

  committed
  be4950f

  Copy full SHA for be4950f

Commits on Mar 4, 2020

• avoid clearing buffer for videos

  bpinsard

  committed
  130c79f

  Copy full SHA for 130c79f

• changetoptt

  bpinsard

  committed
  d4ed142

  Copy full SHA for d4ed142

• large restructuration of the code to make it cleaner

  bpinsard

  committed
  26cc65f

  Copy full SHA for 26cc65f

Commits on Mar 5, 2020

• fixes following the major restructuring

  bpinsard

  committed
  f6b8487

  Copy full SHA for f6b8487

Commits on Mar 6, 2020

• wip: polishing eyetracker client

  bpinsard

  committed
  df86c85

  Copy full SHA for df86c85

Commits on Mar 9, 2020

• save eye video for tests

  bpinsard

  committed
  7beb378

  Copy full SHA for 7beb378

• un-annex stuff!!

  bpinsard

  committed
  f55677f

  Copy full SHA for f55677f

• un-annex stuff!!

  bpinsard

  committed
  561c76f

  Copy full SHA for 561c76f

• un-annex stuff!!

  bpinsard

  committed
  5c82824

  Copy full SHA for 5c82824

• unannex

  bpinsard

  committed
  fb967ba

  Copy full SHA for fb967ba

• unannex

  bpinsard

  committed
  fa298ad

  Copy full SHA for fa298ad

• tabarnakkkkkkkkkkkkkk

  bpinsard

  committed
  51d4e79

  Copy full SHA for 51d4e79

• remove git-annex shit

  bpinsard

  committed
  444a940

  Copy full SHA for 444a940

• git-annex wtf happened

  bpinsard

  committed
  68f8b15

  Copy full SHA for 68f8b15

• Merge branch 'master' into dev

  bpinsard

  committed
  120efee

  Copy full SHA for 120efee

• remove git-nan

  bpinsard

  committed
  e946ece

  Copy full SHA for e946ece

• trying for 1h to fix git-annex mess

  bpinsard

  committed
  cc54585

  Copy full SHA for cc54585

• delete

  bpinsard

  committed
  56e3985

  Copy full SHA for 56e3985

• readd files

  bpinsard

  committed
  2cd6067

  Copy full SHA for 2cd6067

• fix battery checking when using desktop

  bpinsard

  committed
  50eb931

  Copy full SHA for 50eb931

Commits on Mar 10, 2020

• add profiling option to improve perfs

  bpinsard

  committed
  1d7ddbe

  Copy full SHA for 1d7ddbe

• profiling and bug fix

  bpinsard

  committed
  32670b8

  Copy full SHA for 32670b8

Commits on Mar 13, 2020

• fix eyetracking issues

  

  unf

  committed
  22b5d6c

  Copy full SHA for 22b5d6c

Commits on Sep 5, 2020

• add a new class for looping on set of videogame levels

  bpinsard

  committed
  f93ece8

  Copy full SHA for f93ece8

Commits on Sep 7, 2020

• add session script for 3 shinobi levels looping

  bpinsard

  committed
  d045a74

  Copy full SHA for d045a74

Commits on Sep 8, 2020

• Merge branch 'master' into mri_laptop

  bpinsard

  committed
  b003377

  Copy full SHA for b003377

Commits on Sep 9, 2020

• restructuring, improve video games

  bpinsard

  committed
  7513466

  Copy full SHA for 7513466

Commits on Sep 11, 2020

• refactor videogame code and optimize to avoid lags

  bpinsard

  committed
  ce5412e

  Copy full SHA for ce5412e

Commits on Sep 14, 2020

• add pause to shinobi

  bpinsard

  committed
  be0b366

  Copy full SHA for be0b366

• change doc for CLI changes

  bpinsard

  committed
  edeb924

  Copy full SHA for edeb924

• display initial frame and soundblock

  bpinsard

  committed
  bf1c273

  Copy full SHA for bf1c273

Commits on Sep 15, 2020

• code basic likert scale for games self-eval during scan

  bpinsard

  committed
  953f3a6

  Copy full SHA for 953f3a6

Commits on Sep 16, 2020

• remove autolog from likerts stimuli

  bpinsard

  committed
  b879a0e

  Copy full SHA for b879a0e

Commits on Sep 18, 2020

• bunch of changes before covid, need to merge with all changes done on different computers

  

  unf

  committed
  d5764e3

  Copy full SHA for d5764e3

• merge

  

  unf

  committed
  17eac23

  Copy full SHA for 17eac23

• Merge branch 'dev' of github.com:courtois-neuromod/task_stimuli into dev

  bpinsard

  committed
  57ed4d1

  Copy full SHA for 57ed4d1

Commits on Sep 21, 2020

• coding videogame questionaire.

  bpinsard

  committed
  a93e6f3

  Copy full SHA for a93e6f3

Commits on Oct 1, 2020

• wip

  bpinsard

  committed
  f30c876

  Copy full SHA for f30c876

Commits on Oct 5, 2020

• fix vg sizing issues

  bpinsard

  committed
  b28bdd9

  Copy full SHA for b28bdd9

• cleanup

  bpinsard

  committed
  a35cfa5

  Copy full SHA for a35cfa5

Commits on Oct 6, 2020

• pass parsed params to sessions task loading for emotions/prisme and code neuromod emotion session

  bpinsard

  committed
  0a1ddac

  Copy full SHA for 0a1ddac

Commits on Oct 8, 2020

• cleanup

  bpinsard

  committed
  45e6af9

  Copy full SHA for 45e6af9

• fix button presses buffer clearing between runs

  bpinsard

  committed
  5c3127c

  Copy full SHA for 5c3127c

• config for new projector

  

  courtois-neuromod-machine

  committed
  c387319

  Copy full SHA for c387319

• config for new projector

  

  courtois-neuromod-machine

  committed
  4c358af

  Copy full SHA for 4c358af

• Merge branch 'master' into mri_laptop

  

  courtois-neuromod-machine

  committed
  9ea44ee

  Copy full SHA for 9ea44ee

Commits on Oct 9, 2020

• fix set/unset game handler

  bpinsard

  committed
  3aa1e8e

  Copy full SHA for 3aa1e8e

• tests

  

  unf

  committed
  39b107c

  Copy full SHA for 39b107c

• merge

  

  unf

  committed
  d52f8ac

  Copy full SHA for d52f8ac

Commits on Oct 20, 2020

• difference in python libs/versions

  

  courtois-neuromod-machine

  committed
  8fda8e6

  Copy full SHA for 8fda8e6

• add friends s4

  

  courtois-neuromod-machine

  committed
  7497593

  Copy full SHA for 7497593

• Merge branch 'mri_laptop' of github.com:courtois-neuromod/task_stimuli into mri_laptop

  

  courtois-neuromod-machine

  committed
  87bff93

  Copy full SHA for 87bff93

• force resolution at start: wip

  

  courtois-neuromod-machine

  committed
  e3c2ea0

  Copy full SHA for e3c2ea0

• force screen resolution at startup, restructure code

  bpinsard

  committed
  baed491

  Copy full SHA for baed491

• Merge branch 'mri_laptop'

  bpinsard

  committed
  7714634

  Copy full SHA for 7714634

Commits on Oct 23, 2020

• optimizing things

  bpinsard

  committed
  ca2de3e

  Copy full SHA for ca2de3e

• things task: wip

  bpinsard

  committed
  b4caebb

  Copy full SHA for b4caebb

Commits on Oct 26, 2020

• generator of design and fix the task, almost working

  bpinsard

  committed
  e0b4cce

  Copy full SHA for e0b4cce

• fix pb with movie recording. it is still very RAM-intensive to store all frames

  bpinsard

  committed
  975996f

  Copy full SHA for 975996f

• Merge branch 'record_movie' into things

  bpinsard

  committed
  4c3e22c

  Copy full SHA for 4c3e22c

Commits on Oct 27, 2020

• things, and record movie downsampling

  bpinsard

  committed
  58ca916

  Copy full SHA for 58ca916

• change Things task for non-slip timing,

  bpinsard

  committed
  8db5270

  Copy full SHA for 8db5270

• reset screen after script run

  bpinsard

  committed
  3b2adaa

  Copy full SHA for 3b2adaa

• merge

  bpinsard

  committed
  fbceefd

  Copy full SHA for fbceefd

Commits on Oct 28, 2020

• improve non-slip timing

  bpinsard

  committed
  198316d

  Copy full SHA for 198316d

• merge

  bpinsard

  committed
  5d88606

  Copy full SHA for 5d88606

Commits on Nov 3, 2020

• update zmq_tools and eyetracking for pupil2

  bpinsard

  committed
  e7ecd6f

  Copy full SHA for e7ecd6f

Commits on Nov 11, 2020

• add dev option for debug/profile, cleanup and reorde init

  bpinsard

  committed
  3836236

  Copy full SHA for 3836236

• merge

  bpinsard

  committed
  a34b83c

  Copy full SHA for a34b83c

• fix call to calibration

  bpinsard

  committed
  c691d3a

  Copy full SHA for c691d3a

Commits on Dec 9, 2020

• better saving of task events and data, unified name generation to follow BIDS like structure

  bpinsard

  committed
  fdae44f

  Copy full SHA for fdae44f

• rename emotions as liris

  bpinsard

  committed
  f1fef13

  Copy full SHA for f1fef13

• fix task naming for liris

  bpinsard

  committed
  5ae2b54

  Copy full SHA for 5ae2b54

Commits on Dec 10, 2020

• update eyetracking, fix threading issues

  bpinsard

  committed
  56f07da

  Copy full SHA for 56f07da

Commits on Dec 11, 2020

• use callback to store pupils during calibration

  bpinsard

  committed
  87bdf78

  Copy full SHA for 87bdf78

• factorize events saving

  bpinsard

  committed
  80f9ad4

  Copy full SHA for 80f9ad4

• generate event file for calibration task, black

  bpinsard

  committed
  9ffbb03

  Copy full SHA for 9ffbb03

• fix event logging

  bpinsard

  committed
  3de441a

  Copy full SHA for 3de441a

• apply black

  bpinsard

  committed
  0f309b2

  Copy full SHA for 0f309b2

• calibrate et for each task

  bpinsard

  committed
  bcd4403

  Copy full SHA for bcd4403

• remove waitBlanking for exp_win, to allow non-slip timing

  bpinsard

  committed
  c269a49

  Copy full SHA for c269a49

• fix pupil accessor

  bpinsard

  committed
  e6daccb

  Copy full SHA for e6daccb

Commits on Jan 12, 2021

• fix eyetracking issues

  bpinsard

  committed
  6ae2a96

  Copy full SHA for 6ae2a96

• log computer monotonic time with events

  bpinsard

  committed
  e39db9b

  Copy full SHA for e39db9b

• fix loading of scenarii, randomize order of levels within runs

  bpinsard

  committed
  ffc48b1

  Copy full SHA for ffc48b1

Commits on Jan 13, 2021

• code to create design files

  bpinsard

  committed
  f918b42

  Copy full SHA for f918b42

Commits on Jan 15, 2021

• complete coding of ThingsMemory task.

  bpinsard

  committed
  5e06869

  Copy full SHA for 5e06869

• comment design generation

  bpinsard

  committed
  76d182e

  Copy full SHA for 76d182e

Commits on Jan 19, 2021

• change to circular mapping

  bpinsard

  committed
  d404f1f

  Copy full SHA for d404f1f

• change wrap_width for instruction

  bpinsard

  committed
  0b7050a

  Copy full SHA for 0b7050a

• add a requirement file, wip

  bpinsard

  committed
  badc9f7

  Copy full SHA for badc9f7

Commits on Jan 21, 2021

• [DATALAD] Recorded changes

  bpinsard

  committed
  dcaaf87

  Copy full SHA for dcaaf87

Commits on Jan 22, 2021

• reinstall things stimuli subdataset

  bpinsard

  committed
  490fbc0

  Copy full SHA for 490fbc0

• set images size in visual angle

  bpinsard

  committed
  26e4997

  Copy full SHA for 26e4997

Commits on Jan 26, 2021

• add mapping for controller for Things memory task

  bpinsard

  committed
  0c91f5b

  Copy full SHA for 0c91f5b

• Merge branch 'master' into things_mem

  bpinsard

  committed
  af0b24a

  Copy full SHA for af0b24a

• [DATALAD] Recorded changes

  bpinsard

  committed
  29991e5

  Copy full SHA for 29991e5

Commits on Jan 28, 2021

• [DATALAD] new dataset

  bpinsard

  committed
  c07c867

  Copy full SHA for c07c867

• save .gitattributes

  bpinsard

  committed
  76634ad

  Copy full SHA for 76634ad

• add static images and source svgs

  bpinsard

  committed
  4e3ffb7

  Copy full SHA for 4e3ffb7

• save structure

  bpinsard

  committed
  6b11790

  Copy full SHA for 6b11790

Commits on Feb 3, 2021

• adjust instructions for marker fixation

  bpinsard

  committed
  4644003

  Copy full SHA for 4644003

• [DATALAD] Recorded changes

  bpinsard

  committed
  27aa68d

  Copy full SHA for 27aa68d

• update submodule

  bpinsard

  committed
  9e49e50

  Copy full SHA for 9e49e50

• use local copy of gym-retro game for simplified and robust deployment

  bpinsard

  committed
  c1cf7b6

  Copy full SHA for c1cf7b6

• merge videogames

  bpinsard

  committed
  21e67d5

  Copy full SHA for 21e67d5

• Merge branch 'things_mem'

  bpinsard

  committed
  808a129

  Copy full SHA for 808a129

Commits on Feb 9, 2021

• change pseudo-randomization to have constant seen/unseen ratio in each run

  bpinsard

  committed
  d4a57e4

  Copy full SHA for d4a57e4

Commits on Feb 12, 2021

• add pandas as requirementes

  bpinsard

  committed
  2f2e0c4

  Copy full SHA for 2f2e0c4

Commits on Feb 16, 2021

• add friends season 5

  bpinsard

  committed
  ef89578

  Copy full SHA for ef89578

• things mem to use real images not pilot ones

  bpinsard

  committed
  3b0a4e2

  Copy full SHA for 3b0a4e2

• Merge branch 'master' of github.com:courtois-neuromod/task_stimuli

  bpinsard

  committed
  6582eb1

  Copy full SHA for 6582eb1

• load env with dotenv

  bpinsard

  committed
  78ea449

  Copy full SHA for 78ea449

• fix python integer division

  bpinsard

  committed
  871041e

  Copy full SHA for 871041e

• fix rendering

  bpinsard

  committed
  09ce813

  Copy full SHA for 09ce813

• fix rendering

  bpinsard

  committed
  c501079

  Copy full SHA for c501079

• add template .env

  bpinsard

  committed
  a33a3f3

  Copy full SHA for a33a3f3

Commits on Mar 1, 2021

• fix problem when restarting the task

  bpinsard

  committed
  869548c

  Copy full SHA for 869548c

• merge

  bpinsard

  committed
  73b148f

  Copy full SHA for 73b148f

• fix framerate issue,

  bpinsard

  committed
  f95b88c

  Copy full SHA for f95b88c

Commits on Mar 4, 2021

• add a reading task class for word by word reading

  FrancoisPgm

  committed
  2a07b56

  Copy full SHA for 2a07b56

Commits on Mar 9, 2021

• comment out height arg and add ses-harrypotter

  

  courtois-neuromod-machine

  committed
  5737a75

  Copy full SHA for 5737a75

• add clearbuffer through yield

  bpinsard

  authored
  4deb641

  Copy full SHA for 4deb641

• fix colorspace error

  bpinsard

  committed
  b61e610

  Copy full SHA for b61e610

• Merge branch 'master' into harry_potter

  bpinsard

  committed
  0b49362

  Copy full SHA for 0b49362

• use target in triplets as word for test

  

  courtois-neuromod-machine

  committed
  7accb51

  Copy full SHA for 7accb51

• Merge branch 'harry_potter' of https://github.com/courtois-neuromod/task_stimuli into harry_potter

  

  courtois-neuromod-machine

  committed
  fc23631

  Copy full SHA for fc23631

• Merge branch 'harry_potter' of github.com:courtois-neuromod/task_stimuli into harry_potter

  bpinsard

  committed
  6659689

  Copy full SHA for 6659689

Commits on Mar 10, 2021

• fixes

  bpinsard

  committed
  530ba99

  Copy full SHA for 530ba99

Commits on Mar 11, 2021

• add a helper function for non-slip timing.

  bpinsard

  committed
  da3ef6e

  Copy full SHA for da3ef6e

• try to fix timing issue

  bpinsard

  committed
  834235d

  Copy full SHA for 834235d

Commits on Mar 12, 2021

• fix response mapping: seems ok now, implement operator feedback

  bpinsard

  committed
  ba36e32

  Copy full SHA for ba36e32

Commits on Mar 16, 2021

• fix colorspace errors with newer psychopy.

  bpinsard

  committed
  44f1227

  Copy full SHA for 44f1227

• Merge branch 'master' into videogames

  bpinsard

  committed
  0865908

  Copy full SHA for 0865908

• fix wrong scenario name

  bpinsard

  committed
  195433c

  Copy full SHA for 195433c

• fix: load state from custom only

  bpinsard

  committed
  993583b

  Copy full SHA for 993583b

Commits on Mar 18, 2021

• add a suggestion if --task arg is wrong

  FrancoisPgm

  committed
  ba6e224

  Copy full SHA for ba6e224

• Revert "add a reading task class for word by word reading"

  Show description for 6f792c0
  FrancoisPgm

  committed
  6f792c0

  Copy full SHA for 6f792c0

Commits on Mar 19, 2021

• remove randomization, fix loading of custom integration

  bpinsard

  committed
  f642eb2

  Copy full SHA for f642eb2

Commits on Mar 23, 2021

• make calibration restart if failed. add instruction for rolling eyes

  bpinsard

  committed
  5f32ff9

  Copy full SHA for 5f32ff9

Commits on Mar 24, 2021

• add yield to clear things instructions

  bpinsard

  committed
  025a66f

  Copy full SHA for 025a66f

• Merge branch 'things_mem'

  bpinsard

  committed
  5dbe4a5

  Copy full SHA for 5dbe4a5

• Merge branch 'eyetracking_pupil2'

  bpinsard

  committed
  8430464

  Copy full SHA for 8430464

Commits on Mar 31, 2021

• Add events tasks, load them with pd.read_csv

  FrancoisPgm

  committed
  033e446

  Copy full SHA for 033e446

Commits on Apr 1, 2021

• Merge branch 'things_mem' into harry_potter

  bpinsard

  committed
  55208d4

  Copy full SHA for 55208d4

Commits on Apr 6, 2021

• implement non-slip code, save flips

  bpinsard

  committed
  228d4a5

  Copy full SHA for 228d4a5

• merge

  bpinsard

  committed
  51640bd

  Copy full SHA for 51640bd

• fix the italic display due to psychopy bug

  bpinsard

  committed
  0b7fa3a

  Copy full SHA for 0b7fa3a

Commits on Apr 7, 2021

• add updated hp tsv files

  bpinsard

  committed
  6b9d33f

  Copy full SHA for 6b9d33f

• fix tsv path in session script

  bpinsard

  committed
  05cca2e

  Copy full SHA for 05cca2e

• fix non-slip timing code

  bpinsard

  committed
  8fbe738

  Copy full SHA for 8fbe738

• fix hp progress bar

  bpinsard

  committed
  7445ad8

  Copy full SHA for 7445ad8

• fix end of task

  bpinsard

  committed
  aefe1fe

  Copy full SHA for aefe1fe

Commits on Apr 9, 2021

• add separate session for shinobi MEG

  bpinsard

  committed
  f3b5342

  Copy full SHA for f3b5342

• Merge branch 'master' into videogames

  bpinsard

  committed
  1f755a9

  Copy full SHA for 1f755a9

• set max duration to 9min

  bpinsard

  committed
  b5ef8f4

  Copy full SHA for b5ef8f4

• finish coding questionnaire for flow measures

  bpinsard

  committed
  d5fc3ca

  Copy full SHA for d5fc3ca

Commits on Apr 12, 2021

• properly log questionnaire in events file, when changing value and final answers

  bpinsard

  committed
  2bed8f5

  Copy full SHA for 2bed8f5

• change design for half runs, randomize examplar orders while keeping the already shown for the end.

  bpinsard

  committed
  c354d72

  Copy full SHA for c354d72

• fix double logging of value change when loading questionnaire

  bpinsard

  committed
  8a9cb26

  Copy full SHA for 8a9cb26

Commits on Apr 13, 2021

• Merge branch 'things_mem' into eyetracking_pupil2

  bpinsard

  committed
  c9f81c1

  Copy full SHA for c9f81c1

Commits on Apr 20, 2021

• fix saving eyetracking calibration data

  bpinsard

  committed
  f83d93f

  Copy full SHA for f83d93f

Commits on Apr 23, 2021

• wip: implement KK/HCP/NSD retinotopy task

  bpinsard

  committed
  8415df4

  Copy full SHA for 8415df4

Commits on Apr 27, 2021

• created session file for supermariobros

  hyruuk

  committed
  f734d3b

  Copy full SHA for f734d3b

• removed supermariobros files added by mistake

  hyruuk

  committed
  19ceb94

  Copy full SHA for 19ceb94

Commits on Apr 28, 2021

• wip retino

  bpinsard

  committed
  238241e

  Copy full SHA for 238241e

• set 2d detector intensity range to 4 at startup

  bpinsard

  committed
  2a71869

  Copy full SHA for 2a71869

Commits on Apr 29, 2021

• wip: timing adjustment for TR in retino

  bpinsard

  committed
  b7aa1cb

  Copy full SHA for b7aa1cb

• add clock type to log_events, update retinotopy for our TR

  bpinsard

  committed
  df0ebf0

  Copy full SHA for df0ebf0

• fix timing

  bpinsard

  committed
  874560e

  Copy full SHA for 874560e

• add an option to skip screen resolution forcing

  bpinsard

  committed
  54a1196

  Copy full SHA for 54a1196

• Merge branch 'master' into eyetracking_pupil2

  bpinsard

  committed
  c323139

  Copy full SHA for c323139

• fix file saving: should occur after task is fully stopped in particular for calibration where other threads are using task callbacks

  bpinsard

  committed
  b138140

  Copy full SHA for b138140

Commits on Apr 30, 2021

• [DATALAD] Recorded changes

  bpinsard

  committed
  41daedb

  Copy full SHA for 41daedb

• Merge branch 'videogames' into supermariobros

  bpinsard

  committed
  1d2611a

  Copy full SHA for 1d2611a

Commits on May 5, 2021

• cleaner sound handling across emulators

  bpinsard

  committed
  1846662

  Copy full SHA for 1846662

• make nicer instructions

  bpinsard

  committed
  cf0fccb

  Copy full SHA for cf0fccb

Commits on May 7, 2021

• renaming to mario

  bpinsard

  committed
  d6e6c98

  Copy full SHA for d6e6c98

• Merge branch 'things_mem' into mario

  bpinsard

  committed
  1f5ff7d

  Copy full SHA for 1f5ff7d

• Merge branch 'master' into mario

  bpinsard

  committed
  46f8605

  Copy full SHA for 46f8605

Commits on May 11, 2021

• update mario.stimuli

  bpinsard

  committed
  d3d3eca

  Copy full SHA for d3d3eca

Commits on May 13, 2021

• retinotopy for mixed wedges and rings, global fixes to progress bar

  bpinsard

  committed
  bbcb5f9

  Copy full SHA for bbcb5f9

• fix flip timing/logging issues

  bpinsard

  committed
  df9536f

  Copy full SHA for df9536f

Commits on May 20, 2021

• fix flip timing log, add retino block in events file

  bpinsard

  committed
  a5f9034

  Copy full SHA for a5f9034

• Merge branch 'retino'

  bpinsard

  committed
  53339b9

  Copy full SHA for 53339b9

• refix flip timing log, only show first response for RT

  bpinsard

  committed
  bfc27f2

  Copy full SHA for bfc27f2

• Merge branch 'retino'

  bpinsard

  committed
  98cadae

  Copy full SHA for 98cadae

• merge didyoumean

  bpinsard

  committed
  aa44526

  Copy full SHA for aa44526

• merge

  bpinsard

  committed
  bcc8ce7

  Copy full SHA for bcc8ce7

Commits on May 21, 2021

• Merge branch 'master' into mario

  bpinsard

  committed
  3ed9cef

  Copy full SHA for 3ed9cef

• code adaptive design for mario, required important changes to the code-base, should be tested

  bpinsard

  committed
  a54335b

  Copy full SHA for a54335b

• restore previous run duration

  bpinsard

  committed
  42de8df

  Copy full SHA for 42de8df

Commits on Jun 1, 2021

• uncommented flow questionnaire after each repetition

  hyruuk

  committed
  dcaf3f2

  Copy full SHA for dcaf3f2

Commits on Jun 2, 2021

• fix bk2 saving, log key releases

  bpinsard

  committed
  080bee7

  Copy full SHA for 080bee7

Commits on Jun 17, 2021

• reorder soundcheck and pauses.

  bpinsard

  committed
  6b1dae0

  Copy full SHA for 6b1dae0

Commits on Jun 29, 2021

• fix skip_n_tasks

  bpinsard

  committed
  5c171a7

  Copy full SHA for 5c171a7

Commits on Jul 1, 2021

• Merge branch 'dev_inscapesMEG' into master

  hyruuk

  authored
  54f48a9

  Copy full SHA for 54f48a9