Merge branch 'tildearrow:master' into openmpt-paste

CMakeLists.txt

@@ -1077,6 +1077,7 @@ if (NOT ANDROID OR TERMUX)
     set(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/res/Info.plist)
     set(CPACK_BUNDLE_ICON ${CMAKE_SOURCE_DIR}/res/icon.icns)
     set(CPACK_BUNDLE_STARTUP_COMMAND "furnace")
+    set(CPACK_BUNDLE_APPLE_CERT_APP "-")
   endif()
   
   include(CPack)

doc/1-intro/concepts.md

@@ -23,7 +23,7 @@ the **order list** is a smaller spreadsheet showing the overall song structure.
 - patterns may be used multiple times in the order list. changing a pattern's data in one order will affect the same pattern used in other orders.
 - each pattern is made of the same number of rows as seen in the tracker view.
 - during playback, the **playhead** moves down as described previously. when it reaches the end of the pattern view, it will go to the next order.
-- if the last order is reached and the playhear reaches the end of the pattern view, it will go back to the beginning of the song.
+- if the last order is reached and the playhead reaches the end of the pattern view, it will go back to the beginning of the song.
 
 ## time
 

doc/8-advanced/chanosc.md

@@ -1,6 +1,6 @@
 # oscilloscope (per-channel)
 
-the "Oscilloscope (per-channel)" windows displays several oscilloscope views (one per channel).
+the "Oscilloscope (per-channel)" window displays several oscilloscope views (one per channel).
 
 ![oscilloscope per-channel configuration view](chanosc.png)
 

res/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>furnace</string>
+	<string>Furnace</string>
 	<key>CFBundleGetInfoString</key>
 	<string></string>
 	<key>CFBundleIconFile</key>

src/engine/platform/vb.cpp

@@ -414,8 +414,12 @@ void DivPlatformVB::forceIns() {
     chan[i].insChanged=true;
     chan[i].freqChanged=true;
     updateWave(i);
+    if (romMode) {
+      chWrite(i,0x06,chan[i].wave);
+    }
     chWrite(i,0x01,isMuted[i]?0:chan[i].pan);
   }
+  writeEnv(5,true);
 }
 
 void* DivPlatformVB::getChanState(int ch) {

src/gui/about.cpp

@@ -115,6 +115,7 @@ const char* aboutLine[]={
   "Lunathir",
   "LVintageNerd",
   "Mahbod Karamoozian",
+  "Marisa Kirisame [DJ MasterSpark]",
   "Martin Demsky",
   "masicbemester",
   "MelonadeM",
@@ -123,14 +124,17 @@ const char* aboutLine[]={
   "nicco1690",
   "niffuM",
   "<nk>",
+  "Notakin",
   "NyaongI",
   "Pale Moon",
+  "PeyPey",
   "PichuMario",
   "potatoTeto",
   "psxdominator",
   "Raijin",
   "railzen7",
   "RevvoBolt",
+  "scooblee",
   "sillygoose",
   "SnugglyBun",
   "SuperJet Spade",