etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pv1000

This commit is contained in:
tildearrow 2023-03-05 13:37:29 -05:00
parent 0d6153beb6 a52eb8706c
commit 604a0f6a61
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
papers/format.md
View File

@ -290,6 +290,7 @@ size | description
| - 0xc8: SM8521 - 3 channels
| - 0xc9: M114S - 16 channels
| - 0xca: ZX Spectrum (beeper, QuadTone engine) - 5 channels
| - 0xcb: Casio PV-1000 - 3 channels
| - 0xde: YM2610B extended - 19 channels
| - 0xe0: QSound - 19 channels
| - 0xfc: Pong - 1 channel

2
src/gui/presets.cpp
View File

@ -1111,7 +1111,7 @@ void FurnaceGUI::initSystemPresets() {
ENTRY(
"Commander X16", {
CH(DIV_SYSTEM_VERA, 1.0f, 0, ""),
CH(DIV_SYSTEM_YM2151, 0.5f, 0, "")
CH(DIV_SYSTEM_YM2151, 1.0f, 0, "")
}
);
ENTRY(

2
src/gui/tutorial.cpp
View File

@ -245,7 +245,7 @@ void FurnaceGUI::drawTutorial() {
// tutorial
if (curTutorial>=0 && curTutorial<GUI_TUTORIAL_MAX) {
if (ImGui::Begin("Tutorial",NULL,ImGuiWindowFlags_NoResize|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar)) {
if (ImGui::Begin("Tutorial",NULL,ImGuiWindowFlags_NoResize|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoDocking)) {
FurnaceGUITutorialStep& step=tutorials[curTutorial].steps[curTutorialStep];
ImGui::Dummy(ImVec2(400.0*dpiScale,1.0));
ImGui::TextWrapped("%s",step.text);