joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update ref conf and timestamp

Browse Source
This commit is contained in:
Wengier
2021-01-30 21:14:12 -05:00
parent c952f5a6f8
commit f999029476
7 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -1,7 +1,8 @@
0.83.10
- The Window key(s) in Windows and the Command key(s)
in macOS will be displayed as "Windows" & "Command"
keys instead of "super" & "meta" keys. (Wengier)
in macOS will now be displayed as the "Windows" and
"Command" keys instead of the "super" and "meta"
keys in SDL1 builds just like SDL2 builds. (Wengier)
- Cursor blinking rate for TrueType font (TTF) output
can now be customized with the ttf.blinkc option.
Set an integer between 1 (fastest) and 7 (slowest)

2
contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
View File

@@ -10,7 +10,7 @@
<category>Emulation</category>
</categories>
<releases>
<release version="@PACKAGE_VERSION@" date="2021-1-24"/>
<release version="@PACKAGE_VERSION@" date="2021-1-30"/>
</releases>
<screenshots>
<screenshot type="default">

5
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@@ -913,13 +913,14 @@ vsyncrate = 75
# 'max' will allocate as much cycles as your computer is able to
# handle.
# Possible values: auto, fixed, max.
# cycleup: Amount of cycles to decrease/increase with keycombos.(CTRL-F11/CTRL-F12)
# cycleup: Amount of cycles to decrease/increase with the mapped keyboard shortcut.
# cycledown: Setting it lower than 100 will be a percentage.
# cycle emulation percentage adjust: The percentage adjustment for use with the "Emulate CPU speed" feature. Default is 0 (no adjustment), but you can adjust it (between -25% and 25%) if necessary.
# use dynamic core with paging on: Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.
# If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.
# If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.
# If set to auto, this option will be enabled when 386 paging is enabled.
# If set to auto, this option will be enabled depending on if the 386 paging and a guest system is currently active.
# Possible values: true, false, 1, 0, auto.
#DOSBOX-X-ADV:# ignore opcode 63: When debugging, do not report illegal opcode 0x63.
#DOSBOX-X-ADV:# Enable this option to ignore spurious errors while debugging from within Windows 3.1/9x/ME
# apmbios: Emulate Advanced Power Management BIOS calls

5
dosbox-x.reference.conf
View File

@@ -276,13 +276,14 @@ vsyncrate = 75
# 'max' will allocate as much cycles as your computer is able to
# handle.
# Possible values: auto, fixed, max.
# cycleup: Amount of cycles to decrease/increase with keycombos.(CTRL-F11/CTRL-F12)
# cycleup: Amount of cycles to decrease/increase with the mapped keyboard shortcut.
# cycledown: Setting it lower than 100 will be a percentage.
# cycle emulation percentage adjust: The percentage adjustment for use with the "Emulate CPU speed" feature. Default is 0 (no adjustment), but you can adjust it (between -25% and 25%) if necessary.
# use dynamic core with paging on: Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.
# If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.
# If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.
# If set to auto, this option will be enabled when 386 paging is enabled.
# If set to auto, this option will be enabled depending on if the 386 paging and a guest system is currently active.
# Possible values: true, false, 1, 0, auto.
# apmbios: Emulate Advanced Power Management BIOS calls
core = auto
fpu = true

5
dosbox-x.reference.full.conf
View File

@@ -913,13 +913,14 @@ vsyncrate = 75
# 'max' will allocate as much cycles as your computer is able to
# handle.
# Possible values: auto, fixed, max.
# cycleup: Amount of cycles to decrease/increase with keycombos.(CTRL-F11/CTRL-F12)
# cycleup: Amount of cycles to decrease/increase with the mapped keyboard shortcut.
# cycledown: Setting it lower than 100 will be a percentage.
# cycle emulation percentage adjust: The percentage adjustment for use with the "Emulate CPU speed" feature. Default is 0 (no adjustment), but you can adjust it (between -25% and 25%) if necessary.
# use dynamic core with paging on: Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.
# If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.
# If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.
# If set to auto, this option will be enabled when 386 paging is enabled.
# If set to auto, this option will be enabled depending on if the 386 paging and a guest system is currently active.
# Possible values: true, false, 1, 0, auto.
# ignore opcode 63: When debugging, do not report illegal opcode 0x63.
# Enable this option to ignore spurious errors while debugging from within Windows 3.1/9x/ME
# apmbios: Emulate Advanced Power Management BIOS calls

4
include/build_timestamp.h
View File

@@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Jan 24, 2021 2:26:23am"
#define GIT_COMMIT_HASH "16a26bc"
#define UPDATED_STR "Jan 30, 2021 9:13:43pm"
#define GIT_COMMIT_HASH "c952f5a"
#define COPYRIGHT_END_YEAR "2021"

7
src/dosbox.cpp
View File

@@ -1079,7 +1079,6 @@ void DOSBOX_SetupConfigSections(void) {
const char* pc98videomodeopt[] = { "", "24khz", "31khz", "15khz", 0};
const char* aspectmodes[] = { "false", "true", "0", "1", "yes", "no", "nearest", "bilinear", 0};
const char *vga_ac_mapping_settings[] = { "", "auto", "4x4", "4low", "first16", 0 };
const char* dynamic_core_with_paging_settings[] = { "auto", "true", "false", 0 };
const char* hostkeys[] = {
"ctrlalt", "ctrlshift", "altshift", "mapper", 0 };
@@ -2305,7 +2304,7 @@ void DOSBOX_SetupConfigSections(void) {
Pint = secprop->Add_int("cycleup",Property::Changeable::Always,10);
Pint->SetMinMax(1,1000000);
Pint->Set_help("Amount of cycles to decrease/increase with keycombos.(CTRL-F11/CTRL-F12)");
Pint->Set_help("Amount of cycles to decrease/increase with the mapped keyboard shortcut.");
Pint->SetBasic(true);
Pint = secprop->Add_int("cycledown",Property::Changeable::Always,20);
@@ -2319,11 +2318,11 @@ void DOSBOX_SetupConfigSections(void) {
Pint->SetBasic(true);
Pstring = secprop->Add_string("use dynamic core with paging on",Property::Changeable::Always,"auto");
Pstring->Set_values(dynamic_core_with_paging_settings);
Pstring->Set_values(truefalseautoopt);
Pstring->Set_help("Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.\n"
"If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.\n"
"If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.\n"
"If set to auto, this option will be enabled when 386 paging is enabled.");
"If set to auto, this option will be enabled depending on if the 386 paging and a guest system is currently active.");
Pstring->SetBasic(true);
Pbool = secprop->Add_bool("ignore opcode 63",Property::Changeable::Always,true);