Merge branch 'master' into spectrum
This commit is contained in:
commit
8626937f89
2907 changed files with 1544042 additions and 23152 deletions
|
|
@ -603,6 +603,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
|
|||
D("FOLLOW_PATTERN", _N("Follow pattern"), 0),
|
||||
D("FULLSCREEN", _N("Toggle full-screen"), SDLK_F11),
|
||||
D("TX81Z_REQUEST", _N("Request voice from TX81Z"), 0),
|
||||
D("OPEN_EDIT_MENU", _N("Open pattern edit menu"), 0),
|
||||
D("PANIC", _N("Panic"), SDLK_F12),
|
||||
D("CLEAR", _N("Clear song data"), 0),
|
||||
|
||||
|
|
@ -932,6 +933,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
|
|||
D(GUI_COLOR_FILE_SONG_IMPORT,"",ImVec4(0.5f,1.0f,0.8f,1.0f)),
|
||||
D(GUI_COLOR_FILE_INSTR,"",ImVec4(1.0f,0.5f,0.5f,1.0f)),
|
||||
D(GUI_COLOR_FILE_AUDIO,"",ImVec4(1.0f,1.0f,0.5f,1.0f)),
|
||||
D(GUI_COLOR_FILE_AUDIO_COMPRESSED,"",ImVec4(0.7f,1.0f,0.3f,1.0f)),
|
||||
D(GUI_COLOR_FILE_WAVE,"",ImVec4(1.0f,0.75f,0.5f,1.0f)),
|
||||
D(GUI_COLOR_FILE_VGM,"",ImVec4(1.0f,1.0f,0.5f,1.0f)),
|
||||
D(GUI_COLOR_FILE_ZSM,"",ImVec4(1.0f,1.0f,0.5f,1.0f)),
|
||||
|
|
@ -1331,6 +1333,7 @@ const int availableSystems[]={
|
|||
DIV_SYSTEM_SUPERVISION,
|
||||
DIV_SYSTEM_UPD1771C,
|
||||
DIV_SYSTEM_SID3,
|
||||
DIV_SYSTEM_MULTIPCM,
|
||||
0 // don't remove this last one!
|
||||
};
|
||||
|
||||
|
|
@ -1463,6 +1466,7 @@ const int chipsSample[]={
|
|||
DIV_SYSTEM_GBA_MINMOD,
|
||||
DIV_SYSTEM_OPL4,
|
||||
DIV_SYSTEM_OPL4_DRUMS,
|
||||
DIV_SYSTEM_MULTIPCM,
|
||||
0 // don't remove this last one!
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue