Merge branch 'SCP_biomusic' into develop
# Conflicts: # gesture_sound_interaction/media/b.tap1.aif # gesture_sound_interaction/patchers/sound-design.maxpat
Showing
- gesture_sound_interaction/_DeletedItems/media/nowrap-ramp.aiff 0 additions, 0 deletions...re_sound_interaction/_DeletedItems/media/nowrap-ramp.aiff
- gesture_sound_interaction/_DeletedItems/other/granvoicest2~ 0 additions, 0 deletionsgesture_sound_interaction/_DeletedItems/other/granvoicest2~
- gesture_sound_interaction/_DeletedItems/other/notes.rtf 23 additions, 0 deletionsgesture_sound_interaction/_DeletedItems/other/notes.rtf
- gesture_sound_interaction/_DeletedItems/other/sampctl.abs 0 additions, 0 deletionsgesture_sound_interaction/_DeletedItems/other/sampctl.abs
- gesture_sound_interaction/_DeletedItems/other/steering 0 additions, 0 deletionsgesture_sound_interaction/_DeletedItems/other/steering
- gesture_sound_interaction/_DeletedItems/patchers/TestSynth.maxpat 545 additions, 0 deletions...sound_interaction/_DeletedItems/patchers/TestSynth.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/envTab.maxpat 3611 additions, 0 deletions...re_sound_interaction/_DeletedItems/patchers/envTab.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/findMax.maxpat 193 additions, 208 deletions...e_sound_interaction/_DeletedItems/patchers/findMax.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/findMin.maxpat 193 additions, 165 deletions...e_sound_interaction/_DeletedItems/patchers/findMin.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/mvc.maxpat 645 additions, 0 deletionsgesture_sound_interaction/_DeletedItems/patchers/mvc.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/myo-perform biomusic.bak.maxpat 28944 additions, 0 deletions...on/_DeletedItems/patchers/myo-perform biomusic.bak.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/myoBioFlex1024b.maxpat 2169 additions, 0 deletions...interaction/_DeletedItems/patchers/myoBioFlex1024b.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/protocol.maxpat 584 additions, 0 deletions..._sound_interaction/_DeletedItems/patchers/protocol.maxpat
- gesture_sound_interaction/_DeletedItems/patchers/rapidmax.maxhelp 850 additions, 0 deletions...sound_interaction/_DeletedItems/patchers/rapidmax.maxhelp
- gesture_sound_interaction/_DeletedItems/patchers/temp.maxpat 2302 additions, 0 deletionsgesture_sound_interaction/_DeletedItems/patchers/temp.maxpat
- gesture_sound_interaction/externals/.DS_Store 0 additions, 0 deletionsgesture_sound_interaction/externals/.DS_Store
- gesture_sound_interaction/externals/OSC-route.mxo/Contents/Info.plist 42 additions, 0 deletions...d_interaction/externals/OSC-route.mxo/Contents/Info.plist
- gesture_sound_interaction/externals/OSC-route.mxo/Contents/MacOS/OSC-route 0 additions, 0 deletions...eraction/externals/OSC-route.mxo/Contents/MacOS/OSC-route
- gesture_sound_interaction/externals/list-interpolate.mxo/Contents/Info.plist 42 additions, 0 deletions...action/externals/list-interpolate.mxo/Contents/Info.plist
- gesture_sound_interaction/externals/list-interpolate.mxo/Contents/MacOS/list-interpolate 0 additions, 0 deletions...nals/list-interpolate.mxo/Contents/MacOS/list-interpolate