From 7cdc28e875ebcc804742fa32d96a3177fa00958a Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Thu, 30 Dec 2021 20:37:00 -0500 Subject: [PATCH 1/3] Joystick Changes --- settings/input.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/settings/input.rst b/settings/input.rst index 2fcd136..4c3bec2 100644 --- a/settings/input.rst +++ b/settings/input.rst @@ -22,10 +22,12 @@ Joystick Emulate one or more game port controller(s). The following controller types are supported: * **None:** no controller connected. -* **Standard 2-button joystick(s):** up to two controllers, each with two buttons and an analog stick. -* **Standard 4-button joystick:** single controller with four buttons and an analog stick. -* **Standard 6-button joystick:** single controller with four regular buttons, two additional buttons mapped to the third and fourth axes, and an analog stick. -* **Standard 8-button joystick:** single controller with four regular buttons, four additional buttons mapped to the third and fourth axes, and an analog stick. +* **2-axis, 2-button joystick(s):** up to two controllers, each with two buttons and an analog stick. +* **2-axis, 4-button joystick:** single controller with four buttons and an analog stick. +* **3-axis, 2-button joystick:** single controller with two buttons and an analog stick and a throttle. +* **3-axis, 4-button joystick:** single controller with four buttons and an analog stick and a throttle. +* **2-axis, 6-button joystick:** single controller with four regular buttons, two additional buttons mapped to the third and fourth axes, and an analog stick. +* **2-axis, 8-button joystick:** single controller with four regular buttons, four additional buttons mapped to the third and fourth axes, and an analog stick. * **4-axis 4-button joystick:** single controller with four buttons and two analog sticks (or four axes). * **CH Flightstick Pro:** flight controller with four buttons, three axes and a POV hat. * **Microsoft SideWinder Pad:** up to four controllers, each with 10 buttons and a directional pad. Not compatible with standard game port joysticks; requires a driver in the emulated machine. From fd81da700ac79f77e061600cdb08209f5aa2281e Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 6 Feb 2022 14:57:08 -0500 Subject: [PATCH 2/3] Added rtmidi to deps --- dev/buildguide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildguide.rst b/dev/buildguide.rst index 5f0266f..084194e 100644 --- a/dev/buildguide.rst +++ b/dev/buildguide.rst @@ -16,7 +16,7 @@ Follow these steps to compile 86Box from source: 4. Run the following command to install all of the dependencies: .. code-block:: bash - $ pacman -S gdb make git mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686-libpng + $ pacman -S gdb make git mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686- libpngmingw-w64-i686-rtmidi 5. Once the environment is fully updated and all dependencies are installed, change directory to ``src``: .. code-block:: bash From 7970b78be9ef171bc13428329b80d75070a03776 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 6 Feb 2022 14:57:52 -0500 Subject: [PATCH 3/3] Fix mistake --- dev/buildguide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildguide.rst b/dev/buildguide.rst index 084194e..5493d80 100644 --- a/dev/buildguide.rst +++ b/dev/buildguide.rst @@ -16,7 +16,7 @@ Follow these steps to compile 86Box from source: 4. Run the following command to install all of the dependencies: .. code-block:: bash - $ pacman -S gdb make git mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686- libpngmingw-w64-i686-rtmidi + $ pacman -S gdb make git mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686-libpng mingw-w64-i686-rtmidi 5. Once the environment is fully updated and all dependencies are installed, change directory to ``src``: .. code-block:: bash