search

klabhub / neurostim

Design and run visual neuroscience experiments using Matlab and the Psychophysics Toolbox.
MIT License
5 stars 4 forks source link

Adamtemp (take 2) #138

Closed adammorrissirrommada closed 4 years ago

adammorrissirrommada commented 4 years ago

@bartkrekelberg I have merged your kMaster changes into this branch already, so this request is so you can check the changes I have made to shared files (e.g. cic, myRig). The rest is just new stimuli and demos, so will not have any effect on anyone else.

If you are OK with this merge, we can then merge kMaster into master?

adammorrissirrommada commented 4 years ago

@bartkrekelberg Not sure why it previously suggested there was a conflict in myRig. Think it was only formatting. Resolved now, so this is readily mergeable as long as you are happy with my changes to cic, parameter, and plugin.