resolve EAGLView conflict with upstream
pulling upstream
Merge remote-tracking branch 'upstream/master'
test
 Please enter the commit message for your changes. Lines starting
resolve
*) Added documentation for inlet/outlet API for flowboxes. Old methods that mirror the same functionality are candidates for deprication.
*) iOS4.2 backcompatibility support for old iPod touches (requires code merge)
resolve
*) Fixed Blit, BlitSaw, and BlitSq for normalization and removed spurious In input as part of STK integration improvement. BlowBotl now has amplitude and rate controls.
SANG *) changed default value of ADSR control parameters, fixed ADSR to be a unit generator
SANG *) changed default value of ADSR control parameters, fixed ADSR to be a unit generator
*) Added ReadPixel() member function to Texture allowing the coordinate readout of a single RGBA pixel fro the texture. Camera textures work too but have a coordinate mismatch bug currently.
Merge branch 'master' of https://github.com/gessl/urMus
SANG *) Fixed STK instruments from BlowHole to Clarinet
*) Added normed transfer function for rate inputs.
SANG *) working on clarinet, commit to pull upstream.
SANG *) working on clarinet, commit to pull upstream.
*) Fixed rate conversion and corrected Env
SANG *) working on flute, commit to pull upstream.
Merge branch 'master' of https://github.com/gessl/urMus
*) Removed NRev from STK support layer.
SANG *) done fixing STK