diff --git a/NEWS.md b/NEWS.md index bba3a03c7..0e850e8c5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -39,6 +39,7 @@ Many bugs have been fixed, and numerous features that were only partially implem * GUI-configurable option to sort folders on top of the gamelists * Added new component GuiComplexTextEditPopup to handle changes to configuration file entries and similar * Speed improvements and optimizations, the application now starts faster and feels more responsive +* Added metadata entry to mark games as broken/not working * Moved all resources to a subdirectory structure and enabled the CMake install prefix variable to generate the resources search path * Changed theme directory to the install prefix (e.g. /usr/local/share/emulationstation/themes) with themes in the home directory taking precedence * No more attempts to open files directly under /etc, instead only the install prefix directory and the home directory are used diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index a9d8e1c79..45c48cdaa 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -52,7 +52,7 @@ namespace PlatformIds "virtualboy", "gameandwatch", "openbor", - "pc", + "dos", "sega32x", "segacd", "dreamcast", diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index bca70fc7f..2ef1c94c5 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -52,7 +52,7 @@ namespace PlatformIds NINTENDO_VIRTUAL_BOY, NINTENDO_GAME_AND_WATCH, OPENBOR, - PC, + DOS, SEGA_32X, SEGA_CD, SEGA_DREAMCAST, diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index f45196155..bffb4e844 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -77,7 +77,7 @@ const std::map gamesdb_new_platformid_map { { NINTENDO_WII_U, "38" }, { NINTENDO_VIRTUAL_BOY, "4918" }, { NINTENDO_GAME_AND_WATCH, "-1" }, - { PC, "1" }, + { DOS, "1" }, { SEGA_32X, "33" }, { SEGA_CD, "21" }, { SEGA_DREAMCAST, "16" }, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index 863006235..36fc589b5 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -61,7 +61,7 @@ const std::map screenscraper_platformid_map { { NINTENDO_WII_U, 18 }, { NINTENDO_VIRTUAL_BOY, 11 }, { NINTENDO_GAME_AND_WATCH, 52 }, - { PC, 135 }, + { DOS, 135 }, { OPENBOR, 214 }, { SCUMMVM, 123}, { SEGA_32X, 19 }, diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix index 1b43f878b..0d59ff612 100644 --- a/resources/templates/es_systems.cfg_unix +++ b/resources/templates/es_systems.cfg_unix @@ -235,6 +235,15 @@ doom doom + + dos + DOS (PC) + %ROMPATH%/dos + .bat .BAT .com .COM .dos .DOS .exe .EXE .pc .PC .7z .7Z .zip .ZIP + retroarch -L ~/.config/retroarch/cores/dosbox_core_libretro.so %ROM% + dos + dos + dragon32 Dragon 32 @@ -568,15 +577,6 @@ oric oric - - pc - PC (DOS) - %ROMPATH%/pc - .bat .BAT .com .COM .dos .DOS .exe .EXE .pc .PC .7z .7Z .zip .ZIP - retroarch -L ~/.config/retroarch/cores/dosbox_core_libretro.so %ROM% - pc - pc - pcengine NEC PC Engine diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows index a1e7101be..94fcba58e 100644 --- a/resources/templates/es_systems.cfg_windows +++ b/resources/templates/es_systems.cfg_windows @@ -235,6 +235,15 @@ doom doom + + dos + DOS (PC) + %ROMPATH%\dos + .bat .BAT .com .COM .dos .DOS .exe .EXE .pc .PC .7z .7Z .zip .ZIP + retroarch.exe -L "%EMUPATH%\cores\dosbox_core_libretro.dll" %ROM% + dos + dos + dragon32 Dragon 32 @@ -568,15 +577,6 @@ oric oric - - pc - PC (DOS) - %ROMPATH%\pc - .bat .BAT .com .COM .dos .DOS .exe .EXE .pc .PC .7z .7Z .zip .ZIP - retroarch.exe -L "%EMUPATH%\cores\dosbox_core_libretro.dll" %ROM% - pc - pc - pcengine NEC PC Engine diff --git a/themes/rbsimple-DE/MISSING.md b/themes/rbsimple-DE/MISSING.md index 9d5d1876b..481e6ca23 100644 --- a/themes/rbsimple-DE/MISSING.md +++ b/themes/rbsimple-DE/MISSING.md @@ -24,6 +24,7 @@ Missing (or not updated) theme data * channelf: Fairchild Channel F - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg * coco: Tandy Color Computer - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg * daphne: Daphne Arcade Laserdisc Emulator - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg +* dos: DOS - system info * desktop: Desktop applications - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg * dragon32: Dragon 32 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg * intellivision: Intellivision - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg diff --git a/themes/rbsimple-DE/c64/images/console.svg b/themes/rbsimple-DE/c64/images/console.svg index f03fb4943..4ca6278fb 100644 --- a/themes/rbsimple-DE/c64/images/console.svg +++ b/themes/rbsimple-DE/c64/images/console.svg @@ -1,1383 +1,3911 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/rbsimple-DE/c64/images/consolegame.svg b/themes/rbsimple-DE/c64/images/consolegame.svg index 6924f962d..4bc684cbc 100644 --- a/themes/rbsimple-DE/c64/images/consolegame.svg +++ b/themes/rbsimple-DE/c64/images/consolegame.svg @@ -15,13 +15,13 @@ y="0px" viewBox="0 0 4986.8649 1271.8" xml:space="preserve" - inkscape:version="0.91 r13725" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="consolegame.svg" width="4986.8647" height="1271.8">image/svg+xml + - - - - - - - - + +image/svg+xml + + + + + + + + + + - - + + - - - - - - + + + + + - - + + - - - - - + + + \ No newline at end of file diff --git a/themes/rbsimple-DE/pc/colors.xml b/themes/rbsimple-DE/dos/colors.xml similarity index 100% rename from themes/rbsimple-DE/pc/colors.xml rename to themes/rbsimple-DE/dos/colors.xml diff --git a/themes/rbsimple-DE/pc/images/console.svg b/themes/rbsimple-DE/dos/images/console.svg similarity index 100% rename from themes/rbsimple-DE/pc/images/console.svg rename to themes/rbsimple-DE/dos/images/console.svg diff --git a/themes/rbsimple-DE/pc/images/consolegame.svg b/themes/rbsimple-DE/dos/images/consolegame.svg similarity index 72% rename from themes/rbsimple-DE/pc/images/consolegame.svg rename to themes/rbsimple-DE/dos/images/consolegame.svg index 6900d00ea..c9c949c33 100644 --- a/themes/rbsimple-DE/pc/images/consolegame.svg +++ b/themes/rbsimple-DE/dos/images/consolegame.svg @@ -13,7 +13,7 @@ xml:space="preserve" version="1.1" id="svg2" - inkscape:version="0.91 r13725" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="consolegame.svg">image/svg+xml \ No newline at end of file + transform="matrix(0.61805316,0,0,0.61805316,296.96809,139.99256)" + id="g882"> \ No newline at end of file diff --git a/themes/rbsimple-DE/pc/images/controller.svg b/themes/rbsimple-DE/dos/images/controller.svg similarity index 100% rename from themes/rbsimple-DE/pc/images/controller.svg rename to themes/rbsimple-DE/dos/images/controller.svg diff --git a/themes/rbsimple-DE/dos/images/game.svg b/themes/rbsimple-DE/dos/images/game.svg new file mode 100644 index 000000000..27dd5da99 --- /dev/null +++ b/themes/rbsimple-DE/dos/images/game.svg @@ -0,0 +1,107 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/rbsimple-DE/pc/images/game.svg b/themes/rbsimple-DE/dos/images/game2.svg similarity index 100% rename from themes/rbsimple-DE/pc/images/game.svg rename to themes/rbsimple-DE/dos/images/game2.svg diff --git a/themes/rbsimple-DE/dos/images/logo.svg b/themes/rbsimple-DE/dos/images/logo.svg new file mode 100644 index 000000000..7b214a104 --- /dev/null +++ b/themes/rbsimple-DE/dos/images/logo.svg @@ -0,0 +1,146 @@ + + + + + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/rbsimple-DE/pc/images/logo2.svg b/themes/rbsimple-DE/dos/images/logo2.svg similarity index 100% rename from themes/rbsimple-DE/pc/images/logo2.svg rename to themes/rbsimple-DE/dos/images/logo2.svg diff --git a/themes/rbsimple-DE/dos/systeminfo.xml b/themes/rbsimple-DE/dos/systeminfo.xml new file mode 100644 index 000000000..2699de740 --- /dev/null +++ b/themes/rbsimple-DE/dos/systeminfo.xml @@ -0,0 +1,12 @@ + + 6 + + + + Developers: Microsoft, IBM + + + Year of Release : 1981 + + + diff --git a/themes/rbsimple-DE/pc/theme.xml b/themes/rbsimple-DE/dos/theme.xml similarity index 100% rename from themes/rbsimple-DE/pc/theme.xml rename to themes/rbsimple-DE/dos/theme.xml diff --git a/themes/rbsimple-DE/pc/images/logo.svg b/themes/rbsimple-DE/pc/images/logo.svg deleted file mode 100644 index 2bd47333a..000000000 --- a/themes/rbsimple-DE/pc/images/logo.svg +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/rbsimple-DE/pc/systeminfo.xml b/themes/rbsimple-DE/pc/systeminfo.xml deleted file mode 100644 index 98a5f7518..000000000 --- a/themes/rbsimple-DE/pc/systeminfo.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 6 - - - - Manufacturer: IBM - - - Year of Release : 1981 - - - The IBM Personal Computer, commonly known as the IBM PC, - - - is the original version and progenitor of the IBM PC compatible hardware platform. - - - It is IBM model number 5150, and was introduced on August 12, 1981. - - - It was created by a team of engineers and designers under the direction of - - - Don Estridge of the IBM Entry Systems Division in Boca Raton, Florida. - - -