Merge remote-tracking branch 'upstream/cooker-0.7.2b' into cooker-0.7.2b-icenine451

This commit is contained in:
icenine451 2023-09-08 16:36:17 -04:00
commit 8fcaab7eff
3 changed files with 2 additions and 4 deletions

View file

@ -294,8 +294,6 @@ gambatte_rumble_level = "10"
gambatte_show_gb_link_settings = "disabled" gambatte_show_gb_link_settings = "disabled"
gambatte_turbo_period = "4" gambatte_turbo_period = "4"
gambatte_up_down_allowed = "disabled" gambatte_up_down_allowed = "disabled"
gambatte_input_player1_r = "nul"
gambatte_input_player1_l = "nul"
genesis_plus_gx_add_on = "auto" genesis_plus_gx_add_on = "auto"
genesis_plus_gx_addr_error = "enabled" genesis_plus_gx_addr_error = "enabled"
genesis_plus_gx_aspect_ratio = "auto" genesis_plus_gx_aspect_ratio = "auto"

View file

@ -80,7 +80,7 @@ cheevos_visibility_account = "true"
cheevos_visibility_mastery = "true" cheevos_visibility_mastery = "true"
cheevos_visibility_summary = "1" cheevos_visibility_summary = "1"
cheevos_visibility_unlock = "true" cheevos_visibility_unlock = "true"
config_save_on_exit = "false" config_save_on_exit = "true"
content_database_path = "/app/share/libretro/database/rdb" content_database_path = "/app/share/libretro/database/rdb"
content_favorites_directory = "default" content_favorites_directory = "default"
content_favorites_path = "/var/config/retroarch/content_favorites.lpl" content_favorites_path = "/var/config/retroarch/content_favorites.lpl"

View file

@ -143,7 +143,7 @@
<string name="ScraperUsernameScreenScraper" value="" /> <string name="ScraperUsernameScreenScraper" value="" />
<string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" /> <string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
<string name="ScreensaverType" value="video" /> <string name="ScreensaverType" value="video" />
<string name="StartupSystem" value="" /> <string name="StartupSystem" value="recent" />
<string name="ThemeAspectRatio" value="automatic" /> <string name="ThemeAspectRatio" value="automatic" />
<string name="ThemeColorScheme" value="art-book-next" /> <string name="ThemeColorScheme" value="art-book-next" />
<string name="ThemeSet" value="art-book-next-es-de" /> <string name="ThemeSet" value="art-book-next-es-de" />