diff --git a/CHANGELOG.md b/CHANGELOG.md index ea296c202..b2caa0afc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -147,14 +147,17 @@ v1.2 maintenance release. ### Detailed list of changes -* (Windows) Set %RUNINBACKGROUND% when launching MAME standalone as this emulator may otherwise hang on exit * Removed the --escape-exit command line option for the PPSSPP standalone emulator as it caused issues for some users * Changed the default emulator for the famicom, fds and nes systems from Nestopia UE to Mesen +* Changed the default emulator for the gb and gbc systems from SameBoy to Gambatte +* Changed the default emulator for the gamegear system from Gearsystem to Genesis Plus GX * Changed the default emulator for the dos and pc systems from DOSBox-Core to DOSBox-Pure +* Changed the default emulator for the mame system from MAME 2003-Plus to MAME - Current * Added DOSBox-X standalone as an alternative emulator for the dos and pc systems * Added AetherSX2 standalone as an alternative emulator for the ps2 system on macOS -* (macOS) Categorized the application as a game so it shows up in the Launchpad games section +* (Windows) Set %RUNINBACKGROUND% when launching MAME standalone as this emulator may otherwise hang on exit * (Windows) Added an %ESCAPESPECIALS% variable that escapes the special characters &()^=;, +* (macOS) Categorized the application as a game so it shows up in the Launchpad games section * Updated the StringUtil::replace function as the old function was dangerous and could run into an endless loop ### Bug fixes diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md index 1224aa7c3..8afb8be37 100644 --- a/USERGUIDE-DEV.md +++ b/USERGUIDE-DEV.md @@ -2154,7 +2154,7 @@ If you generated the ROMs directory structure when first starting ES-DE, the sys For CD-based systems it's generally recommended to use CHD files (extension .chd) as this saves space due to compression compared to BIN/CUE, IMG, ISO etc. The CHD format is also supported by most emulators. You can convert to CHD from various formats using the MAME `chdman` utility, for example `chdman createcd -i mygame.iso -o mygame.chd`. Sometimes chdman has issues converting from the IMG and BIN formats, and in this case it's possible to first convert to ISO using `ccd2iso`, such as `ccd2iso mygame.img mygame.iso` or in the case of BIN files `ccd2iso mygame.bin mygame.iso`. -MAME emulation is a bit special as the choice of emulator depends on which ROM set you're using. It's recommended to go for the latest available set, as MAME is constantly improved with more complete and accurate emulation. Therefore the `arcade` system is configured to use _MAME - Current_ by default, which as the name implies will be the latest available MAME version. But if you have a really slow computer you may want to use another ROM set such as the popular 0.78. In this case, you can either select _MAME 2003-Plus_ as an alternative emulator, or you can use the `mame` system which comes configured with this emulator as the default. There are more MAME versions available as alternative emulators, as you can see in the table below. +MAME emulation is a bit special as the choice of emulator depends on which ROM set you're using. It's recommended to go for the latest available set, as MAME is constantly improved with more complete and accurate emulation. Therefore the `arcade` and `mame` systems are configured to use _MAME - Current_ by default, which as the name implies will be the latest available MAME version. But if you have a really slow computer you may want to use another ROM set such as the popular 0.78. In this case, you can select _MAME 2003-Plus_ as an alternative emulator. There are more MAME versions available as alternative emulators, as you can see in the table below. There are also other MAME forks and derivates available such as MAME4ALL, AdvanceMAME, FinalBurn Alpha and FinalBurn Neo but it's beyond the scope of this document to describe those in detail. For more information, refer to the [RetroPie arcade documentation](https://retropie.org.uk/docs/Arcade) which has a good overview of the various MAME alternatives. @@ -2171,7 +2171,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed | System name | Full name | Default emulator | Alternative emulators | Needs BIOS | Recommended game setup | | :-------------------- | :--------------------------------------------- | :-------------------------------- | :-------------------------------- | :----------- | :----------------------------------- | -| 3do | 3DO | Opera | | | | +| 3do | 3DO | Opera | | Yes | | | 64dd | Nintendo 64DD | Mupen64Plus-Next [UW],
ParaLLEl N64 [M] | ParaLLEl N64 [UW],
Mupen64Plus **(Standalone)** [UMW*],
sixtyforce **(Standalone)** [M] | | | | ags | Adventure Game Studio Game Engine | _Placeholder_ | | | | | amiga | Commodore Amiga | PUAE | PUAE 2021 | Yes | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc | @@ -2182,7 +2182,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed | android | Google Android | _Placeholder_ | | | | | apple2 | Apple II | _Placeholder_ | | | | | apple2gs | Apple IIGS | _Placeholder_ | | | | -| arcade | Arcade | MAME - Current | MAME 2000,
MAME 2003-Plus,
MAME 2010,
FinalBurn Neo,
FB Alpha 2012,
MAME **(Standalone)** [UMW*] | Depends | Single archive file following MAME name standard in root folder | +| arcade | Arcade | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME **(Standalone)** [UMW*],
FinalBurn Neo,
FB Alpha 2012 | Depends | Single archive file following MAME name standard in root folder | | astrocade | Bally Astrocade | _Placeholder_ | | | | | atari2600 | Atari 2600 | Stella | Stella 2014 | No | Single archive or ROM file in root folder | | atari5200 | Atari 5200 | a5200 | Atari800 | | | @@ -2215,10 +2215,10 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed | fbneo | FinalBurn Neo | FinalBurn Neo | | Yes | Single archive file following MAME name standard in root folder | | fds | Nintendo Famicom Disk System | Mesen | Nestopia UE,
FCEUmm | Yes | Single archive or ROM file in root folder | | gameandwatch | Nintendo Game and Watch | GW | | | | -| gamegear | Sega Game Gear | Gearsystem | SMS Plus GX,
Genesis Plus GX,
Genesis Plus GX Wide | | | -| gb | Nintendo Game Boy | SameBoy | Gambatte,
Gearboy,
TGB Dual,
Mesen-S,
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** | No | Single archive or ROM file in root folder | +| gamegear | Sega Game Gear | Genesis Plus GX | Genesis Plus GX Wide,
Gearsystem,
SMS Plus GX | | | +| gb | Nintendo Game Boy | Gambatte | SameBoy,
Gearboy,
TGB Dual,
Mesen-S,
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** | No | Single archive or ROM file in root folder | | gba | Nintendo Game Boy Advance | mGBA | mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** [UMW*],
VBA Next,
gpSP | No | Single archive or ROM file in root folder | -| gbc | Nintendo Game Boy Color | SameBoy | Gambatte,
Gearboy,
TGB Dual,
Mesen-S,
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** | No | Single archive or ROM file in root folder | +| gbc | Nintendo Game Boy Color | Gambatte | SameBoy,
Gearboy,
TGB Dual,
Mesen-S,
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** | No | Single archive or ROM file in root folder | | gc | Nintendo GameCube | Dolphin | Dolphin **(Standalone)** [UMW*], PrimeHack **(Standalone)** [U] | No | Single .iso file in root folder | | genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
BlastEm,
BlastEm **(Standalone)** [U] | No | Single archive or ROM file in root folder | | gx4000 | Amstrad GX4000 | _Placeholder_ | | | | @@ -2228,7 +2228,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed | lutris | Lutris Open Gaming Platform | Lutris application **(Standalone)** [U] | | No | Shell script in root folder | | lutro | Lutro Game Engine | Lutro | | | | | macintosh | Apple Macintosh | _Placeholder_ | | | | -| mame | Multiple Arcade Machine Emulator | MAME 2003-Plus | MAME 2000,
MAME 2010,
MAME - Current,
FinalBurn Neo,
FB Alpha 2012,
MAME **(Standalone)** [UMW*] | Depends | Single archive file following MAME name standard in root folder | +| mame | Multiple Arcade Machine Emulator | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME **(Standalone)** [UMW*],
FinalBurn Neo,
FB Alpha 2012 | Depends | Single archive file following MAME name standard in root folder | | mame-advmame | AdvanceMAME | _Placeholder_ | | Depends | Single archive file following MAME name standard in root folder | | mame-mame4all | MAME4ALL | _Placeholder_ | | Depends | Single archive file following MAME name standard in root folder | | mastersystem | Sega Master System | Genesis Plus GX | Genesis Plus GX Wide,
SMS Plus GX,
Gearsystem,
PicoDrive | No | Single archive or ROM file in root folder | @@ -2311,7 +2311,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed | wonderswancolor | Bandai WonderSwan Color | Beetle Cygne | | | | | x1 | Sharp X1 | x1 | | | Single archive or ROM file in root folder | | x68000 | Sharp X68000 | PX68k | | | | -| xbox | Microsoft Xbox | xemu **(Standalone)** [UMW*] | | Yes | Single .iso file in root folder | +| xbox | Microsoft Xbox | xemu **(Standalone)** [UMW*] | | Yes | Single .iso file in root folder | | xbox360 | Microsoft Xbox 360 | xenia **(Standalone)** [W*] | | No | | | zmachine | Infocom Z-machine | _Placeholder_ | | | | | zx81 | Sinclair ZX81 | EightyOne | | | | diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 839b79fe0..061b7288a 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -2,7 +2,7 @@ EmulationStation Desktop Edition (ES-DE) - Portable installation on Windows --------------------------------------------------------------------------- ES-DE release: -1.2.3 +1.2.4 Instructions: @@ -29,6 +29,7 @@ Emulators\Citra\canary-mingw\citra.exe Emulators\Citra\nightly-mingw\citra.exe Emulators\Dolphin-x64\Dolphin.exe Emulators\dosbox-staging\dosbox.exe +Emulators\DOSBox-X\dosbox-x.exe Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe Emulators\flycast\flycast.exe