Merge branch 'stenzek:master' into netplay_dev

README.md

@@ -104,13 +104,9 @@ You will need a device with armv7 (32-bit ARM), AArch64 (64-bit ARM), or x86_64
 
 Google Play is the preferred distribution mechanism and will result in smaller download sizes: https://play.google.com/store/apps/details?id=com.github.stenzek.duckstation
 
-**No support is provided for the Android app**, it is free and your expectations should be in line with that. Please **do not** email me about issues about it, they will be ignored. This repository should also not be used to raise issues about the app, as it does not contain the app code, only the desktop versions.
+**No support is provided for the Android app**, it is free and your expectations should be in line with that. Please **do not** email me about issues about it, they will be ignored.
 
-If you must use an APK, download links are:
-
-Download link: https://www.duckstation.org/android/duckstation-android.apk
-
-Changelog link: https://www.duckstation.org/android/changelog.txt
+If you must use an APK, download links are listed in https://www.duckstation.org/android/
 
 To use:
 1. Install and run the app for the first time.
@@ -215,22 +211,6 @@ Hotkeys:
  - **Tab:** Temporarily disable speed limiter
  - **Space:** Pause/resume emulation
 
-## Screenshots
-<p align="center">
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/monkey.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/monkey.jpg" alt="Monkey Hero" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/rrt4.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/rrt4.jpg" alt="Ridge Racer Type 4" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/tr2.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/tr2.jpg" alt="Tomb Raider 2" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/quake2.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/quake2.jpg" alt="Quake 2" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/croc.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/croc.jpg" alt="Croc" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/croc2.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/croc2.jpg" alt="Croc 2" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/ff7.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/ff7.jpg" alt="Final Fantasy 7" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/mm8.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/mm8.jpg" alt="Mega Man 8" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/ff8.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/ff8.jpg" alt="Final Fantasy 8 in Fullscreen UI" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/spyro.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/spyro.jpg" alt="Spyro in Fullscreen UI" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/tof.jpg"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/tof.jpg" alt="Threads of Fate in Fullscreen UI" width="400" /></a>
-  <a href="https://raw.githubusercontent.com/stenzek/duckstation/md-images/gamegrid.png"><img src="https://raw.githubusercontent.com/stenzek/duckstation/md-images/gamegrid.png" alt="Game Grid" width="400" /></a>
-</p>
-
 ## Disclaimers
 
 Icon by icons8: https://icons8.com/icon/74847/platforms.undefined.short-title

src/core/analog_controller.cpp

@@ -53,7 +53,7 @@ void AnalogController::Reset()
 
   if (m_force_analog_on_reset)
   {
-    if (g_settings.controller_disable_analog_mode_forcing || System::IsRunningBIOS())
+    if (g_settings.controller_disable_analog_mode_forcing || System::IsRunningUnknownGame())
     {
       Host::AddIconOSDMessage(
         fmt::format("Controller{}AnalogMode", m_index), ICON_FA_GAMEPAD,
@@ -835,8 +835,7 @@ static const char* s_invert_settings[] = {TRANSLATABLE("AnalogController", "Not
 
 static const SettingInfo s_settings[] = {
   {SettingInfo::Type::Boolean, "ForceAnalogOnReset", TRANSLATABLE("AnalogController", "Force Analog Mode on Reset"),
-   TRANSLATABLE("AnalogController", "Forces the controller to analog mode when the console is reset/powered on. May "
-                                    "cause issues with games, so it is recommended to leave this option off."),
+   TRANSLATABLE("AnalogController", "Forces the controller to analog mode when the console is reset/powered on."),
    "true"},
   {SettingInfo::Type::Boolean, "AnalogDPadInDigitalMode",
    TRANSLATABLE("AnalogController", "Use Analog Sticks for D-Pad in Digital Mode"),

src/core/system.cpp

@@ -138,7 +138,7 @@ static BIOS::Hash s_bios_hash = {};
 static std::string s_running_game_path;
 static std::string s_running_game_serial;
 static std::string s_running_game_title;
-static bool s_running_bios;
+static bool s_running_unknown_game;
 
 static float s_throttle_frequency = 60.0f;
 static float s_target_speed = 1.0f;
@@ -320,9 +320,9 @@ const std::string& System::GetRunningTitle()
   return s_running_game_title;
 }
 
-bool System::IsRunningBIOS()
+bool System::IsRunningUnknownGame()
 {
-  return s_running_bios;
+  return s_running_unknown_game;
 }
 
 const BIOS::ImageInfo* System::GetBIOSImageInfo()
@@ -958,9 +958,6 @@ void System::ResetSystem()
   ResetPerformanceCounters();
   ResetThrottler();
   Host::AddOSDMessage(Host::TranslateStdString("OSDMessage", "System reset."));
-
-  // need to clear this here, because of eject disc -> reset.
-  s_running_bios = !s_running_game_path.empty();
 }
 
 void System::PauseSystem(bool paused)
@@ -1239,9 +1236,6 @@ bool System::BootSystem(SystemBootParameters parameters)
     return false;
   }
 
-  // Allow controller analog mode for EXEs and PSFs.
-  s_running_bios = s_running_game_path.empty() && exe_boot.empty() && psf_boot.empty();
-
   UpdateControllers();
   UpdateMemoryCardTypes();
   UpdateMultitaps();
@@ -1510,7 +1504,7 @@ void System::ClearRunningGame()
   s_running_game_serial.clear();
   s_running_game_path.clear();
   s_running_game_title.clear();
-  s_running_bios = false;
+  s_running_unknown_game = false;
   s_cheat_list.reset();
   s_state = State::Shutdown;
 
@@ -3053,6 +3047,7 @@ void System::UpdateRunningGame(const char* path, CDImage* image, bool booting)
   s_running_game_path.clear();
   s_running_game_serial.clear();
   s_running_game_title.clear();
+  s_running_unknown_game = true;
 
   if (path && std::strlen(path) > 0)
   {
@@ -3070,6 +3065,7 @@ void System::UpdateRunningGame(const char* path, CDImage* image, bool booting)
       {
         s_running_game_serial = entry->serial;
         s_running_game_title = entry->title;
+        s_running_unknown_game = false;
       }
       else
       {

src/core/system.h

@@ -184,7 +184,7 @@ const std::string& GetRunningPath();
 const std::string& GetRunningSerial();
 const std::string& GetRunningTitle();
 
-bool IsRunningBIOS();
+bool IsRunningUnknownGame();
 const BIOS::ImageInfo* GetBIOSImageInfo();
 const BIOS::Hash& GetBIOSHash();