Merge 3.7.2 to master #2177
Merge 3.7.2 to master #2177
Conversation
thanks go to Daniel Mayer http://new-supercollider-mailing-lists-forums-use-these.2681727.n2.nabble.com/choosing-random-value-in-synth-tp7624784p7624799.html Signed-off-by: Michael Zacherl <github-mz01@blauwurf.info>
Osc.sc: fix audio rate TChoose
The message `WARNING: Synth output should be a flat array` is documented better, and the error points to the help file.
Cherry pick telefon's nodeproxy documentation enhancements
Make sure NodeProxy generates unique name.
build: tiny enhancements to Windows Readme
* remove bundled scvim; will replace with submodule * Add scvim as a submodule
Thanks Felipe Sateler (debian multimedia team)
…_deps Update linux readme, add missing dependency
…ian_build_fix Fix build on debian, add -fPIC to TLSF target
'super.element' does not have a 'key' argument. So all arguments passed to the superclass were shifted off by one in position, meaning the superclass would behave incorrectly.
…Element Classlib: Fix HIDdef.element arg list passed to super.element
* 3.7: update version 3.7.2 Update CHANGELOG for 3.7.2 Classlib: Fix HIDdef.element arg list passed to super.element use cmake property rather than compiler flag protect -fPIC with linux-only guard Fix build on debian, add -fPIC to TLSF target Update linux readme, add missing dependency Convert scvim to submodule, on 3.7 branch (supercollider#2025) Windows Readme: tiny enhancements Make sure NodeProxy generates unique name. class library: warning in node proxy, add newlines class library: node proxy, improve documentation Osc.sc: fix audio rate TChoose thanks go to Daniel Mayer http://new-supercollider-mailing-lists-forums-use-these.2681727.n2.nabble.com/choosing-random-value-in-synth-tp7624784p7624799.html
|
Looks good to me. Thanks! (Noting: the diff shown on github looks really simple - in particular, it doesn't show up any of the windows changes that are mentioned in the changelog. From skimming, it looks to me like it's because those changes also went to master. I hope I understand that correctly.) |
|
There was a merge conflict and I had to manually resolve the Windows readme. I emailed @bagong and he said to use all the ones from Master, not the changes in 3.7 branch. The way that the Windows changes happened is a bit confusing, but I understand why they had to do it that way. Some of the changes were already merged into master, some of them are in 3.7, some of them are in 3.7win which is just to build the release and is not to be merged anywhere. Going forward we won't have that problem; all the good stuff is in master. There are a few commits in there that appear to already be in master but by a different commit or something. I'm not in the mood to figure out why exactly :) The small number of changes in the final diff makes sense to me: there was barely anything in 3.7.2 and I recognize each one of those changes. |
Fixes #2175