diff --git a/dev/buildguide.rst b/dev/buildguide.rst index 5f0266f..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-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-libpng mingw-w64-i686-rtmidi 5. Once the environment is fully updated and all dependencies are installed, change directory to ``src``: .. code-block:: bash 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. diff --git a/settings/sound.rst b/settings/sound.rst index 844789c..066069c 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 ----------------- 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?