Merge pull request #1295 from ggKismet/patch-1

Fix typo in Controller Dialog
This commit is contained in:
Luke Usher 2018-06-18 20:28:02 +01:00 committed by GitHub
commit fc1252283a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 16 deletions

View File

@ -6,26 +6,35 @@ or [Discord](https://discord.gg/26Xjx23)
Cxbx-Reloaded is an emulator for running Microsoft Xbox (and eventually, Chihiro) games on Microsoft Windows.
The project began its life as a fork of Cxbx with added 64-bit support.
Work is currently underway to backport some of the improvements made from Dxbx.
Cxbx-Reloaded is early in development, however it is progressing almost daily;
We now boot more titles than ever before, with more and more reaching gameplay.
## System Requirements
### Minimum
* OS: Windows 7+ x64. 32-bit installations are not supported.
* GPU: Anything that supports Direct3D 8 (HLE) and OpenGL 3.3 (LLE).
* Due to poor driver support for Direct3D8 on modern cards, some users may see better results when using a wrapper, such as [D3D8to9](https://github.com/crosire/d3d8to9/)
### Prerequisites
* Visual C++ 2015 and 2017 redistributables may be required. Download them [here](https://support.microsoft.com/en-gb/help/2977003/the-latest-supported-visual-c-downloads).
## Automated Builds
Cxbx-Reloaded is not yet ready for general release, but the latest development builds can be downloaded from our [AppVeyor](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/branch/master):
Cxbx-Reloaded is not yet ready for general release, but the latest development builds can be downloaded using the links below:
<!-- TODO: Enable these once the first stable release happens
### Latest Stable
Grab these if you just want to use the emulator to play games.
* [Latest Stable (Release Build)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Release.zip?branch=master&job=Configuration:%20Release&pr=false)
* [Latest Stable (Debug Build)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Debug.zip?branch=master&job=Configuration:%20Debug&pr=false)
-->
<!-- TODO: Remove this after v0.1 release -->
### Upcoming Release (Alpha Status)
Grab these builds if you wish to preview/alpha test an upcoming release
* [Latest v0.1 Alpha Build (Release)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Release.zip?branch=v0.1&job=Configuration:%20Release&pr=false)
* [Latest v0.1 Alpha Build (Debug)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Debug.zip?branch=v0.1&job=Configuration:%20Debug&pr=false)
### Development Builds
Grab these builds if you want to test the latest and greatest features. These builds are likely to be more unstable than release builds, and are not recommended for just playing games.
* [Latest Development Build (Release)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Release.zip?branch=develop&job=Configuration:%20Release&pr=false)
* [Latest Development Build (Debug)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Debug.zip?branch=develop&job=Configuration:%20Debug&pr=false)
* [Latest build (Release)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Release.zip?branch=master&job=Configuration:%20Release&pr=false)
* [Latest build (Debug)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Debug.zip?branch=master&job=Configuration:%20Debug&pr=false)
* [Full build history](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/history)
## Compatibility

View File

@ -65,7 +65,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_0_2,"Button",BS_AUTORADIOBUTTON,17,46,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_0_3,"Button",BS_AUTORADIOBUTTON,17,55,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_0_0,"Button",BS_AUTORADIOBUTTON,17,64,73,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_0_0,"Button",BS_AUTORADIOBUTTON,17,74,79,10
CONTROL "Virtual SteelBattalion",IDC_HOST_VIRTUAL_SBC_0_0,"Button",BS_AUTORADIOBUTTON,17,74,79,10
GROUPBOX "Xbox Port 1",IDC_XBOX_PORT_1,104,7,93,83,WS_GROUP,WS_EX_CLIENTEDGE
CONTROL "Not Connected",IDC_HOST_NOTCONNECT_1_0,"Button",BS_AUTORADIOBUTTON,114,20,64,10
CONTROL "XInput Port 0",IDC_HOST_XINPUT_1_0,"Button",BS_AUTORADIOBUTTON,114,29,59,10
@ -73,7 +73,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_1_2,"Button",BS_AUTORADIOBUTTON,114,47,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_1_3,"Button",BS_AUTORADIOBUTTON,114,56,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_1_0,"Button",BS_AUTORADIOBUTTON,114,65,73,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_1_0,"Button",BS_AUTORADIOBUTTON,114,75,79,10
CONTROL "Virtual SteelBattalion",IDC_HOST_VIRTUAL_SBC_1_0,"Button",BS_AUTORADIOBUTTON,114,75,79,10
GROUPBOX "Xbox Port 2",IDC_XBOX_PORT_2,201,7,93,83,WS_GROUP,WS_EX_CLIENTEDGE
CONTROL "Not Connected",IDC_HOST_NOTCONNECT_2_0,"Button",BS_AUTORADIOBUTTON,211,21,64,10
CONTROL "XInput Port 0",IDC_HOST_XINPUT_2_0,"Button",BS_AUTORADIOBUTTON,211,30,59,10
@ -81,7 +81,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_2_2,"Button",BS_AUTORADIOBUTTON,211,48,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_2_3,"Button",BS_AUTORADIOBUTTON,211,57,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_2_0,"Button",BS_AUTORADIOBUTTON,211,66,73,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_2_0,"Button",BS_AUTORADIOBUTTON,211,75,79,10
CONTROL "Virtual SteelBattalion",IDC_HOST_VIRTUAL_SBC_2_0,"Button",BS_AUTORADIOBUTTON,211,75,79,10
GROUPBOX "Xbox Port 3",IDC_XBOX_PORT_3,298,7,93,83,WS_GROUP,WS_EX_CLIENTEDGE
CONTROL "Not Connected",IDC_HOST_NOTCONNECT_3_0,"Button",BS_AUTORADIOBUTTON,308,21,64,10
CONTROL "XInput Port 0",IDC_HOST_XINPUT_3_0,"Button",BS_AUTORADIOBUTTON,308,30,59,10
@ -89,12 +89,12 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_3_2,"Button",BS_AUTORADIOBUTTON,308,48,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_3_3,"Button",BS_AUTORADIOBUTTON,308,57,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_3_0,"Button",BS_AUTORADIOBUTTON,308,66,73,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_3_0,"Button",BS_AUTORADIOBUTTON,308,75,79,10
CONTROL "Virtual SteelBattalion",IDC_HOST_VIRTUAL_SBC_3_0,"Button",BS_AUTORADIOBUTTON,308,75,79,10
END
IDD_VIRTUAL_SBC_FEEDBACK DIALOGEX 0, 0, 1039, 214
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Virtual SteelBatallion Controller"
CAPTION "Virtual SteelBattalion Controller"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "Left Block",IDC_LEFTBLOCK,7,7,329,200,0,WS_EX_CLIENTEDGE | WS_EX_RIGHT