diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 8254398..bb670d6 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -74,10 +74,8 @@ Below is a list of artwork licenses from plugins |-----------------------------------------|------------------|------------------| | 21kHz | MIT | No artwork specific license provided | | AmalgamatedHarmonics/* | BSD-3-Clause | No artwork specific license provided | -| AmalgamatedHarmonics/ComponentLibrary/* | CC-BY-NC-4.0 | | | AmalgamatedHarmonics/DSEG*.ttf | OFL-1.1-RFN | | -| AmalgamatedHarmonics/EurostileBold.ttf | ?? | https://github.com/jhoar/AmalgamatedHarmonics/issues/48 | -| AmalgamatedHarmonics/Roboto-Light.ttf | Apache-2.0 | | +| AmalgamatedHarmonics/Roboto*.ttf | Apache-2.0 | | | AnimatedCircuits/* | CC-BY-NC-SA-4.0 | | | AriaModules/* | CC-BY-SA-4.0 | | | AriaModules/Arcane/* | CC-BY-NC-SA-3.0 | Unused in Cardinal | @@ -87,6 +85,8 @@ Below is a list of artwork licenses from plugins | AriaModules/lcd/piano/* | WTFPL | | | AriaModules/signature/* | Custom | Removal required if modifying other files without author's permission | | AS/* | Custom | Copyright 2017, derivative works may not use the AS logo or panel graphics including custom component graphics (knobs, switches, screws, caps,etc.). | +| AS/saxmono.ttf | Custom | You may download this font, circulate it und use it freely. You may not alter rename, change copyrights or modify this font in any way. | +| AS/Segment7Standard.ttf | OFL-1.1-RFN | | | Atelier/* | Custom | Copyright © Pyer 2020, used and distributed with permission | | AudibleInstruments/* | Custom | Copyright © Emilie Gillet, used and distributed with permission | | BaconPlugs/* | GPL-3.0-or-later | No artwork specific license provided | @@ -96,25 +96,32 @@ Below is a list of artwork licenses from plugins | BaconPlugs/Keypunch029.json | OFL-1.1 | | | Befaco/components/* | CC-BY-NC-4.0 | | | Befaco/panels/* | Custom | Copyright © [Befaco](https://www.befaco.org/), used and distributed with permission | -| Bidoo/* | GPL-3.0-or-later | No artwork specific license provided | +| Bidoo/* | CC-BY-NC-ND-4.0 | | | BogaudioModules/* | CC-BY-SA-4.0 | | +| BogaudioModules/fonts/audiowide.ttf | OFL-1.1-RFN | | +| BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | | | Cardinal/* | CC0-1.0 | | | Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html | -| ChowDSP | TODO | | -| DrumKit | TODO | | -| E-Series | TODO | | -| ExpertSleepers-Encoders/* | MIT | No artwork specific license provided | -| Extratone | TODO | | -| Fehler Fabrik | TODO | | -| Fundamental | TODO | | -| Glue the Giant | TODO | | -| Grande | TODO | | -| HetrickCV | TODO | | -| Impromptu | TODO | | -| ihtsyn/* | GPL-3.0-or-later | No artwork specific license provided | +| ChowDSP/* | GPL-3.0-or-later | No artwork specific license provided, see [ChowDSP-VCV#26](https://github.com/jatinchowdhury18/ChowDSP-VCV/issues/26) | +| ChowDSP/fonts/RobotoCondensed-*.ttf | Apache-2.0 | | +| DrumKit/* | CC0-1.0 | | +| DrumKit/component/NovaMono.ttf | OFL-1.1-RFN | | +| E-Series/* | Custom | Copyright © Synthesis Technology, used and distributed with permission | +| ExpertSleepers-Encoders/* | MIT | No artwork specific license provided, see [vcvrack-encoders#3](https://github.com/expertsleepersltd/vcvrack-encoders/issues/3) | +| Extratone/* | GPL-3.0-or-later | No artwork specific license provided, see [Extratone#7](https://github.com/EaterOfSheep/Extratone/issues/7) | +| FehlerFabrik/* | GPL-3.0-or-later | No artwork specific license provided, see [FehlerFabrik#17](https://github.com/RCameron93/FehlerFabrik/issues/17) | +| Fundamental/* | CC-BY-NC-ND-4.0 | | +| GlueTheGiant/* | GPL-3.0-or-later | No artwork specific license provided, see [gtg-rack#10](https://github.com/gluethegiant/gtg-rack/issues/10) | +| GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | | +| GrandeModular/* | CC-BY-NC-ND-4.0 | | +| HetrickCV/* | CC0-1.0 | No artwork specific license provided | +| ImpromptuModular/* | CC-BY-NC-ND-4.0 | | +| ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | | +| ihtsyn/* | GPL-3.0-or-later | No artwork specific license provided, author has deleted this repo | | ihtsyn/LEDCalculator.ttf | Custom | Free for personal use | -| JW-Modules | TODO | | -| LifeFormModular | TODO | | +| JW-Modules/* | BSD-3-Clause | No artwork specific license provided | +| JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal | +| LifeFormModular/* | MIT | No artwork specific license provided | | LittleUtils/* | EUPL-1.2 | | | LittleUtils/fonts/CooperHewitt-*.ttf | OFL-1.1-RFN | | | LittleUtils/fonts/Overpass-*.ttf | OFL-1.1-RFN | | diff --git a/plugins/AmalgamatedHarmonics b/plugins/AmalgamatedHarmonics index 391b6f7..35b89c9 160000 --- a/plugins/AmalgamatedHarmonics +++ b/plugins/AmalgamatedHarmonics @@ -1 +1 @@ -Subproject commit 391b6f780040fbd0ac6006c9084004af7b277dba +Subproject commit 35b89c93152ac2194eecffbd4aa39e71caa90cc0 diff --git a/plugins/BogaudioModules b/plugins/BogaudioModules index ed6b580..8e982f4 160000 --- a/plugins/BogaudioModules +++ b/plugins/BogaudioModules @@ -1 +1 @@ -Subproject commit ed6b580f9e205f5d5d1ef6b64d5cf49bac955861 +Subproject commit 8e982f462c4117f84794cbf6a13740992ff17d92 diff --git a/plugins/DrumKit b/plugins/DrumKit index 53205f4..8d78f22 160000 --- a/plugins/DrumKit +++ b/plugins/DrumKit @@ -1 +1 @@ -Subproject commit 53205f4f58d84ed02ebdc23d80ef86d90ce2d61b +Subproject commit 8d78f221927f5aa75d99e4fb8a6b8750141e0933 diff --git a/plugins/FehlerFabrik b/plugins/FehlerFabrik index b6826be..9b58978 160000 --- a/plugins/FehlerFabrik +++ b/plugins/FehlerFabrik @@ -1 +1 @@ -Subproject commit b6826bed44433e0a4f6786a8b814fa59de00e68c +Subproject commit 9b5897828dc1b757f42cb707b5979488acb67401 diff --git a/plugins/Fundamental b/plugins/Fundamental index 6012b6e..50f8ccc 160000 --- a/plugins/Fundamental +++ b/plugins/Fundamental @@ -1 +1 @@ -Subproject commit 6012b6e49a88d528d7c85a651e7261a1aa2cc575 +Subproject commit 50f8ccce5ec433470d87894c94762df133d940f1 diff --git a/plugins/GrandeModular b/plugins/GrandeModular index efdf86c..2541a87 160000 --- a/plugins/GrandeModular +++ b/plugins/GrandeModular @@ -1 +1 @@ -Subproject commit efdf86ca6f47562bde164d145884de92e5ce5fc8 +Subproject commit 2541a8796a0410a2ee8e9d59f71e8112e7e32085 diff --git a/plugins/ImpromptuModular b/plugins/ImpromptuModular index b5215ae..368cbd6 160000 --- a/plugins/ImpromptuModular +++ b/plugins/ImpromptuModular @@ -1 +1 @@ -Subproject commit b5215ae3e907fab07ebd1fc3098a678306065483 +Subproject commit 368cbd6ee17398c7329b263dde0409bf7a57ce3b diff --git a/plugins/ImpromptuModularDark/PanelTheme.cpp b/plugins/ImpromptuModularDark/PanelTheme.cpp index 6103644..d2dfcc1 100644 --- a/plugins/ImpromptuModularDark/PanelTheme.cpp +++ b/plugins/ImpromptuModularDark/PanelTheme.cpp @@ -7,26 +7,28 @@ #include "../ImpromptuModular/src/comp/PanelTheme.hpp" +NVGcolor SCHEME_RED_IM = SCHEME_RED; +NVGcolor SCHEME_GREEN_IM = SCHEME_GREEN; + void writeThemeAndContrastAsDefault() {} -void readThemeAndContrastFromDefault() {} +void saveThemeAndContrastAsDefault(int, float) {} void loadThemeAndContrastFromDefault(int* panelTheme, float* panelContrast) { *panelTheme = 1; *panelContrast = panelContrastDefault; } - bool isDark(int*) { return true; } +void readThemeAndContrastFromDefault() {} void createPanelThemeMenu(ui::Menu*, int*, float*, SvgPanel*) {} - void PanelBaseWidget::draw(const DrawArgs& args) { nvgBeginPath(args.vg); NVGcolor baseColor; diff --git a/plugins/JW-Modules b/plugins/JW-Modules index 2a7126f..68f04a5 160000 --- a/plugins/JW-Modules +++ b/plugins/JW-Modules @@ -1 +1 @@ -Subproject commit 2a7126f5b14c30144ffa02a8cd69d27f71efc23d +Subproject commit 68f04a5a8a1a656e7a3aa7e217524f0feb91167e diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 9657180..a487e9d 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -1421,16 +1421,19 @@ static void initStatic__GrandeModular() if (spl.ok()) { p->addModel(modelClip); + p->addModel(modelMerge8); p->addModel(modelMergeSplit4); p->addModel(modelMicrotonalChords); p->addModel(modelMicrotonalNotes); p->addModel(modelNoteMT); p->addModel(modelPolyMergeResplit); + p->addModel(modelPolySplit); p->addModel(modelQuant); p->addModel(modelQuantIntervals); p->addModel(modelQuantMT); p->addModel(modelSampleDelays); p->addModel(modelScale); + p->addModel(modelSplit8); p->addModel(modelTails); p->addModel(modelVarSampleDelays); }