Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/leonstyhre/emulationstation-de

Browse source
This commit is contained in:
Leon Styhre 2020-08-17 19:16:56 +02:00
parent ad960b28ac 7383322bac
commit 6633ee5028
6 changed files with 53 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
INSTALL.md
View file

@ -269,6 +269,7 @@ The following packages are not readily available for Windows, so clone the repos
git clone git://git.savannah.gnu.org/freetype/freetype2.git git clone git://git.savannah.gnu.org/freetype/freetype2.git
git checkout VER-2-10-2 git checkout VER-2-10-2
mkdir build mkdir build
cd build
cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON .. cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON ..
make make
``` ```
@ -276,6 +277,7 @@ make
[pugixml](https://pugixml.org) [pugixml](https://pugixml.org)
``` ```
git clone git://github.com/zeux/pugixml git clone git://github.com/zeux/pugixml
cd pugixml
git checkout v1.10 git checkout v1.10
cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON . cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON .
make make
@ -286,6 +288,7 @@ As for RapidJSON, you don't need to compile it, you just need the include files:
[RapidJSON](http://rapidjson.org) [RapidJSON](http://rapidjson.org)
``` ```
git clone git://github.com/Tencent/rapidjson git clone git://github.com/Tencent/rapidjson
cd rapidjson
git checkout v1.1.0 git checkout v1.1.0
``` ```

29
USERGUIDE.md
View file

@ -420,7 +420,7 @@ A selection of which systems to scrape for. It's possible to automatically scrap
#### Content settings #### Content settings
Describes the content types to include in the scraping. Most users will probably not need to adjust so many of these, excect perhaps to enable video scraping. Describes the content types to include in the scraping. Most users will probably not need to adjust so many of these.
**Scrape game names** **Scrape game names**
@ -436,7 +436,7 @@ This includes the game description, release date, developer, publisher, genre an
**Scrape videos** _(ScreenScraper only)_ **Scrape videos** _(ScreenScraper only)_
Videos of actual gameplay. This option is disabled by default as it slows down the scraping significantly as well as consuming bandwidth and disk space. Not all users want gameplay videos in their frontend after all. Videos of actual gameplay.
**Scrape screenshot images** **Scrape screenshot images**
@ -961,6 +961,11 @@ There are numerous locations throughout ES where custom scripts will be executed
The setup for this is a bit technical, so please refer to the [INSTALL.md](INSTALL.md) document to see how it's configured. The setup for this is a bit technical, so please refer to the [INSTALL.md](INSTALL.md) document to see how it's configured.
## Portable installation (Windows only)
On Windows, ES can be installed to and run from a removable media device such as a USB memory stick. Together with games and emulators this makes for a fully portable retro gaming solution. The setup is somewhat technical, please refer to the [INSTALL.md](INSTALL.md) document to see how it's configured.
## Command line arguments ## Command line arguments
You can use **--help** or **-h** to view a list of command line options, as shown here. You can use **--help** or **-h** to view a list of command line options, as shown here.
@ -1032,10 +1037,10 @@ Sometimes the name of the console is (more or less) the same for multiple region
| :-------------------- | :-------------------------------------------- | :----------------------------------- | | :-------------------- | :-------------------------------------------- | :----------------------------------- |
| 3do | 3DO | | | 3do | 3DO | |
| ags | Adventure Game Studio | | | ags | Adventure Game Studio | |
| amiga | Amiga | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) | | amiga | Commodore Amiga | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
| amiga600 | Amiga 600 | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) | | amiga600 | Commodore Amiga 600 | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
| amiga1200 | Amiga 1200 | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) | | amiga1200 | Commodore Amiga 1200 | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
| amigacd32 | Amiga CD32 | | | amigacd32 | Commodore Amiga CD32 | |
| amstradcpc | Amstrad CPC | | | amstradcpc | Amstrad CPC | |
| apple2 | Apple II | | | apple2 | Apple II | |
| apple2gs | Apple IIGS | | | apple2gs | Apple IIGS | |
@ -1050,7 +1055,7 @@ Sometimes the name of the console is (more or less) the same for multiple region
| atarilynx | Atari Lynx | | | atarilynx | Atari Lynx | |
| atarist | Atari ST | | | atarist | Atari ST | |
| atarixe | Atari XE | | | atarixe | Atari XE | |
| atomiswave | | | | atomiswave | Atomiswave | |
| bbcmicro | BBC Micro | | | bbcmicro | BBC Micro | |
| c64 | Commodore 64 | Single disk, tape or cartridge image in root folder and/or multi-disk images in separate folder | | c64 | Commodore 64 | Single disk, tape or cartridge image in root folder and/or multi-disk images in separate folder |
| cavestory | Cave Story (NXEngine) | | | cavestory | Cave Story (NXEngine) | |
@ -1067,13 +1072,13 @@ Sometimes the name of the console is (more or less) the same for multiple region
| famicom | Nintendo Family Computer | Single archive or ROM file in root folder | | famicom | Nintendo Family Computer | Single archive or ROM file in root folder |
| fba | Final Burn Alpha | Single archive file following MAME name standard | | fba | Final Burn Alpha | Single archive file following MAME name standard |
| fbneo | FinalBurn Neo | Single archive file following MAME name standard | | fbneo | FinalBurn Neo | Single archive file following MAME name standard |
| fds | Famicom Disk System | | | fds | Nintendo Famicom Disk System | |
| gameandwatch | Nintendo Game and Watch | | | gameandwatch | Nintendo Game and Watch | |
| gamegear | Sega Gamegear | | | gamegear | Sega Game Gear | |
| gamecube | Nintendo GameCube | | | gamecube | Nintendo GameCube | |
| gb | Game Boy | | | gb | Nintendo Game Boy | |
| gba | Game Boy Advance | | | gba | Nintendo Game Boy Advance | |
| gbc | Game Boy Color | | | gbc | Nintendo Game Boy Color | |
| genesis | Sega Genesis | Single archive or ROM file in root folder | | genesis | Sega Genesis | Single archive or ROM file in root folder |
| gx4000 | Amstrad GX4000 | | | gx4000 | Amstrad GX4000 | |
| intellivision | Mattel Electronics Intellivision | | | intellivision | Mattel Electronics Intellivision | |

17
es-app/src/guis/GuiScraperSearch.cpp
View file

@ -311,7 +311,6 @@ void GuiScraperSearch::onSearchDone(const std::vector<ScraperSearchResult>& resu
} }
else { else {
mFoundGame = true; mFoundGame = true;
if (!(mSearchType == ACCEPT_SINGLE_MATCHES && results.size() == 1)) {
ComponentListRow row; ComponentListRow row;
for (size_t i = 0; i < results.size(); i++) { for (size_t i = 0; i < results.size(); i++) {
@ -323,7 +322,6 @@ void GuiScraperSearch::onSearchDone(const std::vector<ScraperSearchResult>& resu
} }
mGrid.resetCursor(); mGrid.resetCursor();
} }
}
mBlockAccept = false; mBlockAccept = false;
updateInfoPane(); updateInfoPane();
@ -382,7 +380,20 @@ void GuiScraperSearch::updateInfoPane()
if (i != -1 && (int)mScraperResults.size() > i) { if (i != -1 && (int)mScraperResults.size() > i) {
ScraperSearchResult& res = mScraperResults.at(i); ScraperSearchResult& res = mScraperResults.at(i);
mResultName->setText(Utils::String::toUpper(res.mdl.get("name"))); std::string formattedName;
// Hack to make the game name align better with the image when using automatic mode.
mSearchType == ALWAYS_ACCEPT_FIRST_RESULT ?
formattedName = " " + Utils::String::toUpper(res.mdl.get("name")) :
formattedName = Utils::String::toUpper(res.mdl.get("name"));
// If the game name is too long, cut it down. This does not affect the value that
// is actually scraped.
if (formattedName.size() > 40)
formattedName = formattedName.erase(40, formattedName.size()-40) + "...";
mResultName->setText(formattedName);
mResultDesc->setText(Utils::String::toUpper(res.mdl.get("desc"))); mResultDesc->setText(Utils::String::toUpper(res.mdl.get("desc")));
mDescContainer->reset(); mDescContainer->reset();

2
es-core/src/Settings.cpp
View file

@ -164,7 +164,7 @@ void Settings::setDefaults()
mBoolMap["ScrapeCovers"] = true; mBoolMap["ScrapeCovers"] = true;
mBoolMap["ScrapeMarquees"] = true; mBoolMap["ScrapeMarquees"] = true;
mBoolMap["ScrapeScreenshots"] = true; mBoolMap["ScrapeScreenshots"] = true;
mBoolMap["ScrapeVideos"] = false; mBoolMap["ScrapeVideos"] = true;
// Other settings. // Other settings.
#ifdef _RPI_ #ifdef _RPI_

10
resources/templates/es_systems.cfg_unix
View file

@ -345,7 +345,7 @@
</system> </system>
<system> <system>
<name>fds</name> <name>fds</name>
<fullname>Famicom Disk System</fullname> <fullname>Nintendo Famicom Disk System</fullname>
<path>%ROMPATH%/fds</path> <path>%ROMPATH%/fds</path>
<extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension> <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
<command>retroarch -L ~/.config/retroarch/cores/nestopia_libretro.so %ROM%</command> <command>retroarch -L ~/.config/retroarch/cores/nestopia_libretro.so %ROM%</command>
@ -363,7 +363,7 @@
</system> </system>
<system> <system>
<name>gamegear</name> <name>gamegear</name>
<fullname>Sega Gamegear</fullname> <fullname>Sega Game Gear</fullname>
<path>%ROMPATH%/gamegear</path> <path>%ROMPATH%/gamegear</path>
<extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension> <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
<command>retroarch -L ~/.config/retroarch/cores/genesis_plus_gx_libretro.so %ROM%</command> <command>retroarch -L ~/.config/retroarch/cores/genesis_plus_gx_libretro.so %ROM%</command>
@ -381,7 +381,7 @@
</system> </system>
<system> <system>
<name>gb</name> <name>gb</name>
<fullname>Game Boy</fullname> <fullname>Nintendo Game Boy</fullname>
<path>%ROMPATH%/gb</path> <path>%ROMPATH%/gb</path>
<extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension> <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
<command>retroarch -L ~/.config/retroarch/cores/bsnes_libretro.so %ROM%</command> <command>retroarch -L ~/.config/retroarch/cores/bsnes_libretro.so %ROM%</command>
@ -390,7 +390,7 @@
</system> </system>
<system> <system>
<name>gba</name> <name>gba</name>
<fullname>Game Boy Advance</fullname> <fullname>Nintendo Game Boy Advance</fullname>
<path>%ROMPATH%/gba</path> <path>%ROMPATH%/gba</path>
<extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension> <extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension>
<command>retroarch -L ~/.config/retroarch/cores/mednafen_gba_libretro.so %ROM%</command> <command>retroarch -L ~/.config/retroarch/cores/mednafen_gba_libretro.so %ROM%</command>
@ -399,7 +399,7 @@
</system> </system>
<system> <system>
<name>gbc</name> <name>gbc</name>
<fullname>Game Boy Color</fullname> <fullname>Nintendo Game Boy Color</fullname>
<path>%ROMPATH%/gbc</path> <path>%ROMPATH%/gbc</path>
<extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension> <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
<command>retroarch -L ~/.config/retroarch/cores/bsnes_libretro.so %ROM%</command> <command>retroarch -L ~/.config/retroarch/cores/bsnes_libretro.so %ROM%</command>

10
resources/templates/es_systems.cfg_windows
View file

@ -345,7 +345,7 @@
</system> </system>
<system> <system>
<name>fds</name> <name>fds</name>
<fullname>Famicom Disk System</fullname> <fullname>Nintendo Famicom Disk System</fullname>
<path>%ROMPATH%\fds</path> <path>%ROMPATH%\fds</path>
<extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension> <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
<command>retroarch.exe -L "%EMUPATH%\cores\nestopia_libretro.dll" %ROM%</command> <command>retroarch.exe -L "%EMUPATH%\cores\nestopia_libretro.dll" %ROM%</command>
@ -363,7 +363,7 @@
</system> </system>
<system> <system>
<name>gamegear</name> <name>gamegear</name>
<fullname>Sega Gamegear</fullname> <fullname>Sega Game Gear</fullname>
<path>%ROMPATH%\gamegear</path> <path>%ROMPATH%\gamegear</path>
<extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension> <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
<command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command> <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
@ -381,7 +381,7 @@
</system> </system>
<system> <system>
<name>gb</name> <name>gb</name>
<fullname>Game Boy</fullname> <fullname>Nintendo Game Boy</fullname>
<path>%ROMPATH%\gb</path> <path>%ROMPATH%\gb</path>
<extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension> <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
<command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command> <command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command>
@ -390,7 +390,7 @@
</system> </system>
<system> <system>
<name>gba</name> <name>gba</name>
<fullname>Game Boy Advance</fullname> <fullname>Nintendo Game Boy Advance</fullname>
<path>%ROMPATH%\gba</path> <path>%ROMPATH%\gba</path>
<extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension> <extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension>
<command>retroarch.exe -L "%EMUPATH%\cores\mednafen_gba_libretro.dll" %ROM%</command> <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_gba_libretro.dll" %ROM%</command>
@ -399,7 +399,7 @@
</system> </system>
<system> <system>
<name>gbc</name> <name>gbc</name>
<fullname>Game Boy Color</fullname> <fullname>Nintendo Game Boy Color</fullname>
<path>%ROMPATH%\gbc</path> <path>%ROMPATH%\gbc</path>
<extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension> <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
<command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command> <command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command>