From 7cdc28e875ebcc804742fa32d96a3177fa00958a Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Thu, 30 Dec 2021 20:37:00 -0500 Subject: [PATCH 1/5] 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 88b748cb339241804e8c337f0de5feb404236e1d Mon Sep 17 00:00:00 2001 From: maxdlpee <77379259+maxdlpee@users.noreply.github.com> Date: Fri, 4 Feb 2022 18:43:49 -0300 Subject: [PATCH 2/5] Add note about MAX support --- settings/sound.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings/sound.rst b/settings/sound.rst index 1721754..d110c2c 100644 --- a/settings/sound.rst +++ b/settings/sound.rst @@ -64,6 +64,8 @@ Emulate the **Gravis UltraSound** ISA sound card. The type of UltraSound to emulate (Classic or MAX), I/O port and amount of onboard RAM can be configured through the *Configure* button. +.. note:: MAX support is only implemented on Dev builds at the moment. + Use FLOAT32 sound ----------------- From fd81da700ac79f77e061600cdb08209f5aa2281e Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 6 Feb 2022 14:57:08 -0500 Subject: [PATCH 3/5] 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 4/5] 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 From e42539f28617655fb6729998ede6553eea7c56b6 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 23 Feb 2022 22:03:06 +0100 Subject: [PATCH 5/5] Document the mouse capture release shortcut used on the Qt frontend --- usage/gettingstarted.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usage/gettingstarted.rst b/usage/gettingstarted.rst index 00f9be5..63c763b 100644 --- a/usage/gettingstarted.rst +++ b/usage/gettingstarted.rst @@ -35,7 +35,7 @@ Now you're ready to do some stuff inside the emulated machine. Keyboard input is Mouse input has to be manually "captured" and "released". To capture the mouse in the emulated mahine, simply click inside the renderer area. Your host mouse cursor will disappear and your mouse movement and clicks will be redirected into the emulated machine. Now you can use the mouse inside the emulated machine - if the software and hardware configuration supports it, of course. -To release the mouse, press F8 and F12 simultaneously. You can also use the middle mouse button for this if the emulated mouse only has two buttons. +To release the mouse, press :kbd:`F8 + F12` simultaneously (Win32 frontend) or :kbd:`Ctrl + End` (Qt frontend, used on Linux). You can also use the middle mouse button for this if the emulated mouse only has two buttons. .. rubric:: Step 7: What now?