Merge pull request #650 from ggrtk/readme

Minor README and Qt help text update
This commit is contained in:
Connor McLaughlin 2020-07-24 02:33:30 +10:00 committed by GitHub
commit 4454824b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 36 deletions

View File

@ -49,7 +49,7 @@ Other features include:
## System Requirements
- A CPU faster than a potato. But it needs to be 64-bit (either x86_64 or AArch64/ARMv8) otherwise you won't get a recompiler and it'll be slow. There are no plans to add any 32-bit recompilers.
- For the hardware renderers, a GPU capable of OpenGL 3.0/OpenGL ES 3.0/Direct3D 11 Feature Level 10.0 (or Vulkan 1.0) and above. So, basically anything made in the last 10 years or so.
- SDL-compatible game controller (e.g. XB360/XBOne)
- SDL-compatible game controller (e.g. XB360/XBOne). DualShock 3 users on Windows will need to install the official DualShock 3 drivers included as part of PlayStation Now.
## Downloading and running
Binaries of DuckStation for Windows 64-bit, x86_64 Linux x86_64 (in AppImage format), and Android ARMv8/AArch64 are available via GitHub Releases and are automatically built with every commit/push. Binaries or packages distributed through other sources may be out of date and are not supported by the developer.

View File

@ -32,22 +32,22 @@
<item>Software</item>
</string-array>
<string-array name="settings_gpu_resolution_scale_entries">
<item>1x (1024x512)</item>
<item>2x (2048x1024)</item>
<item>3x (3072x1536)</item>
<item>4x (4096x2048)</item>
<item>5x (5120x2560)</item>
<item>6x (6144x3072)</item>
<item>7x (7168x3584)</item>
<item>8x (8192x4096)</item>
<item>9x (9216x4608)</item>
<item>10x (10240x5120)</item>
<item>11x (11264x5632)</item>
<item>12x (12288x6144)</item>
<item>13x (13312x6656)</item>
<item>14x (14336x7168)</item>
<item>15x (15360x7680)</item>
<item>16x (16384x8192)</item>
<item>1x (1024x512 VRAM)</item>
<item>2x (2048x1024 VRAM)</item>
<item>3x (3072x1536 VRAM)</item>
<item>4x (4096x2048 VRAM)</item>
<item>5x (5120x2560 VRAM)</item>
<item>6x (6144x3072 VRAM)</item>
<item>7x (7168x3584 VRAM)</item>
<item>8x (8192x4096 VRAM)</item>
<item>9x (9216x4608 VRAM)</item>
<item>10x (10240x5120 VRAM)</item>
<item>11x (11264x5632 VRAM)</item>
<item>12x (12288x6144 VRAM)</item>
<item>13x (13312x6656 VRAM)</item>
<item>14x (14336x7168 VRAM)</item>
<item>15x (15360x7680 VRAM)</item>
<item>16x (16384x8192 VRAM)</item>
</string-array>
<string-array name="settings_gpu_resolution_scale_values">
<item>1</item>

View File

@ -60,8 +60,8 @@ GPUSettingsWidget::GPUSettingsWidget(QtHostInterface* host_interface, QWidget* p
"Enables the usage of debug devices and shaders for rendering APIs which support them. "
"Should only be used when debugging the emulator.");
dialog->registerWidgetHelp(m_ui.displayAspectRatio, "Aspect Ratio", "4:3",
"Changes the pixel aspect ratio which is used to display the console's output to the "
"screen. The default is 4:3 which matches a typical TV of the era.");
"Changes the aspect ratio used to display the console's output to the screen. The default "
"is 4:3 which matches a typical TV of the era.");
dialog->registerWidgetHelp(m_ui.displayCropMode, "Crop Mode", "Only Overscan Area",
"Determines how much of the area typically not visible on a consumer TV set to crop/hide. "
"Some games display content in the overscan area, or use it for screen effects and may "
@ -144,7 +144,7 @@ void GPUSettingsWidget::setupAdditionalUi()
m_ui.resolutionScale->addItem(tr("Automatic based on window size"));
for (u32 i = 1; i <= GPU::MAX_RESOLUTION_SCALE; i++)
m_ui.resolutionScale->addItem(tr("%1x (%2x%3)").arg(i).arg(GPU::VRAM_WIDTH * i).arg(GPU::VRAM_HEIGHT * i));
m_ui.resolutionScale->addItem(tr("%1x (%2x%3 VRAM)").arg(i).arg(GPU::VRAM_WIDTH * i).arg(GPU::VRAM_HEIGHT * i));
}
void GPUSettingsWidget::populateGPUAdapters()

View File

@ -1285,22 +1285,22 @@ void SDLHostInterface::DrawSettingsWindow()
ImGui::SameLine(indent);
static constexpr std::array<const char*, GPU::MAX_RESOLUTION_SCALE> resolutions = {{
"1x (1024x512)",
"2x (2048x1024)",
"3x (3072x1536)",
"4x (4096x2048)",
"5x (5120x2560)",
"6x (6144x3072)",
"7x (7168x3584)",
"8x (8192x4096)",
"9x (9216x4608)",
"10x (10240x5120)",
"11x (11264x5632)",
"12x (12288x6144)",
"13x (13312x6656)",
"14x (14336x7168)",
"15x (15360x7680)",
"16x (16384x8192)",
"1x (1024x512 VRAM)",
"2x (2048x1024 VRAM)",
"3x (3072x1536 VRAM)",
"4x (4096x2048 VRAM)",
"5x (5120x2560 VRAM)",
"6x (6144x3072 VRAM)",
"7x (7168x3584 VRAM)",
"8x (8192x4096 VRAM)",
"9x (9216x4608 VRAM)",
"10x (10240x5120 VRAM)",
"11x (11264x5632 VRAM)",
"12x (12288x6144 VRAM)",
"13x (13312x6656 VRAM)",
"14x (14336x7168 VRAM)",
"15x (15360x7680 VRAM)",
"16x (16384x8192 VRAM)",
}};
int current_resolution_index = static_cast<int>(m_settings_copy.gpu_resolution_scale) - 1;