Merge branch 'master' into ZSMv1

papers/doc/6-sample/README.md

@@ -64,7 +64,3 @@ In there, you can modify certain data pertaining to your sample, such as the:
  - and many more.
 
 The changes you make will be applied as soon as you've committed them to your sample, but they can be undoed and redoed, just like text.
-
-# tips
-
-if you have a sample you wanna use that is about 44100 or anything over 32000Hz, downsample the sample to 32000Hz so that the pitch of the sample in Furnace stays like the original audio file,

papers/doc/7-systems/soundunit.md

@@ -1,5 +1,5 @@
 # tildearrow Sound Unit
-This is a fantasy sound chip, used in the specs2 fantasy computer designed by tildearrow. It includes native support for sample playback, but with only 8KB of sample data. Since 0.6pre1, this sound chip is no longer hidden by default and can be accessed through the module creation screen and can be added or removed.
+This is a fantasy sound chip, used in the specs2 fantasy computer designed by tildearrow. It includes native support for sample playback, but with only 8KB or 64KB of sample data, depending on the configuration used. Since 0.6pre1, this sound chip is no longer hidden by default and can be accessed through the module creation screen and can be added or removed.
 
 # effects
 
@@ -12,7 +12,7 @@ This is a fantasy sound chip, used in the specs2 fantasy computer designed by ti
   - 5: periodic noise
   - 6: XOR sine
   - 7: XOR triangle
-- `12xx`: set waveform (0 to 7F)
+- `12xx`: set pulse width (0 to 7F)
 - `13xx`: set resonance of filter (0 to FF)
   - despite what the internal effects list says (0 to F), you can use a resonance value from 0 to FF (255)
 - `14xx`: set filter mode and ringmod

papers/format.md

@@ -32,6 +32,8 @@ these fields are 0 in format versions prior to 100 (0.6pre1).
 
 the format versions are:
 
+- 114: Furnace dev114
+- 113: Furnace dev113
 - 112: Furnace dev112
 - 111: Furnace dev111
 - 110: Furnace dev110
@@ -254,6 +256,7 @@ size | description
      |   - 0xc3: OPN CSM - 10 channels
      |   - 0xc4: PC-98 CSM - 20 channels
      |   - 0xc5: YM2610B CSM - 20 channels
+     |   - 0xc6: MSM5232 - 8 channels
      |   - 0xde: YM2610B extended - 19 channels
      |   - 0xe0: QSound - 19 channels
      |   - 0xfd: Dummy System - 8 channels
@@ -338,7 +341,8 @@ size | description
   1  | broken initial position of porta after arp (>=101) or reserved
   1  | SN periods under 8 are treated as 1 (>=108) or reserved
   1  | cut/delay effect policy (>=110) or reserved
-  5  | reserved
+  1  | 0B/0D effect treatment (>=113) or reserved
+  4  | reserved
  --- | **virtual tempo data**
   2  | virtual tempo numerator of first song (>=96) or reserved
   2  | virtual tempo denominator of first song (>=96) or reserved
@@ -494,7 +498,8 @@ size | description
   1  | vib
   1  | ws
   1  | ksr
- 12  | reserved
+  1  | operator enabled (>=114) or reserved
+ 11  | reserved
  --- | **Game Boy instrument data**
   1  | volume
   1  | direction