diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index 7c915bdfcc5..de3e0220421 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index a92d5fef573..f6b184280b9 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 0.83.22. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 0.83.23. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. @@ -873,7 +873,8 @@ j3100colorscroll = false #DOSBOX-X-ADV:# the mode list reported to the DOS application. #DOSBOX-X-ADV:# vesa vbe 1.2 modes are 32bpp: If set, truecolor (16M color) VESA BIOS modes in the 0x100-0x11F range are 32bpp. If clear, they are 24bpp. #DOSBOX-X-ADV:# Some DOS games and demos assume one bit depth or the other and do not enumerate VESA BIOS modes, which is why this -#DOSBOX-X-ADV:# option exists. +#DOSBOX-X-ADV:# option exists. If set to auto, this is determined by the type of SVGA chipset emulated. +#DOSBOX-X-ADV:# Possible values: true, false, 1, 0, auto. #DOSBOX-X-ADV:# allow low resolution vesa modes: If set, allow low resolution VESA modes (320x200x16/24/32bpp and so on). You could set this to false to simulate #DOSBOX-X-ADV:# SVGA hardware with a BIOS that does not support the lowres modes for testing purposes. #DOSBOX-X-ADV:# allow explicit 24bpp vesa modes: If set, additional 24bpp modes are listed in the modelist regardless whether modes 0x100-0x11F are @@ -970,7 +971,7 @@ high intensity blinking = true #DOSBOX-X-ADV:vesa modelist width limit = 1280 #DOSBOX-X-ADV:vesa modelist height limit = 1024 #DOSBOX-X-ADV:vesa vbe put modelist in vesa information = false -#DOSBOX-X-ADV:vesa vbe 1.2 modes are 32bpp = true +#DOSBOX-X-ADV:vesa vbe 1.2 modes are 32bpp = auto #DOSBOX-X-ADV:allow low resolution vesa modes = true #DOSBOX-X-ADV:allow explicit 24bpp vesa modes = false #DOSBOX-X-ADV:allow high definition vesa modes = false @@ -1415,7 +1416,7 @@ mt32.model = auto #DOSBOX-X-ADV:mt32.reverb.output.gain = 100 #DOSBOX-X-ADV:mt32.reverb.time = 5 #DOSBOX-X-ADV:mt32.reverb.level = 3 -#DOSBOX-X-ADV:mt32.rate = 44100 +#DOSBOX-X-ADV:mt32.rate = 48000 #DOSBOX-X-ADV:mt32.src.quality = 2 #DOSBOX-X-ADV:mt32.niceampramp = true fluid.driver = default diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index aa7423d946b..1e08d86c952 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 0.83.22. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 0.83.23. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 75d5b2dc27c..43dbb5c626f 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 0.83.22. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 0.83.23. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. @@ -853,7 +853,8 @@ j3100colorscroll = false # the mode list reported to the DOS application. # vesa vbe 1.2 modes are 32bpp: If set, truecolor (16M color) VESA BIOS modes in the 0x100-0x11F range are 32bpp. If clear, they are 24bpp. # Some DOS games and demos assume one bit depth or the other and do not enumerate VESA BIOS modes, which is why this -# option exists. +# option exists. If set to auto, this is determined by the type of SVGA chipset emulated. +# Possible values: true, false, 1, 0, auto. # allow low resolution vesa modes: If set, allow low resolution VESA modes (320x200x16/24/32bpp and so on). You could set this to false to simulate # SVGA hardware with a BIOS that does not support the lowres modes for testing purposes. # allow explicit 24bpp vesa modes: If set, additional 24bpp modes are listed in the modelist regardless whether modes 0x100-0x11F are @@ -946,7 +947,7 @@ vesa modelist cap = 0 vesa modelist width limit = 1280 vesa modelist height limit = 1024 vesa vbe put modelist in vesa information = false -vesa vbe 1.2 modes are 32bpp = true +vesa vbe 1.2 modes are 32bpp = auto allow low resolution vesa modes = true allow explicit 24bpp vesa modes = false allow high definition vesa modes = false @@ -1379,7 +1380,7 @@ mt32.reverb.mode = auto mt32.reverb.output.gain = 100 mt32.reverb.time = 5 mt32.reverb.level = 3 -mt32.rate = 44100 +mt32.rate = 48000 mt32.src.quality = 2 mt32.niceampramp = true fluid.driver = default diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 1420ded031a..b1e794b4398 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Jan 31, 2022 6:04:49pm" -#define GIT_COMMIT_HASH "dbfa1ef" +#define UPDATED_STR "Feb 28, 2022 6:11:41pm" +#define GIT_COMMIT_HASH "56e78a5" #define COPYRIGHT_END_YEAR "2022"