Merge branch 'master' of https://github.com/tildearrow/furnace into command-palette
This commit is contained in:
commit
5a5090f711
168 changed files with 5101 additions and 1926 deletions
|
|
@ -174,6 +174,7 @@ const char* insTypes[DIV_INS_MAX+1][3]={
|
|||
{"SCSP",ICON_FA_QUESTION,ICON_FUR_INS_SCSP},
|
||||
{"TED",ICON_FA_BAR_CHART,ICON_FUR_INS_TED},
|
||||
{"C140",ICON_FA_VOLUME_UP,ICON_FUR_INS_C140},
|
||||
{"C219",ICON_FA_VOLUME_UP,ICON_FUR_INS_C219},
|
||||
{NULL,ICON_FA_QUESTION,ICON_FA_QUESTION}
|
||||
};
|
||||
|
||||
|
|
@ -191,12 +192,12 @@ const char* sampleDepths[DIV_SAMPLE_DEPTH_MAX]={
|
|||
"QSound ADPCM",
|
||||
"ADPCM-A",
|
||||
"ADPCM-B",
|
||||
NULL,
|
||||
"K05 ADPCM",
|
||||
"8-bit PCM",
|
||||
"BRR",
|
||||
"VOX",
|
||||
"8-bit µ-law PCM",
|
||||
NULL,
|
||||
"C219 PCM",
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
@ -596,7 +597,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
|||
D("WINDOW_SYS_MANAGER", "Chip Manager", 0),
|
||||
D("WINDOW_REGISTER_VIEW", "Register View", 0),
|
||||
D("WINDOW_LOG", "Log Viewer", 0),
|
||||
D("EFFECT_LIST", "Effect List", 0),
|
||||
D("WINDOW_EFFECT_LIST", "Effect List", 0),
|
||||
D("WINDOW_CHAN_OSC", "Oscilloscope (per-channel)", 0),
|
||||
D("WINDOW_SUBSONGS", "Subsongs", 0),
|
||||
D("WINDOW_FIND", "Find/Replace", FURKMOD_CMD|SDLK_f),
|
||||
|
|
@ -948,6 +949,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
|
|||
D(GUI_COLOR_INSTR_SCSP,"",ImVec4(0.5f,0.5f,0.5f,1.0f)),
|
||||
D(GUI_COLOR_INSTR_TED,"",ImVec4(0.7f,0.6f,1.0f,1.0f)),
|
||||
D(GUI_COLOR_INSTR_C140,"",ImVec4(1.0f,1.0f,0.0f,1.0f)),
|
||||
D(GUI_COLOR_INSTR_C219,"",ImVec4(1.0f,0.8f,0.0f,1.0f)),
|
||||
D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)),
|
||||
|
||||
D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)),
|
||||
|
|
@ -1134,6 +1136,7 @@ const int availableSystems[]={
|
|||
DIV_SYSTEM_K053260,
|
||||
DIV_SYSTEM_TED,
|
||||
DIV_SYSTEM_C140,
|
||||
DIV_SYSTEM_C219,
|
||||
DIV_SYSTEM_PCM_DAC,
|
||||
DIV_SYSTEM_PONG,
|
||||
0 // don't remove this last one!
|
||||
|
|
@ -1245,6 +1248,7 @@ const int chipsSample[]={
|
|||
DIV_SYSTEM_ES5506,
|
||||
DIV_SYSTEM_K053260,
|
||||
DIV_SYSTEM_C140,
|
||||
DIV_SYSTEM_C219,
|
||||
0 // don't remove this last one!
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue