From 6dc6ab844796460b187917caa0934b23974dc381 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 15 May 2022 09:58:03 +0200 Subject: [PATCH] Updated all links to the new GitLab namespace. --- CHANGELOG.md | 3 +++ CONTRIBUTING.md | 2 +- CREDITS.md | 2 +- FAQ.md | 4 +-- INSTALL-DEV.md | 6 ++--- INSTALL.md | 6 ++--- README.md | 26 +++++++++---------- USERGUIDE-DEV.md | 4 +-- es-app/assets/latest_steam_deck_appimage.txt | 2 +- .../org.es_de.emulationstation-de.appdata.xml | 16 ++++++------ .../assets/org.es_de.emulationstation-de.yml | 2 +- themes/modern-DE/README.md | 14 +++++----- tools/generate_man_page.sh | 2 +- 13 files changed, 46 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6720a4597..eb514bebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -158,6 +158,9 @@ v1.2 maintenance release. * 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 +* Changed the steam platform to use the ScreenScraper "PC Windows" platform ID +* Added a new pcwindows platform for scraping PC (Windows) games +* Changed the platform to pcwindows for the epic system * Added an Xbox Kinect controller badge icon * (macOS) Categorized the application as a game so it shows up in the Launchpad games section * Replaced the explicit shell commands in es_systems.xml with %EMULATOR_OS-SHELL% find rules diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b59b75cbd..120aeb6cd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ Another specific area where help is needed is to research and potentially develo The ES-DE development is tracked using a Kanban board which is publicly visible at the GitLab project site: -[https://gitlab.com/leonstyhre/emulationstation-de/-/boards](https://gitlab.com/leonstyhre/emulationstation-de/-/boards) +[https://gitlab.com/es-de/emulationstation-de/-/boards](https://gitlab.com/es-de/emulationstation-de/-/boards) Development takes place in the `master` branch, and bug fixes/point releases are handled in the `stable` branch. diff --git a/CREDITS.md b/CREDITS.md index 4cc1a1c40..2bef4beba 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -9,7 +9,7 @@ RetroPie Community (RetroPie fork) \ https://retropie.org.uk Leon Styhre (Desktop Edition fork, based on the RetroPie version) \ -https://gitlab.com/leonstyhre/emulationstation-de +https://gitlab.com/es-de/emulationstation-de # UI Art & Design diff --git a/FAQ.md b/FAQ.md index c41dc9e95..bd2a7c301 100644 --- a/FAQ.md +++ b/FAQ.md @@ -72,7 +72,7 @@ Yes it's possible to both customize existing systems that are part of the bundle Most RetroPie EmulationStation theme sets will work with ES-DE, and there are numerous resources online on where to find these. How to install them is described in the _Themes_ section of the [User guide](USERGUIDE.md#themes). Just be aware that some of these themes do not include support for modern systems like PlayStation 3 and Nintendo Switch so those platforms may look a bit ugly depending on how the theme is written. -## The themes I've added don't seem to work, what's wrong? +## The themes I've added don't seem to work? Only RetroPie EmulationStation themes are supported, you can't use themes that were specifically developed for Batocera or Recalbox EmulationStation. A very few RetroPie themes like es-theme-carbon-2021 will not work either due to technical reasons. @@ -94,7 +94,7 @@ Yes to a certain extent this is supported and at least [Skraper](https://www.skr ## I'm missing a feature, how can I make a request to have it added? -First check the project [Kanban](https://gitlab.com/leonstyhre/emulationstation-de/-/boards/1823720) board which contains an overview of planned future features and changes and search for the functionality you would like to see added. Chances are there is already a card on the board describing precisely what you intended to request. You can also check the [Release roadmap](CONTRIBUTING.md) which includes the planned implementation of major features. If you can't find the feature you're looking for, you can request it either via adding an issue directly to the Kanban board, or by asking for it in our [Discord](https://discord.gg/EVVX4DqWAP) server or [subreddit](https://www.reddit.com/r/EmulationStation_DE/). +First check the project [Kanban](https://gitlab.com/es-de/emulationstation-de/-/boards/1823720) board which contains an overview of planned future features and changes and search for the functionality you would like to see added. Chances are there is already a card on the board describing precisely what you intended to request. You can also check the [Release roadmap](CONTRIBUTING.md) which includes the planned implementation of major features. If you can't find the feature you're looking for, you can request it either via adding an issue directly to the Kanban board, or by asking for it in our [Discord](https://discord.gg/EVVX4DqWAP) server or [subreddit](https://www.reddit.com/r/EmulationStation_DE/). ## I want to setup a gaming appliance based on the Raspberry Pi, can I use ES-DE for this? diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md index 902344e55..0fe5a3683 100644 --- a/INSTALL-DEV.md +++ b/INSTALL-DEV.md @@ -113,7 +113,7 @@ make install To clone the source repository, run the following: ``` -git clone https://gitlab.com/leonstyhre/emulationstation-de.git +git clone https://gitlab.com/es-de/emulationstation-de.git ``` Then generate the Makefile and build the software: @@ -470,7 +470,7 @@ sudo /usr/sbin/DevToolsSecurity --enable To clone the source repository, run the following: ``` -git clone https://gitlab.com/leonstyhre/emulationstation-de.git +git clone https://gitlab.com/es-de/emulationstation-de.git ``` On macOS all dependencies are built in-tree in the `external` directory tree. There are two scripts in the tools directory that automate this entirely and they are executed such as this: @@ -723,7 +723,7 @@ In the descriptions below it's assumed that all build steps for MinGW/GCC will b To clone the source repository, run the following: ``` -git clone https://gitlab.com/leonstyhre/emulationstation-de.git +git clone https://gitlab.com/es-de/emulationstation-de.git ``` By default the master branch will be used, which is where development takes place. To instead build a stable release, switch to the `stable-x.x` branch for the version, for example: diff --git a/INSTALL.md b/INSTALL.md index 2f938ddd8..b600f453f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -145,7 +145,7 @@ make install To clone the source repository, run the following: ``` -git clone https://gitlab.com/leonstyhre/emulationstation-de.git +git clone https://gitlab.com/es-de/emulationstation-de.git ``` Then generate the Makefile and build the software: @@ -505,7 +505,7 @@ sudo /usr/sbin/DevToolsSecurity --enable To clone the source repository, run the following: ``` -git clone https://gitlab.com/leonstyhre/emulationstation-de.git +git clone https://gitlab.com/es-de/emulationstation-de.git ``` For macOS all dependencies are built in-tree in the `external` directory tree. There are two scripts in the tools directory that automate this entirely and they are executed such as this: @@ -879,7 +879,7 @@ make This works the same as on Unix or macOS, just run the following: ``` -git clone https://gitlab.com/leonstyhre/emulationstation-de.git +git clone https://gitlab.com/es-de/emulationstation-de.git ``` By default the master branch will be used, which is where development takes place. To instead build a stable release, switch to the `stable-x.x` branch for the version, for example: diff --git a/README.md b/README.md index f7237244a..4b3471510 100644 --- a/README.md +++ b/README.md @@ -39,26 +39,26 @@ The latest version is 1.2.3 (released 2022-05-04) | Package | Operating systems | Architecture | Download link | | :------------------- | :------------------------------------------------------ | :----------- | :------------- | -| Windows installer | Windows 11, 10 and 8.1 | x64 (x86) | [EmulationStation-DE-1.2.3-x64.exe](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880279/download)| -| Windows portable | Windows 11, 10 and 8.1 | x64 (x86) | [EmulationStation-DE-1.2.3-x64_Portable.zip](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880305/download)| -| macOS DMG installer | macOS 10.14 "Mojave" to 12 "Monterey" | x64 (x86) | [EmulationStation-DE-1.2.3-x64.dmg](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880259/download)| -| macOS DMG installer | macOS 11 "Big Sur" to 12 "Monterey" | arm64 (M1) | [EmulationStation-DE-1.2.3-arm64.dmg](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880205/download)| -| Debian DEB package | Ubuntu 20.04 to 21.10, Linux Mint 20, possibly others | x64 (x86) | [emulationstation-de-1.2.3-x64.deb](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880232/download)| -| Fedora RPM package | Fedora Workstation 35, possibly others | x64 (x86) | [emulationstation-de-1.2.3-x64.rpm](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880315/download)| +| Windows installer | Windows 11, 10 and 8.1 | x64 (x86) | [EmulationStation-DE-1.2.3-x64.exe](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880279/download)| +| Windows portable | Windows 11, 10 and 8.1 | x64 (x86) | [EmulationStation-DE-1.2.3-x64_Portable.zip](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880305/download)| +| macOS DMG installer | macOS 10.14 "Mojave" to 12 "Monterey" | x64 (x86) | [EmulationStation-DE-1.2.3-x64.dmg](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880259/download)| +| macOS DMG installer | macOS 11 "Big Sur" to 12 "Monterey" | arm64 (M1) | [EmulationStation-DE-1.2.3-arm64.dmg](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880205/download)| +| Debian DEB package | Ubuntu 20.04 to 21.10, Linux Mint 20, possibly others | x64 (x86) | [emulationstation-de-1.2.3-x64.deb](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880232/download)| +| Fedora RPM package | Fedora Workstation 35, possibly others | x64 (x86) | [emulationstation-de-1.2.3-x64.rpm](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880315/download)| | Arch User Repository | Arch Linux, Manjaro, possibly others | x64 (x86) | [https://aur.archlinux.org/packages/emulationstation-de](https://aur.archlinux.org/packages/emulationstation-de)| -| Linux AppImage | Most Linux distributions | x64 (x86) | [EmulationStation-DE-x64.AppImage](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880344/download)| -| Linux AppImage | Current Linux distributions with libc 2.34 or later | x64 (x86) | [EmulationStation-DE-x64_Current.AppImage](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880370/download)| -| Linux AppImage | Steam Deck / SteamOS 3.0 specific | x64 (x86) | [EmulationStation-DE-x64_SteamDeck.AppImage](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880401/download)| -| Debian DEB package | Raspberry Pi OS (Raspian) | ARM 32-bit | [emulationstation-de-1.2.3-armv7l.deb](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880216/download)| -| Debian DEB package | Raspberry Pi OS (Raspian) | ARM 64-bit | [emulationstation-de-1.2.3-aarch64.deb](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880165/download)| +| Linux AppImage | Most Linux distributions | x64 (x86) | [EmulationStation-DE-x64.AppImage](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880344/download)| +| Linux AppImage | Current Linux distributions with libc 2.34 or later | x64 (x86) | [EmulationStation-DE-x64_Current.AppImage](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880370/download)| +| Linux AppImage | Steam Deck / SteamOS 3.0 specific | x64 (x86) | [EmulationStation-DE-x64_SteamDeck.AppImage](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880401/download)| +| Debian DEB package | Raspberry Pi OS (Raspian) | ARM 32-bit | [emulationstation-de-1.2.3-armv7l.deb](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880216/download)| +| Debian DEB package | Raspberry Pi OS (Raspian) | ARM 64-bit | [emulationstation-de-1.2.3-aarch64.deb](https://gitlab.com/es-de/emulationstation-de/-/package_files/36880165/download)| Version 1.2.0 (released 2021-12-28) will be the last legacy release for macOS | Package | Operating systems | Architecture | Download link | | :------------------- | :------------------------------------------------------ | :----------- | :------------- | -| macOS DMG installer | Legacy macOS 10.11 "El Capitan" to 10.13 "High Sierra" | x64 (x86) | [EmulationStation-DE-1.2.0-x64_legacy.dmg](https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/25023954/download)| +| macOS DMG installer | Legacy macOS 10.11 "El Capitan" to 10.13 "High Sierra" | x64 (x86) | [EmulationStation-DE-1.2.0-x64_legacy.dmg](https://gitlab.com/es-de/emulationstation-de/-/package_files/25023954/download)| -All previous releases can be downloaded from [here](https://gitlab.com/leonstyhre/emulationstation-de/-/packages). +All previous releases can be downloaded from [here](https://gitlab.com/es-de/emulationstation-de/-/packages). The _current_ version of the Linux AppImage ships with newer libraries and better controller support but requires distributions with libc 2.34 or later to work. diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md index db6cf7223..d3684caee 100644 --- a/USERGUIDE-DEV.md +++ b/USERGUIDE-DEV.md @@ -744,7 +744,7 @@ This is required by the TheGamesDB scraper where the expanded filenames are used Place the ROMs in the astrocde directory, the files must have the short MAME names such as _astrobat.zip_ and _conan.zip_. If using MAME standalone then no further setup is required and the games should just launch. But if using the _MAME - Current_ RetroArch core, then a hash file must be added to the RetroArch system directory at this location: ``` -system/mame/hash/astrocde.xml +mame/hash/astrocde.xml ``` The file is available from the MAME GitHub repository (make sure to save it as a raw file): \ @@ -1117,7 +1117,7 @@ The second option on Windows is to unpack the game somewhere outside the ROMs di **Linux:** -On Linux you need to supply your own game engine binary as few (if any) games are distributed with the Linux release of OpenBOR. Download the .7z archive from the [https://github.com/DCurrent/openbor](https://github.com/DCurrent/openbor) repository. The file you want is _OpenBOR_3.0_6391.AppImage_ which is located inside the LINUX/OpenBOR folder. +On Linux you need to supply your own game engine binary as few (if any) games are distributed with the Linux release of OpenBOR. Download the .7z archive from the [https://github.com/DCurrent/openbor](https://github.com/DCurrent/openbor) repository. The file you want is _OpenBOR_3.0_6391.AppImage_ which is located inside the LINUX/OpenBOR folder. If you need an older engine for some specific game, then you may need to download an earlier release instead. Copy this file to the game directory and make it executable using the command `chmod +x OpenBOR_3.0_6391.AppImage` diff --git a/es-app/assets/latest_steam_deck_appimage.txt b/es-app/assets/latest_steam_deck_appimage.txt index a328b7259..0c47d2153 100644 --- a/es-app/assets/latest_steam_deck_appimage.txt +++ b/es-app/assets/latest_steam_deck_appimage.txt @@ -1,3 +1,3 @@ # URL for the latest Steam Deck AppImage, used by EmuDeck (www.emudeck.com) # ES-DE release 1.2.3 -https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/36880401/download +https://gitlab.com/es-de/emulationstation-de/-/package_files/36880401/download diff --git a/es-app/assets/org.es_de.emulationstation-de.appdata.xml b/es-app/assets/org.es_de.emulationstation-de.appdata.xml index 700b73287..6c7f5f7ee 100644 --- a/es-app/assets/org.es_de.emulationstation-de.appdata.xml +++ b/es-app/assets/org.es_de.emulationstation-de.appdata.xml @@ -16,8 +16,8 @@ CC0-1.0 MIT https://es-de.org - https://gitlab.com/leonstyhre/emulationstation-de/-/issues - https://gitlab.com/leonstyhre/emulationstation-de/-/blob/master/USERGUIDE.md + https://gitlab.com/es-de/emulationstation-de/-/issues + https://gitlab.com/es-de/emulationstation-de/-/blob/master/USERGUIDE.md https://es-de.org/#Donations @@ -39,22 +39,22 @@ - https://gitlab.com/leonstyhre/emulationstation-de/-/releases + https://gitlab.com/es-de/emulationstation-de/-/releases - https://gitlab.com/leonstyhre/emulationstation-de/-/releases + https://gitlab.com/es-de/emulationstation-de/-/releases - https://gitlab.com/leonstyhre/emulationstation-de/-/releases + https://gitlab.com/es-de/emulationstation-de/-/releases - https://gitlab.com/leonstyhre/emulationstation-de/-/releases + https://gitlab.com/es-de/emulationstation-de/-/releases - https://gitlab.com/leonstyhre/emulationstation-de/-/releases + https://gitlab.com/es-de/emulationstation-de/-/releases - https://gitlab.com/leonstyhre/emulationstation-de/-/releases + https://gitlab.com/es-de/emulationstation-de/-/releases diff --git a/es-app/assets/org.es_de.emulationstation-de.yml b/es-app/assets/org.es_de.emulationstation-de.yml index d88f26fb3..721cab5a0 100644 --- a/es-app/assets/org.es_de.emulationstation-de.yml +++ b/es-app/assets/org.es_de.emulationstation-de.yml @@ -80,5 +80,5 @@ modules: - -DFLATPAK_BUILD=on sources: - type: git - url: https://gitlab.com/leonstyhre/emulationstation-de.git + url: https://gitlab.com/es-de/emulationstation-de.git commit: cb16b510022e95cc1a8e51a6ab26caaa0b73bb58 diff --git a/themes/modern-DE/README.md b/themes/modern-DE/README.md index 06f4b03e5..cea8466cb 100644 --- a/themes/modern-DE/README.md +++ b/themes/modern-DE/README.md @@ -40,10 +40,10 @@ The following changes to the theme are made: # Pictures -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/8859cd1f6ebf5653b6eb12b4f5171ecc/image.png) -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/920a19cf845cb65f98db4cee5158a26f/image.png) -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/f3d7ac00964e92252bea000043c1cab5/image.png) -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/7f317ad1dff31e0c2dd21e4d1930613d/image.png) -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/6a87a0d94898cfe060b028e29f148147/image.png) -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/6862b35b9142888f983d86fea65d5411/image.png) -![](https://gitlab.com/leonstyhre/emulationstation-de/uploads/36994f94784ff12c0ea48520544ed4fb/image.png) \ No newline at end of file +![](https://gitlab.com/es-de/emulationstation-de/uploads/8859cd1f6ebf5653b6eb12b4f5171ecc/image.png) +![](https://gitlab.com/es-de/emulationstation-de/uploads/920a19cf845cb65f98db4cee5158a26f/image.png) +![](https://gitlab.com/es-de/emulationstation-de/uploads/f3d7ac00964e92252bea000043c1cab5/image.png) +![](https://gitlab.com/es-de/emulationstation-de/uploads/7f317ad1dff31e0c2dd21e4d1930613d/image.png) +![](https://gitlab.com/es-de/emulationstation-de/uploads/6a87a0d94898cfe060b028e29f148147/image.png) +![](https://gitlab.com/es-de/emulationstation-de/uploads/6862b35b9142888f983d86fea65d5411/image.png) +![](https://gitlab.com/es-de/emulationstation-de/uploads/36994f94784ff12c0ea48520544ed4fb/image.png) \ No newline at end of file diff --git a/tools/generate_man_page.sh b/tools/generate_man_page.sh index 6df31dea3..2ce61f761 100755 --- a/tools/generate_man_page.sh +++ b/tools/generate_man_page.sh @@ -39,7 +39,7 @@ RetroPie community (RetroPie fork) Alec Lofquist (original version) [SEE ALSO] -Full documentation is available at: +Full documentation is available at: " echo "${MAN_INCLUDE}" > $TEMPFILE_INPUT