diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg
index 72e91636..97def9b1 100644
--- a/emu-configs/retroarch.cfg
+++ b/emu-configs/retroarch.cfg
@@ -227,7 +227,7 @@ input_exit_emulator_btn = "nul"
input_exit_emulator_mbtn = "nul"
input_fps_toggle = "f3"
input_fps_toggle_axis = "nul"
-input_fps_toggle_btn = "3"
+input_fps_toggle_btn = "nul"
input_fps_toggle_mbtn = "nul"
input_frame_advance = "k"
input_frame_advance_axis = "nul"
@@ -2944,7 +2944,7 @@ notification_show_screenshot_duration = "0"
notification_show_screenshot_flash = "0"
notification_show_set_initial_disk = "true"
notification_show_when_menu_is_alive = "false"
-overlay_directory = "/app/share/libretro/overlays"
+overlay_directory = "/app/retrodeck/overlays/borders"
ozone_collapse_sidebar = "false"
ozone_menu_color_theme = "1"
ozone_scroll_content_metadata = "false"
@@ -3147,7 +3147,7 @@ video_scale = "3.000000"
video_scale_integer = "false"
video_scale_integer_overscale = "false"
video_shader_delay = "0"
-video_shader_dir = "/app/share/libretro/shaders"
+video_shader_dir = "/app/retrodeck/overlays/shaders"
video_shader_enable = "true"
video_shader_preset_save_reference_enable = "true"
video_shader_remember_last_dir = "false"
diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml
index 8573537d..d5469399 100644
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@@ -27,7 +27,7 @@
-
+
@@ -42,14 +42,14 @@
-
-
+
+
-
+
diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 2bdf7fc4..ad482ba4 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -341,7 +341,7 @@
dos
DOS (PC)
%ROMPATH%/dos
- .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP
+ .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%
diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml
index 19a4c294..fdc32034 100644
--- a/es-configs/tools-gamelist.xml
+++ b/es-configs/tools-gamelist.xml
@@ -70,4 +70,18 @@
true
true
+
+ ./overlays.sh
+ Overlays configuration
+ Configure or disable borders and shaders.
+ true
+ true
+
+
+ ./clean-miximages.sh
+ Clean MixImages
+ Clean the MixImages in order to beautify the new theme. This is needed if you got scraped data since v0.4.2 or earlier.
+ true
+ true
+
diff --git a/flathub-pr.sh b/flathub-pr.sh
index 1118ec5f..7699fad2 100755
--- a/flathub-pr.sh
+++ b/flathub-pr.sh
@@ -12,6 +12,7 @@ git submodule update
#sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
sync -rav --progress { \
+'overlays', \
'rd-submodules', \
'flathub.json', \
'LICENSE', \
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 2cf2cd9e..3cf5825f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -214,7 +214,7 @@ modules:
sources:
- type: git
url: https://github.com/anthonycaccese/art-book-next-de.git
- commit: 7fb9f567892a357651bbc6a2b6af3d1085a10ffb
+ commit: 10ff82143af870d5a5edcfb0da97c7d54bcbc317
# External manifests start
@@ -342,7 +342,9 @@ modules:
url: https://buildbot.libretro.com/stable/1.10.2/linux/x86_64/RetroArch_cores.7z
sha256: 0c59f99534a1ae3a2d34b1747c40398325e53db69acfab35b99c8fa8d76430e5
- # Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu
+ # Yuzu - START
+ # https://github.com/flathub/org.yuzu_emu.yuzu
+ # WHEN UPADTING: remember to update rd-submodules/yuzu contents
- name: libzip
buildsystem: cmake-ninja
@@ -634,6 +636,7 @@ modules:
# Dolphin - START
# https://github.com/flathub/org.DolphinEmu.dolphin-emu
+ # WHEN UPADTING: remember to update rd-submodules/yuzu contents
# needed for the emulate bluetooth adapter feature to work
- name: bluez
@@ -1077,6 +1080,9 @@ modules:
# RPCS3
- cp config.yml ${FLATPAK_DEST}/retrodeck/emu-configs/
+ # Overlays
+ - cp -r overlays ${FLATPAK_DEST}/retrodeck/overlays
+
# Placing appdata
- mkdir -p ${FLATPAK_DEST}/share/appdata
- cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata
diff --git a/overlays/borders/dark/gb.png b/overlays/borders/dark/gb.png
new file mode 100644
index 00000000..abd707e4
Binary files /dev/null and b/overlays/borders/dark/gb.png differ
diff --git a/overlays/borders/light/gb.png b/overlays/borders/light/gb.png
new file mode 100644
index 00000000..37992d5c
Binary files /dev/null and b/overlays/borders/light/gb.png differ
diff --git a/tools/clean-miximages.sh b/tools/clean-miximages.sh
new file mode 100644
index 00000000..4b729745
--- /dev/null
+++ b/tools/clean-miximages.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+zenity \
+--icon-name=net.retrodeck.retrodeck \
+--question \
+--no-wrap \
+--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+--title "RetroDECK" \
+--ok-label "Yes" \
+--cancel-label "No" \
+--text="This tool is will clean the MixImages in order to beautify the theme.\nDo you want to delete them?"
+
+if [ $? == 0 ] #yes - Internal
+then
+ find ~/retrodeck/.downloaded_media -name miximages -type d -print0|xargs -0 rm -rfv --
+fi
diff --git a/tools/overlays.sh b/tools/overlays.sh
new file mode 100644
index 00000000..d483a20e
--- /dev/null
+++ b/tools/overlays.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+border="$(zenity --list \
+--title "RetroDECK" \
+--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+--text="Select the borders type" \
+--hide-header \
+--column=Border \
+"None" \
+"Light" \
+"Dark")"
+
+if [ $border == "None" ]
+then
+ return
+elif [ $border == "Light" ]
+then
+ return
+elif [ $border == "Dark" ]
+then
+ return
+fi
+
+shader="$(zenity --list \
+--title "RetroDECK" \
+--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+--text="Select the shader type" \
+--hide-header \
+--column=Border \
+"None" \
+"Retro")"
+
+if [ $shader == "None" ]
+then
+ return
+elif [ $shader == "Retro" ]
+then
+ return
+fi
\ No newline at end of file