[Scummvm-git-logs] scummvm master -> 913c7a05d1bcdec6b736e907949a41cafbdc9935
criezy
noreply at scummvm.org
Mon Jul 11 00:00:06 UTC 2022
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e352a3c381 DOCS: Remove trailing spaces and tabs
2edd899983 DOCS: Updates docs to reflect Launcher changes
6bd75d0810 DOCS: updates all screenshots
95ea8057f8 DOCS: updates to reflect new default iconspath
913c7a05d1 DOCS: edits to better reflect updated Launcher GUI
Commit: e352a3c381225678c82df989a89eacff86356540
https://github.com/scummvm/scummvm/commit/e352a3c381225678c82df989a89eacff86356540
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-07-11T00:59:01+01:00
Commit Message:
DOCS: Remove trailing spaces and tabs
Changed paths:
doc/docportal/advanced_topics/configuration_file.rst
doc/docportal/advanced_topics/understand_search_box.rst
doc/docportal/help/faq.rst
doc/docportal/use_scummvm/game_files.rst
doc/docportal/use_scummvm/how_to_settings.rst
doc/docportal/use_scummvm/install_computer.rst
doc/docportal/use_scummvm/mac_game_files.rst
doc/docportal/use_scummvm/the_launcher.rst
diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index c66daca60a4..d6ae94569b3 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -367,14 +367,14 @@ There are many recognized configuration keys. In the table below, each key is ei
- macintosh "
":ref:`retrowaveopl3_bus <adlib>`",string,,"
Specifies how the RetroWave OPL3 is connected:
-
+
- serial (connected to a USB port using a PotatoPi)
- spi (connected as a HAT using SPI) "
":ref:`retrowaveopl3_disable_buffer <adlib>`",boolean,false,
":ref:`retrowaveopl3_port <adlib>`",string,,"
Specifies the serial port that the RetroWave OPL3 is connected to.
For example:
-
+
- COM3
- ttyACM2 "
":ref:`retrowaveopl3_spi_cs <adlib>`",string,,"Specifies the GPIO chip and line that the RetroWave OPL3 is connected to. Use the format <chip>,<line>."
@@ -458,9 +458,3 @@ Screenshot path
In the current directory.
-
-
-
-
-
-
diff --git a/doc/docportal/advanced_topics/understand_search_box.rst b/doc/docportal/advanced_topics/understand_search_box.rst
index 3bef5255970..bf1c547af88 100644
--- a/doc/docportal/advanced_topics/understand_search_box.rst
+++ b/doc/docportal/advanced_topics/understand_search_box.rst
@@ -108,7 +108,7 @@ To abbreviate the 6 most common configuration keys, just type any prefix instead
Inverting the search pattern
___________________________________________
-To invert the search result, prefix the search pattern with the`!` character. For example:
+To invert the search result, prefix the search pattern with the`!` character. For example:
- ``!GOG`` - games that don't contain "GOG" substring in description
- ``!lang=ru`` - games not in Russian languange
diff --git a/doc/docportal/help/faq.rst b/doc/docportal/help/faq.rst
index e3d38d0ffeb..41dfef25821 100644
--- a/doc/docportal/help/faq.rst
+++ b/doc/docportal/help/faq.rst
@@ -28,7 +28,7 @@ A few engines supported by ScummVM have publicly available authoring tools. See
1.1.4. I want to compile ScummVM myself from the source code. How do I do this?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-See the `Compiling ScummVM wiki page <https://wiki.scummvm.org/index.php?title=Compiling_ScummVM>`_.
+See the `Compiling ScummVM wiki page <https://wiki.scummvm.org/index.php?title=Compiling_ScummVM>`_.
1.2 Using ScummVM
**********************
@@ -117,7 +117,7 @@ You can also find error messages in the ScummVM log file. See :ref:`logfile`.
2.1.2. I get "Failed to save game state to file: ". What's going on?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Check that your :ref:`save path <savepath>` is a writeable directory.
+Check that your :ref:`save path <savepath>` is a writeable directory.
2.1.3. I think I found a bug. What do I do?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,7 +149,7 @@ You need to specify the correct :ref:`language <lang>` in the game-specific sett
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
First, check the `Compatibility page <https://www.scummvm.org/compatibility/>`_ on the ScummVM website to see if the game has any known issues. If not, and the crash can be reproduced, report the crash as a bug. See :doc:`report_bugs`.
-2.2.5. I downloaded the Broken Sword packs from your website but the game won't run.
+2.2.5. I downloaded the Broken Sword packs from your website but the game won't run.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
These are not full games, they are re-encoded cutscene (video) packs. To run the games you still need the original disks. See the `Broken Sword wiki page <https://wiki.scummvm.org/index.php/Broken_Sword_1#Cutscenes>`_.
@@ -212,12 +212,12 @@ Ensure the correct game platform has been detected. For example, with Amiga game
3.1.1. When will you add support for ZIP archives?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-We won't. There are two main reasons: firstly, we believe that it would ease illegal distribution of games, and secondly, we already support compression of sound and speech to reduce file sizes.
+We won't. There are two main reasons: firstly, we believe that it would ease illegal distribution of games, and secondly, we already support compression of sound and speech to reduce file sizes.
3.1.2. Will ScummVM support other games in the future?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-That depends on a few factors. Firstly, it has to fit within the scope of ScummVM. Secondly, there has to be a developer who is interested and willing to carry out the work.
+That depends on a few factors. Firstly, it has to fit within the scope of ScummVM. Secondly, there has to be a developer who is interested and willing to carry out the work.
-ScummVM developers are all volunteers who work on ScummVM in their spare time, solely for fun, and not for profit. Reverse engineering a completely new game without the source code is a long and difficult process. Even with source it can be tedious and time consuming.
+ScummVM developers are all volunteers who work on ScummVM in their spare time, solely for fun, and not for profit. Reverse engineering a completely new game without the source code is a long and difficult process. Even with source it can be tedious and time consuming.
-Unless you work for a company interested in providing us with source code for one of their classic titles, or want to do the work yourself, please do not ask us to add support for a new game.
\ No newline at end of file
+Unless you work for a company interested in providing us with source code for one of their classic titles, or want to do the work yourself, please do not ask us to add support for a new game.
\ No newline at end of file
diff --git a/doc/docportal/use_scummvm/game_files.rst b/doc/docportal/use_scummvm/game_files.rst
index 6865905f03b..3f3e2c2d30a 100644
--- a/doc/docportal/use_scummvm/game_files.rst
+++ b/doc/docportal/use_scummvm/game_files.rst
@@ -65,5 +65,5 @@ In most cases, ScummVM can use CD audio directly from the game CD. If you don't
Macintosh games
==================
-Many of the supported games also exist in versions for the Macintosh, however it can be tricky to extract the correct files from a Macintosh floppy or CD, especially if you are using Windows or Linux. See :doc:`../use_scummvm/mac_game_files` for an in-depth how-to guide.
+Many of the supported games also exist in versions for the Macintosh, however it can be tricky to extract the correct files from a Macintosh floppy or CD, especially if you are using Windows or Linux. See :doc:`../use_scummvm/mac_game_files` for an in-depth how-to guide.
diff --git a/doc/docportal/use_scummvm/how_to_settings.rst b/doc/docportal/use_scummvm/how_to_settings.rst
index 53cf6a07477..a05036c3e55 100644
--- a/doc/docportal/use_scummvm/how_to_settings.rst
+++ b/doc/docportal/use_scummvm/how_to_settings.rst
@@ -22,4 +22,4 @@ See the :doc:`configuration file <../advanced_topics/configuration_file>` page f
From the command line
======================
-Some settings can be specified in the command line (the complete list can be found at :doc:`command line <../advanced_topics/command_line>`). These are valid for the duration of the program and don't get saved to the configuration file unless modified. They are also marked by a special color in the launcher tabs mentioned above.
\ No newline at end of file
+Some settings can be specified in the command line (the complete list can be found at :doc:`command line <../advanced_topics/command_line>`). These are valid for the duration of the program and don't get saved to the configuration file unless modified. They are also marked by a special color in the launcher tabs mentioned above.
\ No newline at end of file
diff --git a/doc/docportal/use_scummvm/install_computer.rst b/doc/docportal/use_scummvm/install_computer.rst
index cfb476d2a18..49c18af8634 100644
--- a/doc/docportal/use_scummvm/install_computer.rst
+++ b/doc/docportal/use_scummvm/install_computer.rst
@@ -21,7 +21,7 @@ This page explains how to install ScummVM on a computer. For all other platforms
Download the Windows zip file for your operating system (32bit or 64bit). To extract the files, right-click the folder and select **Extract All**.
To run ScummVM from the extracted folder, find the ``scummvm.exe`` file and double click it.
-
+
.. dropdown:: Running ScummVM in portable mode
Starting with ScummVM 2.6.0, ScummVM offers a portable mode. Instead of storing saved games, icons and screenshots in your user's directory, they are stored in the same folder as the ScummVM executable.
diff --git a/doc/docportal/use_scummvm/mac_game_files.rst b/doc/docportal/use_scummvm/mac_game_files.rst
index a5849abc44c..e42357d51f8 100644
--- a/doc/docportal/use_scummvm/mac_game_files.rst
+++ b/doc/docportal/use_scummvm/mac_game_files.rst
@@ -6,17 +6,17 @@ This section explains how to access game data files from Macintosh media. For ge
Background
==============
-There are three main aspects of Macintosh floppy or CD media that can make it difficult to extract the game data: the file system, forks, and file name encoding.
+There are three main aspects of Macintosh floppy or CD media that can make it difficult to extract the game data: the file system, forks, and file name encoding.
**HFS and HFS+ file system**
-The Macintosh uses a different file system to other operating systems; HFS for older media, and HFS+ for more recent ones.
+The Macintosh uses a different file system to other operating systems; HFS for older media, and HFS+ for more recent ones.
HFS (`Hierarchical File System <https://en.wikipedia.org/wiki/Hierarchical_File_System>`_), also known as Mac OS Standard, was used on Macintosh hard disk, floppy disks, and CDs until the late 90s. It was superseded by `HFS+ <https://en.wikipedia.org/wiki/HFS_Plus>`_, or Mac OS Extended, with the release of Mac OS 8.1 in 1998. Most game CDs released before the mid-2000 still use HFS. Modern macOS computers can still access HFS+ media, but support for reading HFS media was dropped in macOS 10.15 (Catalina).
-To view and copy the files from HFS and HFS+ floppy disks and CDs on a Windows or Linux system, you need to install additional software.
+To view and copy the files from HFS and HFS+ floppy disks and CDs on a Windows or Linux system, you need to install additional software.
-Most, if not all, Macintosh games supported by ScummVM were released on an HFS medium, but if you do have a HFS+ CD then check out the :ref:`macfileaccessother` section for ways to access these files. ScummVM's :ref:`Python-based dumper <python_dumper>` also supports the HFS+ format if you are using it on macOS.
+Most, if not all, Macintosh games supported by ScummVM were released on an HFS medium, but if you do have a HFS+ CD then check out the :ref:`macfileaccessother` section for ways to access these files. ScummVM's :ref:`Python-based dumper <python_dumper>` also supports the HFS+ format if you are using it on macOS.
**Forks**
@@ -38,7 +38,7 @@ Files that contain prohibited characters are always puny-encoded.
Windows, MacOS and Linux can store these files and do not need punycode enabled.
-For more information, see the `Windows naming conventions <https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions>`_ for a list of prohibited characters.
+For more information, see the `Windows naming conventions <https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions>`_ for a list of prohibited characters.
.. _macfiledumper:
@@ -47,7 +47,7 @@ How to extract Macintosh game files
The simplest way to extract the correct game files is to use the dumper companion created and supplied by ScummVM. The dumper can extract files from an HFS medium, encode files to the MacBinary format, and rename files with Punycode if needed.
-There are two versions of the dumper: a disk/ISO image version that runs in a browser, and a full-fledged version which uses Python. The browser-based version is the preferred method since this will work in the majority of cases, and it is less hassle because there is nothing to install.
+There are two versions of the dumper: a disk/ISO image version that runs in a browser, and a full-fledged version which uses Python. The browser-based version is the preferred method since this will work in the majority of cases, and it is less hassle because there is nothing to install.
The first step is to create an ISO image of your floppy or CD medium.
@@ -80,7 +80,7 @@ Creating the ISO image
Alternatively, find this information using the Disk Utility application. Select the CD partition and look at the name under the *device* section.
Unmount the disk if needed:
- - By default disks are mounted when they are inserted, and they need to be unmounted so that you can create the ISO file.
+ - By default disks are mounted when they are inserted, and they need to be unmounted so that you can create the ISO file.
- HFS is no longer supported on macOS 10.15 and above, therefore those disk cannot be mounted and do not need to be unmounted.
.. code-block::
@@ -171,8 +171,8 @@ The `browser based dumper companion <https://www.scummvm.org/dumper-companion>`_
#. Upload the disk/ISO image file
-#. Select the options:
-
+#. Select the options:
+
- Choose Japanese when dumping Japanese disks
- Deselect unicode if the platform does not support it
@@ -183,7 +183,7 @@ The `browser based dumper companion <https://www.scummvm.org/dumper-companion>`_
.. figure:: ../images/dumper/browser_dumper.png
- The browser based dumper companion.
+ The browser based dumper companion.
.. note::
@@ -193,16 +193,16 @@ The `browser based dumper companion <https://www.scummvm.org/dumper-companion>`_
Using the Python dumper companion
----------------------------------
-The Python dumper companion supports HFS disks, unless you are running it on a Mac, in which case MAC mode also supports HFS+.
+The Python dumper companion supports HFS disks, unless you are running it on a Mac, in which case MAC mode also supports HFS+.
Prerequisites
*************
- Python3 with pip installed. Information on how to install Python can be found `here <https://wiki.python.org/moin/BeginnersGuide/Download>`_.
-- The dumper file `downloaded <https://github.com/scummvm/scummvm/blob/master/devtools/dumper-companion.py>`_ from the repository.
+- The dumper file `downloaded <https://github.com/scummvm/scummvm/blob/master/devtools/dumper-companion.py>`_ from the repository.
Installation
*************
-Install machfs, and xattr if using macOS:
+Install machfs, and xattr if using macOS:
.. tabbed:: macOS
@@ -235,7 +235,7 @@ The dumper companion supports three modes: ISO, DIR and MAC. The MAC mode is spe
.. code-block::
./dumper-companion.py --help
-
+
**ISO mode**
@@ -281,7 +281,7 @@ Options:
.. _macfileaccessother:
-Other methods
+Other methods
--------------
There are other ways to access HFS and HFS+ media on Windows, macOS, and Linux. These methods require you to copy the files manually.
diff --git a/doc/docportal/use_scummvm/the_launcher.rst b/doc/docportal/use_scummvm/the_launcher.rst
index 2f429d07503..58391b9f510 100755
--- a/doc/docportal/use_scummvm/the_launcher.rst
+++ b/doc/docportal/use_scummvm/the_launcher.rst
@@ -24,7 +24,7 @@ The search box
The search box lets you filter the games list. It is located at the top of the page next to the magnifying glass icon. The filter is applied as you type, and is not case sensitive. To clear the filter, click **X**.
-There are many ways to filter games. For example, you can type "Monkey Island" to locate all "Monkey Island" games on the list, or you can type "lang:de" to find German games. For a comprehensive look at how to use the search box, check out our :doc:`../advanced_topics/understand_search_box` guide.
+There are many ways to filter games. For example, you can type "Monkey Island" to locate all "Monkey Island" games on the list, or you can type "lang:de" to find German games. For a comprehensive look at how to use the search box, check out our :doc:`../advanced_topics/understand_search_box` guide.
The buttons
************************
Commit: 2edd899983a4e2f9c9ff6f7323f25b704c2b365b
https://github.com/scummvm/scummvm/commit/2edd899983a4e2f9c9ff6f7323f25b704c2b365b
Author: cadihowley (cadihowley at gmail.com)
Date: 2022-07-11T00:59:01+01:00
Commit Message:
DOCS: Updates docs to reflect Launcher changes
- updates screenshots to show Launcher grid view/changed settings tabs
- updates all settings pages to reflect new Launcher button terminology
- moves Engine tab content to Game tab page
- removes Engine tab from index
- fixes some broken refs/other small errors
Changed paths:
A doc/docportal/images/Launcher/launcher_grid.jpg
A doc/docportal/images/Launcher/launcher_group.jpg
A doc/docportal/images/Launcher/launcher_list.jpg
A doc/docportal/images/Launcher/launcher_popup.jpg
A doc/docportal/images/settings/backend.jpg
A doc/docportal/images/settings/game.jpg
A doc/docportal/images/settings/misc.jpg
A doc/docportal/images/settings/paths.jpg
R doc/docportal/images/Launcher/launcher.png
R doc/docportal/images/settings/game.png
R doc/docportal/settings/engine.rst
doc/docportal/index.rst
doc/docportal/settings/accessibility.rst
doc/docportal/settings/audio.rst
doc/docportal/settings/backend.rst
doc/docportal/settings/cloud.rst
doc/docportal/settings/control.rst
doc/docportal/settings/game.rst
doc/docportal/settings/graphics.rst
doc/docportal/settings/keymaps.rst
doc/docportal/settings/lan.rst
doc/docportal/settings/misc.rst
doc/docportal/settings/paths.rst
doc/docportal/use_scummvm/how_to_settings.rst
doc/docportal/use_scummvm/taskbar_integration.rst
doc/docportal/use_scummvm/the_launcher.rst
diff --git a/doc/docportal/images/Launcher/launcher.png b/doc/docportal/images/Launcher/launcher.png
deleted file mode 100644
index 929791b3cc9..00000000000
Binary files a/doc/docportal/images/Launcher/launcher.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/launcher_grid.jpg b/doc/docportal/images/Launcher/launcher_grid.jpg
new file mode 100644
index 00000000000..b23dd134b56
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_grid.jpg differ
diff --git a/doc/docportal/images/Launcher/launcher_group.jpg b/doc/docportal/images/Launcher/launcher_group.jpg
new file mode 100644
index 00000000000..7b8db64ad2b
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_group.jpg differ
diff --git a/doc/docportal/images/Launcher/launcher_list.jpg b/doc/docportal/images/Launcher/launcher_list.jpg
new file mode 100644
index 00000000000..0083ff169f2
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_list.jpg differ
diff --git a/doc/docportal/images/Launcher/launcher_popup.jpg b/doc/docportal/images/Launcher/launcher_popup.jpg
new file mode 100644
index 00000000000..036083fac42
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_popup.jpg differ
diff --git a/doc/docportal/images/settings/backend.jpg b/doc/docportal/images/settings/backend.jpg
new file mode 100644
index 00000000000..9848de2e20a
Binary files /dev/null and b/doc/docportal/images/settings/backend.jpg differ
diff --git a/doc/docportal/images/settings/game.jpg b/doc/docportal/images/settings/game.jpg
new file mode 100644
index 00000000000..b6f82dce8eb
Binary files /dev/null and b/doc/docportal/images/settings/game.jpg differ
diff --git a/doc/docportal/images/settings/game.png b/doc/docportal/images/settings/game.png
deleted file mode 100644
index b53a9b7f1f4..00000000000
Binary files a/doc/docportal/images/settings/game.png and /dev/null differ
diff --git a/doc/docportal/images/settings/misc.jpg b/doc/docportal/images/settings/misc.jpg
new file mode 100644
index 00000000000..811fb35aa7a
Binary files /dev/null and b/doc/docportal/images/settings/misc.jpg differ
diff --git a/doc/docportal/images/settings/paths.jpg b/doc/docportal/images/settings/paths.jpg
new file mode 100644
index 00000000000..3ae62ea4601
Binary files /dev/null and b/doc/docportal/images/settings/paths.jpg differ
diff --git a/doc/docportal/index.rst b/doc/docportal/index.rst
index 1c7e8482fa7..a365dd9a290 100644
--- a/doc/docportal/index.rst
+++ b/doc/docportal/index.rst
@@ -30,7 +30,6 @@
:hidden:
settings/game
- settings/engine
settings/backend
settings/graphics
settings/control
diff --git a/doc/docportal/settings/accessibility.rst b/doc/docportal/settings/accessibility.rst
index e4072b97ced..2def8b0efc6 100644
--- a/doc/docportal/settings/accessibility.rst
+++ b/doc/docportal/settings/accessibility.rst
@@ -4,13 +4,13 @@ Accessibility
Use the Accessibility tab to change accessibility settings.
-From the Launcher, select **Options**, click the **>** scroll arrow until the LAN tab is visible, and then select the **LAN** tab.
+From the Launcher, select **Global Options**, if necessary click the **>** scroll arrow until the Accessibility tab is visible, and then select the **Accessibility** tab.
.. figure:: ../images/settings/accessibility.png
- The Accessibility tab in the global settings.
+ The Accessibility tab in the Global Options menu.
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
diff --git a/doc/docportal/settings/audio.rst b/doc/docportal/settings/audio.rst
index e577d286845..77330904504 100644
--- a/doc/docportal/settings/audio.rst
+++ b/doc/docportal/settings/audio.rst
@@ -8,11 +8,11 @@ Audio settings are found on four tabs:
**To change settings globally:**
- From the Launcher, select **Options**, then select the applicable tab.
+ From the Launcher, select **Global Options**, then select the applicable tab.
**To change settings for a specific game:**
- From the Launcher, highlight the game in the games list, select **Edit Game**, and then select the applicable tab.
+ From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. Select the applicable tab.
For a comprehensive look at how to use ScummVM's extensive audio settings, check out our :doc:`../advanced_topics/understand_audio` guide.
@@ -23,15 +23,15 @@ All settings can also be changed in the :doc:`../advanced_topics/configuration_f
The Audio tab
-----------------
-Use the Audio tab to change the sound output for games.
+Use the Audio tab to change the sound output of games.
.. figure:: ../images/settings/audio.png
- The Audio tab in the global settings
+ The Audio tab in the Global Options menu.
.. figure:: ../images/settings/audio_game.png
- The Audio tab in the game-specific settings.
+ The Audio tab in the Game Options menu.
,,,,,,,,,,,,,,,,
@@ -79,7 +79,7 @@ Use the Volume tab to set the relative volumes for various in-game sounds.
.. figure:: ../images/settings/volume_game.png
- The Volume tab in the game-specific settings.
+ The Volume tab in the Game Options menu.
,,,,,,,,,,,,,
@@ -125,7 +125,7 @@ Use the MIDI tab to change the settings of General MIDI (GM) devices.
.. figure:: ../images/settings/MIDI.png
- The MIDI tab in the global settings.
+ The MIDI tab in the Global Options menu
,,,,,,,,,,,,,
@@ -286,7 +286,7 @@ Use the MT-32 tab to change the settings of Roland MT-32 devices.
.. figure:: ../images/settings/MT32.png
- The MT-32 tab in the global settings.
+ The MT-32 tab in the Global Options menu
,,,,,,,,,,,,,
diff --git a/doc/docportal/settings/backend.rst b/doc/docportal/settings/backend.rst
index 42db38879a5..86e787bca74 100644
--- a/doc/docportal/settings/backend.rst
+++ b/doc/docportal/settings/backend.rst
@@ -4,13 +4,17 @@ Backend
Use the Backend tab to change settings that are unique to the platform being used. This tab is not available for all platforms.
-To change settings globally:
+**To change settings globally:**
-From the Launcher, select **Options**, then select the **Backend** tab.
+ From the Launcher, select **Global Options**, then select the **Backend** tab.
-To change settings for a specific game:
+**To change settings for a specific game:**
-Highlight the game in the games list, select **Edit Game**, then select the **Backend** tab.
+ From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. Select the **Backend** tab.
+
+.. figure:: ../images/settings/backend.jpg
+
+ The Android Backend tab in the Global Options menu
For a comprehensive look at how to use these settings, check out the individual platform guides.
diff --git a/doc/docportal/settings/cloud.rst b/doc/docportal/settings/cloud.rst
index 9b62d672ebf..f8a853833af 100644
--- a/doc/docportal/settings/cloud.rst
+++ b/doc/docportal/settings/cloud.rst
@@ -6,12 +6,12 @@ Use the Cloud tab to manage connected cloud storage services.
For a comprehensive look at how to use ScummVM's built-in cloud functionality, check out our :doc:`../use_scummvm/connect_cloud` guide.
-From the Launcher, select **Options**, click the **>** scroll arrow until the Cloud tab is visible, and then select the **Cloud** tab.
+From the Launcher, select **Global Options**, if necessary click the **>** scroll arrow until the Cloud tab is visible, and then select the **Cloud** tab.
.. figure:: ../images/settings/cloud.png
- The Cloud tab in the global settings
+ The Cloud tab in the Global Options menu
,,,,,,,,,,,,,,,,,,,,,
diff --git a/doc/docportal/settings/control.rst b/doc/docportal/settings/control.rst
index 19a54eed172..63a31b654a5 100644
--- a/doc/docportal/settings/control.rst
+++ b/doc/docportal/settings/control.rst
@@ -4,11 +4,11 @@ Control
Use the Control tab to change settings for joysticks, game controllers, and touch screens. This tab is not always available.
-From the Launcher, select **Options**, and then select the **Control** tab.
+From the Launcher, select **Global Options**, and then select the **Control** tab.
.. figure:: ../images/settings/control.png
- The Control tab in the global settings
+ The Control tab in the Global Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
diff --git a/doc/docportal/settings/engine.rst b/doc/docportal/settings/engine.rst
deleted file mode 100644
index a051a111a1d..00000000000
--- a/doc/docportal/settings/engine.rst
+++ /dev/null
@@ -1,672 +0,0 @@
-=====================
-Engine
-=====================
-
-Use the Engine tab to change settings that are unique to the game being played.
-
-From the Launcher, highlight a game on the games list, select **Edit Game**, and then select the **Engine** tab. This tab is not available for all games.
-
-To find out which engine powers your game, have a look at the ScummVM Supported Games `wiki page
-<https://wiki.scummvm.org/index.php?title=Category:Supported_Games>`_.
-
-Engines: ADL_ | AGI_ | AGOS_ | BLADERUNNER_ | CGE_ | CINE_ | DRASCULA_ | DREAMWEB_ | HDB_ | HOPKINS_ | KYRA_ | LURE_ | MADS_ | NEVERHOOD_ | SCI_ | SCUMM_ | SHERLOCK_ | SKY_ | SUPERNOVA_ | TOLTECS_ | WINTERMUTE_ | XEEN_ |
-
-.. figure:: ../images/settings/engine.png
-
- The Engine tab in the game-specific settings
-
-All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
-
-,,,,,,,,,,,,,,,,,,,,
-
-.. _ADL:
-
-ADL
-*****
-
-.. _ntsc:
-
-TV emulation
- Emulates the composite output to an NTSC TV.
-
- *ntsc*
-
-.. _color:
-
-Color Graphics
- Uses color graphics instead of monochrome graphics.
-
- *color*
-
-.. _scan:
-
-Show scanlines
- Darkens every other scanline to mimic the look of a CRT display.
-
- *scanlines*
-
-.. _mono:
-
-Always use sharp monochrome text
- Does not emulate NTSC artifacts for text.
-
- *monotext*
-
-,,,,,,,,,
-
-.. _AGI:
-
-AGI
-*****
-
-.. _osl:
-
-Use original save/load screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-.. _altamiga:
-
-Use an alternative palette
- Uses an alternative palette, common to all Amiga games.
-
- *altamigapalette*
-
-.. _support:
-
-Mouse support
- Enables mouse support for movement and in game menus.
-
- *mousesupport*
-
-.. _herc:
-
-Use Hercules hires font
- Uses the Hercules hi-resolution font, when the font file is available.
-
- *herculesfont*
-
-.. _cmd:
-
-Pause when entering commands
- Shows a command prompt window and pauses the game, instead of a real-time prompt.
-
- *commandpromptwindow*
-
-.. _2gs:
-
-Add speed menu
- Adds a game speed menu, similar to the PC version.
-
- *apple2gs_speedmenu*
-
-,,,,,,
-
-.. _AGOS:
-
-AGOS
-******
-
-.. _fadeout:
-
-Disable fade-out effects
- Don't fade every screen to black when leaving a room.
-
- *disable_fade_effects*
-
-,,,,,,
-
-.. _BLADERUNNER:
-
-BLADERUNNER
-******************
-
-.. _sitcom:
-
-Sitcom mode
- Adds laughter after the actor's line or narration.
-
- *sitcom*
-
-.. _shorty:
-
-Shorty mode
- Shrinks the actors and makes their voices high pitched.
-
- *shorty*
-
-.. _nodelay:
-
-Frame limiter high performance mode
- Avoids use of ``delayMillis()`` function. This mode might result in high CPU usage.
-
- *nodelaymillisfl*
-
-.. _fpsfl:
-
-Max frames per second limit
- Targets a maximum of 120 frames per second (fps). When disabled, the game targets 60 fps.
-
- *frames_per_secondfl*
-
-.. _stamina:
-
-Disable McCoy's quick stamina drain
- When running, McCoy won't start slowing down as soon as the player stops clicking the mouse.
-
- *disable_stamina_drain*
-
-,,,,,,,,
-
-.. _CGE:
-
-CGE
-*******
-
-.. _blind:
-
-Color Blind Mode
- Enables Color Blind Mode by default.
-
- *enable_color_blind*
-
-,,,,,,
-
-.. _CINE:
-
-CHEWY
-*********
-
-Use original save/load screen
- Uses the original save/load screens instead of the ScummVM screens.
-
- *original_menus*
-
-CINE
-*********
-
-Use original save/load screen
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-.. _transparentdialog:
-
-Use transparent dialog boxes in 16 color scenes
- Uses transparent dialog boxes in 16 color scenes even if the original game version did not support them.
-
- *transparentdialogboxes*
-
-,,,,,,,,,
-
-.. _DRASCULA:
-
-DRASCULA
-*************
-
-Use original save/load screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-,,,,,,,,,,
-
-.. _DREAMWEB:
-
-DREAMWEB
-**********
-
-Use original save/load screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-.. _bright:
-
-Use bright palette mode
- Displays graphics using the game's bright palette.
-
- *bright_palette*
-
-,,,,,,,,,,
-
-.. _HDB:
-
-HDB
-**********
-
-.. _hyper:
-
-Enable cheat mode
- Enables debug info and level selection.
-
- *hypercheat*
-
-,,,,,,,,,,
-
-.. _HOPKINS:
-
-HOPKINS
-*************
-
-.. _gore:
-
-Gore Mode
- Enables Gore Mode when available.
-
- *enable_gore*
-
-,,,,,,,,,,
-
-.. _KYRA:
-
-KYRA
-********
-
-.. _studio:
-
-Enable studio audience
- Studio audience adds an applause and cheering sounds whenever Malcolm makes a joke.
-
- *studio_audience*
-
-.. _skipsupport:
-
-Skip support
- Lets the user skip text and cutscenes.
-
- *skip_support*
-
-.. _helium:
-
-Enable helium mode
- Makes characters sound like they inhaled Helium.
-
- *helium_mode*
-
-.. _smooth:
-
-Enable smooth scrolling when walking
- Makes scrolling smoother when changing from one screen to another.
-
- *smooth_scrolling*
-
-.. _floating:
-
-Enable floating cursors
- Changes the cursor when it floats to the edge of the screen to a directional arrow. Click to walk in that direction.
-
- *floating_cursors*
-
-Suggest save names
- Fills in an autogenerated save game description into the input prompt.
-
- *auto_savenames*
-
-.. _hp:
-
-HP bar graphs
- Enables hit point bar graphs.
-
- *hpbargraphs*
-
-.. _btswap:
-
-Fight Button L/R Swap
- Swaps the buttons so that the left button attacks, and the right button picks up items.
-
- *mousebtswap*
-
-,,,,,,,,,,
-
-.. _LURE:
-
-LURE
-******
-
-
-.. _ttsnarrator:
-
-TTS Narrator
- Uses text-to-speech to read the descriptions, if text-to-speech is available.
-
- *tts_narrator*
-
-,,,,,,,,,,
-
-.. _MADS:
-
-MADS
-*******
-
-.. _easy:
-
-Easy mouse interface
- Shows object names when the mouse pointer is held over the object.
-
- *EasyMouse*
-
-.. _objanimated:
-
-Animated inventory items
- Animates the inventory items.
-
- *InvObjectsAnimated*
-
-.. _windowanimated:
-
-Animated game interface
- Animates the game interface.
-
- *TextWindowAnimated*
-
-.. _naughty:
-
-Naughty game mode
- Enables naughty game mode.
-
- *NaughtyMode*
-
-.. _gdither:
-
-Graphics dithering
- Enables graphics dithering.
-
- *GraphicsDithering*
-
-,,,,,,,,,,
-
-.. _NEVERHOOD:
-
-NEVERHOOD
-************
-
-Use original save/load screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-.. _skiphall:
-
-Skip the Hall of Records storyboard scenes
- Lets the player skip past the Hall of Records storyboard scenes.
-
- *skiphallofrecordsscenes*
-
-.. _scale:
-
-Scale the making of videos to full screen
- Scales the making-of videos, so that they use the whole screen.
-
- *scalemakingofvideos*
-
-,,,,,,,,,,
-
-.. _QUEEN:
-
-QUEEN
-*****
-
-Alternate intro
- Plays the alternate intro for Flight of the Amazon Queen.
-
- *alt_intro*
-
-,,,,,,,,,,,,,,,
-
-.. _SCI:
-
-SCI
-******
-
-.. _dither:
-
-Skip EGA dithering pass (full color backgrounds)
- Skips dithering pass in EGA games. Graphics are shown with full colors.
-
- *disable_dithering*
-
-.. _hires:
-
-Enable high resolution graphics
- Enables high resolution graphics and content.
-
- *enable_high_resolution_graphics*
-
-.. _blackline:
-
-Enable black-lined video
- Draws black lines over videos to increase their apparent sharpness.
-
- *enable_black_lined_video*
-
-.. _hq:
-
-Use high-quality video scaling
- Uses linear interpolation when upscaling videos, where possible.
-
- *enable_hq_video*
-
-.. _larry:
-
-Use high-quality "LarryScale" cel scaling
- Uses special cartoon scaler for drawing character sprites.
-
- *enable_larryscale*
-
-.. _dsfx:
-
-Prefer digital sound effects
- Prefers digital (sampled) sound effects instead of synthesized ones.
-
- *prefer_digitalsfx*
-
-Use original save/load screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-.. _fb01:
-
-Use IMF/Yamaha FB-01 for MIDI output
- Uses an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI output.
-
- *native_fb01*
-
-.. _cd:
-
-Use CD audio
- Uses CD audio instead of in-game audio, if available.
-
- *use_cdaudio*
-
-.. _wincursors:
-
-Use Windows cursors
- Uses the Windows cursor (smaller and monochrome) instead of the DOS cursor.
-
- *windows_cursors*
-
-.. _silver:
-
-Use silver cursors
- Uses the alternate set of silver cursors instead of the normal golden cursors.
-
- *silver_cursors*
-
-.. _upscale:
-
-Upscale videos
- Upscales videos to double their size
-
- *enable_video_upscale*
-
-.. _censor:
-
-Enable content censoring
- Enables the game's built-in optional content censoring.
-
- *enable_censoring*
-
-,,,,,,,,,,
-
-.. _SCUMM:
-
-SCUMM
-************
-
-.. _labels:
-
-Show Object Line
- Show the names of objects at the bottom of the screen.
-
- *object_labels*
-
-.. _classic:
-
-Use NES Classic Palette
- Uses a more neutral color palette that closely emulates the NES Classic.
-
- *mm_nes_classic_palette*
-
-.. _enhancements:
-
-Enable game-specific enhancements
- Allow ScummVM to make small enhancements to the game, usually based on other versions of the same game.
-
- *enable_enhancements*
-
-,,,,,,,,,,
-
-.. _SHERLOCK:
-
-SHERLOCK
-*********
-
-Use original load/save screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-.. _fade:
-
-Pixellated scene transitions
- Enables randomized pixel transitions between scenes.
-
- *fade_style*
-
-.. _help:
-
-Don't show hotspots when moving mouse
- Only shows hotspot names after you click on a hotspot or action button.
-
- *help_style*
-
-.. _portraits:
-
-Show character portraits
- Shows portraits of the characters when the characters converse.
-
- *portraits_on*
-
-.. _style:
-
-Slide dialogs into view
- Slides UI dialogs into view.
-
- *window_style*
-
-.. _transparentwindows:
-
-Transparent windows
- Shows windows with a partially transparent background.
-
- *transparent_windows*
-
-TTS Narrator
- Uses text-to-speech to read the descriptions, if text-to-speech is available.
-
- *tts_narrator*
-
-,,,,,,,,,,
-
-.. _SKY:
-
-SKY
-******
-
-.. _altintro:
-
-Floppy intro
- Uses the floppy version's intro (CD version only)
-
- *alt_intro*
-
-,,,,,,,,,,
-
-.. _SUPERNOVA:
-
-SUPERNOVA
-**********
-
-.. _improved:
-
-Improved mode
- Removes some repetitive actions, and adds the possibility to change verbs by keyboard.
-
- *improved*
-
-,,,,,,,,,,
-
-.. _TOLTECS:
-
-TOLTECS
-**************
-
-Use original save/load screens
- Uses the original save/load screens instead of the ScummVM screens.
-
- *originalsaveload*
-
-,,,,,,,,,,
-
-.. _WINTERMUTE:
-
-WINTERMUTE
-**************
-
-.. _fps:
-
-Show FPS-counter
- Shows the current number of frames per second in the upper left corner.
-
- *show_fps*
-
-.. _bilinear:
-
-Sprite bilinear filtering (SLOW)
- Applies bilinear filtering to individual sprites.
-
- *bilinear_filtering*
-
-,,,,,,,,,,
-
-.. _XEEN:
-
-XEEN
-******
-
-.. _cost:
-
-Show item costs in standard inventory mode
- Shows item costs in standard inventory mode, which lets the value of items be compared.
-
- *ShowItemCosts*
-
-.. _durable:
-
-More durable armor
- Armor won't break until character is at -80HP, instead of the default -10HP.
-
- *DurableArmor*
diff --git a/doc/docportal/settings/game.rst b/doc/docportal/settings/game.rst
index 76f37c17878..10436bc0dec 100644
--- a/doc/docportal/settings/game.rst
+++ b/doc/docportal/settings/game.rst
@@ -5,12 +5,12 @@ Game
Use the Game tab to display and change information about how the game is
identified by ScummVM.
-From the Launcher, highlight a game on the games list, then select **Edit Game**. The **Game** tab is the first tab shown.
+From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. The menu opens on the **Game** tab.
-.. figure:: ../images/settings/game.png
+.. figure:: ../images/settings/game.jpg
- The Game tab in the game-specific settings
+ The Game tab in the Game Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
@@ -41,4 +41,669 @@ All settings can also be changed in the :doc:`../advanced_topics/configuration_f
**Platform**
Specifies the original platform of the game.
- *platform*
\ No newline at end of file
+ *platform*
+
+,,,,,,
+
+The Game tab also shows settings unique to the game engine for the selected game.
+
+To find out which engine powers your game, have a look at the ScummVM Supported Games `wiki page
+<https://wiki.scummvm.org/index.php?title=Category:Supported_Games>`_ or :ref:`group <group>` games by Engine in the Launcher.
+
+Engines: ADL_ | AGI_ | AGOS_ | BLADERUNNER_ | CGE_ | CINE_ | DRASCULA_ | DREAMWEB_ | HDB_ | HOPKINS_ | KYRA_ | LURE_ | MADS_ | NEVERHOOD_ | SCI_ | SCUMM_ | SHERLOCK_ | SKY_ | SUPERNOVA_ | TOLTECS_ | WINTERMUTE_ | XEEN_ |
+
+
+
+,,,,,,,,,,,,,,,,,,,,
+
+.. _ADL:
+
+ADL
+*****
+
+.. _ntsc:
+
+TV emulation
+ Emulates the composite output to an NTSC TV.
+
+ *ntsc*
+
+.. _color:
+
+Color Graphics
+ Uses color graphics instead of monochrome graphics.
+
+ *color*
+
+.. _scan:
+
+Show scanlines
+ Darkens every other scanline to mimic the look of a CRT display.
+
+ *scanlines*
+
+.. _mono:
+
+Always use sharp monochrome text
+ Does not emulate NTSC artifacts for text.
+
+ *monotext*
+
+,,,,,,,,,
+
+.. _AGI:
+
+AGI
+*****
+
+.. _osl:
+
+Use original save/load screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+.. _altamiga:
+
+Use an alternative palette
+ Uses an alternative palette, common to all Amiga games.
+
+ *altamigapalette*
+
+.. _support:
+
+Mouse support
+ Enables mouse support for movement and in game menus.
+
+ *mousesupport*
+
+.. _herc:
+
+Use Hercules hires font
+ Uses the Hercules hi-resolution font, when the font file is available.
+
+ *herculesfont*
+
+.. _cmd:
+
+Pause when entering commands
+ Shows a command prompt window and pauses the game, instead of a real-time prompt.
+
+ *commandpromptwindow*
+
+.. _2gs:
+
+Add speed menu
+ Adds a game speed menu, similar to the PC version.
+
+ *apple2gs_speedmenu*
+
+,,,,,,
+
+.. _AGOS:
+
+AGOS
+******
+
+.. _fadeout:
+
+Disable fade-out effects
+ Don't fade every screen to black when leaving a room.
+
+ *disable_fade_effects*
+
+,,,,,,
+
+.. _BLADERUNNER:
+
+BLADERUNNER
+******************
+
+.. _sitcom:
+
+Sitcom mode
+ Adds laughter after the actor's line or narration.
+
+ *sitcom*
+
+.. _shorty:
+
+Shorty mode
+ Shrinks the actors and makes their voices high pitched.
+
+ *shorty*
+
+.. _nodelay:
+
+Frame limiter high performance mode
+ Avoids use of ``delayMillis()`` function. This mode might result in high CPU usage.
+
+ *nodelaymillisfl*
+
+.. _fpsfl:
+
+Max frames per second limit
+ Targets a maximum of 120 frames per second (fps). When disabled, the game targets 60 fps.
+
+ *frames_per_secondfl*
+
+.. _stamina:
+
+Disable McCoy's quick stamina drain
+ When running, McCoy won't start slowing down as soon as the player stops clicking the mouse.
+
+ *disable_stamina_drain*
+
+,,,,,,,,
+
+.. _CGE:
+
+CGE
+*******
+
+.. _blind:
+
+Color Blind Mode
+ Enables Color Blind Mode by default.
+
+ *enable_color_blind*
+
+,,,,,,
+
+.. _CINE:
+
+CHEWY
+*********
+
+Use original save/load screen
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *original_menus*
+
+CINE
+*********
+
+Use original save/load screen
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+.. _transparentdialog:
+
+Use transparent dialog boxes in 16 color scenes
+ Uses transparent dialog boxes in 16 color scenes even if the original game version did not support them.
+
+ *transparentdialogboxes*
+
+,,,,,,,,,
+
+.. _DRASCULA:
+
+DRASCULA
+*************
+
+Use original save/load screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+,,,,,,,,,,
+
+.. _DREAMWEB:
+
+DREAMWEB
+**********
+
+Use original save/load screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+.. _bright:
+
+Use bright palette mode
+ Displays graphics using the game's bright palette.
+
+ *bright_palette*
+
+,,,,,,,,,,
+
+.. _HDB:
+
+HDB
+**********
+
+.. _hyper:
+
+Enable cheat mode
+ Enables debug info and level selection.
+
+ *hypercheat*
+
+,,,,,,,,,,
+
+.. _HOPKINS:
+
+HOPKINS
+*************
+
+.. _gore:
+
+Gore Mode
+ Enables Gore Mode when available.
+
+ *enable_gore*
+
+,,,,,,,,,,
+
+.. _KYRA:
+
+KYRA
+********
+
+.. _studio:
+
+Enable studio audience
+ Studio audience adds an applause and cheering sounds whenever Malcolm makes a joke.
+
+ *studio_audience*
+
+.. _skipsupport:
+
+Skip support
+ Lets the user skip text and cutscenes.
+
+ *skip_support*
+
+.. _helium:
+
+Enable helium mode
+ Makes characters sound like they inhaled Helium.
+
+ *helium_mode*
+
+.. _smooth:
+
+Enable smooth scrolling when walking
+ Makes scrolling smoother when changing from one screen to another.
+
+ *smooth_scrolling*
+
+.. _floating:
+
+Enable floating cursors
+ Changes the cursor when it floats to the edge of the screen to a directional arrow. Click to walk in that direction.
+
+ *floating_cursors*
+
+Suggest save names
+ Fills in an autogenerated save game description into the input prompt.
+
+ *auto_savenames*
+
+.. _hp:
+
+HP bar graphs
+ Enables hit point bar graphs.
+
+ *hpbargraphs*
+
+.. _btswap:
+
+Fight Button L/R Swap
+ Swaps the buttons so that the left button attacks, and the right button picks up items.
+
+ *mousebtswap*
+
+,,,,,,,,,,
+
+.. _LURE:
+
+LURE
+******
+
+
+.. _ttsnarrator:
+
+TTS Narrator
+ Uses text-to-speech to read the descriptions, if text-to-speech is available.
+
+ *tts_narrator*
+
+,,,,,,,,,,
+
+.. _MADS:
+
+MADS
+*******
+
+.. _easy:
+
+Easy mouse interface
+ Shows object names when the mouse pointer is held over the object.
+
+ *EasyMouse*
+
+.. _objanimated:
+
+Animated inventory items
+ Animates the inventory items.
+
+ *InvObjectsAnimated*
+
+.. _windowanimated:
+
+Animated game interface
+ Animates the game interface.
+
+ *TextWindowAnimated*
+
+.. _naughty:
+
+Naughty game mode
+ Enables naughty game mode.
+
+ *NaughtyMode*
+
+.. _gdither:
+
+Graphics dithering
+ Enables graphics dithering.
+
+ *GraphicsDithering*
+
+,,,,,,,,,,
+
+.. _NEVERHOOD:
+
+NEVERHOOD
+************
+
+Use original save/load screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+.. _skiphall:
+
+Skip the Hall of Records storyboard scenes
+ Lets the player skip past the Hall of Records storyboard scenes.
+
+ *skiphallofrecordsscenes*
+
+.. _scale:
+
+Scale the making of videos to full screen
+ Scales the making-of videos, so that they use the whole screen.
+
+ *scalemakingofvideos*
+
+,,,,,,,,,,
+
+.. _QUEEN:
+
+QUEEN
+*****
+
+Alternate intro
+ Plays the alternate intro for Flight of the Amazon Queen.
+
+ *alt_intro*
+
+,,,,,,,,,,,,,,,
+
+.. _SCI:
+
+SCI
+******
+
+.. _dither:
+
+Skip EGA dithering pass (full color backgrounds)
+ Skips dithering pass in EGA games. Graphics are shown with full colors.
+
+ *disable_dithering*
+
+.. _hires:
+
+Enable high resolution graphics
+ Enables high resolution graphics and content.
+
+ *enable_high_resolution_graphics*
+
+.. _blackline:
+
+Enable black-lined video
+ Draws black lines over videos to increase their apparent sharpness.
+
+ *enable_black_lined_video*
+
+.. _hq:
+
+Use high-quality video scaling
+ Uses linear interpolation when upscaling videos, where possible.
+
+ *enable_hq_video*
+
+.. _larry:
+
+Use high-quality "LarryScale" cel scaling
+ Uses special cartoon scaler for drawing character sprites.
+
+ *enable_larryscale*
+
+.. _dsfx:
+
+Prefer digital sound effects
+ Prefers digital (sampled) sound effects instead of synthesized ones.
+
+ *prefer_digitalsfx*
+
+Use original save/load screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+.. _fb01:
+
+Use IMF/Yamaha FB-01 for MIDI output
+ Uses an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI output.
+
+ *native_fb01*
+
+.. _cd:
+
+Use CD audio
+ Uses CD audio instead of in-game audio, if available.
+
+ *use_cdaudio*
+
+.. _wincursors:
+
+Use Windows cursors
+ Uses the Windows cursor (smaller and monochrome) instead of the DOS cursor.
+
+ *windows_cursors*
+
+.. _silver:
+
+Use silver cursors
+ Uses the alternate set of silver cursors instead of the normal golden cursors.
+
+ *silver_cursors*
+
+.. _upscale:
+
+Upscale videos
+ Upscales videos to double their size
+
+ *enable_video_upscale*
+
+.. _censor:
+
+Enable content censoring
+ Enables the game's built-in optional content censoring.
+
+ *enable_censoring*
+
+,,,,,,,,,,
+
+.. _SCUMM:
+
+SCUMM
+************
+
+.. _labels:
+
+Show Object Line
+ Show the names of objects at the bottom of the screen.
+
+ *object_labels*
+
+.. _classic:
+
+Use NES Classic Palette
+ Uses a more neutral color palette that closely emulates the NES Classic.
+
+ *mm_nes_classic_palette*
+
+.. _enhancements:
+
+Enable game-specific enhancements
+ Allow ScummVM to make small enhancements to the game, usually based on other versions of the same game.
+
+ *enable_enhancements*
+
+,,,,,,,,,,
+
+.. _SHERLOCK:
+
+SHERLOCK
+*********
+
+Use original load/save screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+.. _fade:
+
+Pixellated scene transitions
+ Enables randomized pixel transitions between scenes.
+
+ *fade_style*
+
+.. _help:
+
+Don't show hotspots when moving mouse
+ Only shows hotspot names after you click on a hotspot or action button.
+
+ *help_style*
+
+.. _portraits:
+
+Show character portraits
+ Shows portraits of the characters when the characters converse.
+
+ *portraits_on*
+
+.. _style:
+
+Slide dialogs into view
+ Slides UI dialogs into view.
+
+ *window_style*
+
+.. _transparentwindows:
+
+Transparent windows
+ Shows windows with a partially transparent background.
+
+ *transparent_windows*
+
+TTS Narrator
+ Uses text-to-speech to read the descriptions, if text-to-speech is available.
+
+ *tts_narrator*
+
+,,,,,,,,,,
+
+.. _SKY:
+
+SKY
+******
+
+.. _altintro:
+
+Floppy intro
+ Uses the floppy version's intro (CD version only)
+
+ *alt_intro*
+
+,,,,,,,,,,
+
+.. _SUPERNOVA:
+
+SUPERNOVA
+**********
+
+.. _improved:
+
+Improved mode
+ Removes some repetitive actions, and adds the possibility to change verbs by keyboard.
+
+ *improved*
+
+,,,,,,,,,,
+
+.. _TOLTECS:
+
+TOLTECS
+**************
+
+Use original save/load screens
+ Uses the original save/load screens instead of the ScummVM screens.
+
+ *originalsaveload*
+
+,,,,,,,,,,
+
+.. _WINTERMUTE:
+
+WINTERMUTE
+**************
+
+.. _fps:
+
+Show FPS-counter
+ Shows the current number of frames per second in the upper left corner.
+
+ *show_fps*
+
+.. _bilinear:
+
+Sprite bilinear filtering (SLOW)
+ Applies bilinear filtering to individual sprites.
+
+ *bilinear_filtering*
+
+,,,,,,,,,,
+
+.. _XEEN:
+
+XEEN
+******
+
+.. _cost:
+
+Show item costs in standard inventory mode
+ Shows item costs in standard inventory mode, which lets the value of items be compared.
+
+ *ShowItemCosts*
+
+.. _durable:
+
+More durable armor
+ Armor won't break until character is at -80HP, instead of the default -10HP.
+
+ *DurableArmor*
diff --git a/doc/docportal/settings/graphics.rst b/doc/docportal/settings/graphics.rst
index f54e1aef43a..a2699a25bbf 100644
--- a/doc/docportal/settings/graphics.rst
+++ b/doc/docportal/settings/graphics.rst
@@ -4,13 +4,14 @@ Graphics
Use the Graphics tab to change how games look when they are played.
+
**To change settings globally:**
- From the Launcher, select **Options**. The **Graphics** tab is the first tab shown.
+ From the Launcher, select **Global Options**. The Global Options menu opens on the **Graphics** tab.
**To change settings for a specific game:**
- Highlight the game in the games list, select **Edit Game** then select the **Graphics** tab.
+ From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. Select the **Graphics** tab.
For a comprehensive look at how to use these settings, check out our :doc:`../advanced_topics/understand_graphics` guide.
diff --git a/doc/docportal/settings/keymaps.rst b/doc/docportal/settings/keymaps.rst
index a535eebe36d..c726e7cc5ff 100644
--- a/doc/docportal/settings/keymaps.rst
+++ b/doc/docportal/settings/keymaps.rst
@@ -4,17 +4,18 @@ Keymaps
Use the Keymaps tab to assign actions to keyboard keys or shortcuts, or to mouse or joystick buttons.
+
**To change settings globally:**
- From the Launcher, select **Options**, then select the **Keymaps** tab.
+ From the Launcher, select **Global Options**, then select the **Keymaps** tab.
**To change settings for a specific game:**
- Highlight the game in the games list, select **Edit Game** then select the **Keymaps** tab.
+ From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. Select the **Keymaps** tab.
.. figure:: ../images/settings/keymaps.png
- The Keymaps tab in the global settings
+ The Keymaps tab in the Global Options menu
.. figure:: ../images/settings/keymaps_dropdown.png
diff --git a/doc/docportal/settings/lan.rst b/doc/docportal/settings/lan.rst
index 74d4b0075f4..8efcf916add 100644
--- a/doc/docportal/settings/lan.rst
+++ b/doc/docportal/settings/lan.rst
@@ -6,12 +6,12 @@ Use the LAN tab to control the Local Area Network (local web server).
For a comprehensive look at how to use ScummVM's built-in LAN functionality, check out our :doc:`../use_scummvm/LAN` guide.
-From the Launcher, select **Options**, click the **>** scroll arrow until the LAN tab is visible, and then select the **LAN** tab.
+From the Launcher, select **Global Options**, if necessary click the **>** scroll arrow until the LAN tab is visible, and then select the **LAN** tab.
.. figure:: ../images/cloud_and_lan/LAN.png
- The LAN tab in the global settings
+ The LAN tab in the Global Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
diff --git a/doc/docportal/settings/misc.rst b/doc/docportal/settings/misc.rst
index 3067a879892..e538358b3a1 100644
--- a/doc/docportal/settings/misc.rst
+++ b/doc/docportal/settings/misc.rst
@@ -4,15 +4,15 @@ Miscellaneous
Use the Misc tab to change miscellaneous settings that don’t belong on any of the other tabs.
-From the Launcher, select **Options**, click the **>** scroll arrow until the Misc tab is visible, and then select the **Misc** tab.
+From the Launcher, select **Global Options**, if necessary click the **>** scroll arrow until the Misc tab is visible, and then select the **Misc** tab.
-.. figure:: ../images/settings/misc.png
+.. figure:: ../images/settings/misc.jpg
- The Misc tab in the global settings.
+ The Misc tab in the Global Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
-,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,
.. _theme:
@@ -71,3 +71,8 @@ Ask for confirmation on exit
If ticked, a confirmation dialog appears when you choose **Quit** or **Return to Launcher** from the Global Main Menu.
*confirm_exit*
+
+.. _updateicons:
+
+Update Icons
+ Downloads updated artwork for game icons. The Icon Path must be set on the :doc:`../settings/paths` tab. ScummVM comes preloaded with the icons for all the freeware games on the `ScummVM Downloads page <https://www.scummvm.org/games/#games>`_ .
diff --git a/doc/docportal/settings/paths.rst b/doc/docportal/settings/paths.rst
index 1991ec1831c..2b88a2589ff 100644
--- a/doc/docportal/settings/paths.rst
+++ b/doc/docportal/settings/paths.rst
@@ -4,17 +4,18 @@ Paths
Use the Paths tab to tell ScummVM where to look for files.
+
**To change settings globally:**
- From the Launcher, select **Options**, then select the **Paths** tab.
+ From the Launcher, select **Global Options**, then select the **Paths** tab.
**To change settings for a specific game:**
- Highlight the game in the games list, select **Edit Game** then select the **Paths** tab.
+ From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. Select the **Paths** tab.
-.. figure:: ../images/settings/paths.png
+.. figure:: ../images/settings/paths.jpg
- The Paths tab in the global settings
+ The Paths tab in the Global Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
@@ -43,7 +44,15 @@ Extra Path
.. _iconspath:
-Icons Path
+Icon Path
Sets the path to the folder in which ScummVM will look for additional icons for the launcher grid view.
*iconspath*
+
+ScummVM config path:
+ Shows where the :doc:`../advanced_topics/configuration_file` is saved.
+
+Last browser path:
+ Shows the last folder accessed by the file browser. See more about the :ref:`file browser <add and play games>` here.
+
+
diff --git a/doc/docportal/use_scummvm/how_to_settings.rst b/doc/docportal/use_scummvm/how_to_settings.rst
index a05036c3e55..2975ccf921f 100644
--- a/doc/docportal/use_scummvm/how_to_settings.rst
+++ b/doc/docportal/use_scummvm/how_to_settings.rst
@@ -6,11 +6,11 @@ From the Launcher
==================
The settings are arranged by subject, on different tabs:
-:doc:`Game tab <../settings/game>` | :doc:`Engine tab <../settings/engine>` | :doc:`Graphics tab <../settings/graphics>` | :doc:`Control tab <../settings/control>` | :doc:`Keymaps tab <../settings/keymaps>` | :doc:`Audio tab <../settings/audio>` | :doc:`Volume tab <../settings/audio>` | :doc:`Midi tab <../settings/audio>` | :doc:`MT-32 tab <../settings/audio>` | :doc:`Paths tab <../settings/paths>` | :doc:`Misc tab <../settings/misc>` | :doc:`Cloud tab <../settings/cloud>` | :doc:`LAN tab <../settings/lan>` | :doc:`Accessibility tab <../settings/accessibility>`
+:doc:`Game tab <../settings/game>` | :doc:`Graphics tab <../settings/graphics>` | :doc:`Control tab <../settings/control>` | :doc:`Keymaps tab <../settings/keymaps>` | :doc:`Audio tab <../settings/audio>` | :doc:`Volume tab <../settings/audio>` | :doc:`Midi tab <../settings/audio>` | :doc:`MT-32 tab <../settings/audio>` | :doc:`Paths tab <../settings/paths>` | :doc:`Misc tab <../settings/misc>` | :doc:`Cloud tab <../settings/cloud>` | :doc:`LAN tab <../settings/lan>` | :doc:`Accessibility tab <../settings/accessibility>`
-To change a setting globally, so that it affects all games, select **Options** and then select the tab containing the setting you would like to change.
+To change a setting globally, so that it affects all games, select the **Global Options** button to open the menu, and then select the tab containing the setting you would like to change.
-To change a setting for just one game, highlight the game in the games list, then select **Edit Game** and select the tab containing the setting you would like to change. To make the game use the settings on that tab instead of the global settings tab, tick **Override global settings**.
+To change a setting for just one game, highlight the game in the games list, then select the **Game Options** button and select the tab containing the setting you would like to change. If the Launcher is in grid view, select the game and then select the gear icon in the pop-up window. To make the game use the settings in the Game Options tab instead of the Global Options tab, tick **Override global settings**.
Not all settings are available for all games; for example, where there is no MIDI soundtrack for a game, there will be no MIDI or MT-32 tabs.
diff --git a/doc/docportal/use_scummvm/taskbar_integration.rst b/doc/docportal/use_scummvm/taskbar_integration.rst
index 941573c52c6..7d83b24a69a 100644
--- a/doc/docportal/use_scummvm/taskbar_integration.rst
+++ b/doc/docportal/use_scummvm/taskbar_integration.rst
@@ -9,14 +9,13 @@ The taskbar integration has several features:
- Shows a progress bar when doing a mass add of games, and shows the number of games found at the end (Windows, macOS and Linux).
- Shows an error state in the taskbar if an error occurs when running a game (Windows only).
-.. _iconspath:
Setting up the icon overlay
================================
Icons for many games can be found on our `Github repository <https://github.com/scummvm/scummvm-icons>`__.
-Place the icons in a folder, and either change the *iconspath* in the :doc:`configuration file <../advanced_topics/configuration_file>` to point to this folder, or add the folder to the :ref:`Extra Path <extra>` on the Paths settings tab.
+Place the icons in a folder, and change either the :ref:`Icon Path <iconspath>` or the :ref:`Extra Path <extra>` to point to this folder.
The icon files must be ICO files for Windows, or PNG files for macOS. They must follow one of these naming conventions, where xxx is the file extension:
diff --git a/doc/docportal/use_scummvm/the_launcher.rst b/doc/docportal/use_scummvm/the_launcher.rst
index 58391b9f510..cc067299982 100755
--- a/doc/docportal/use_scummvm/the_launcher.rst
+++ b/doc/docportal/use_scummvm/the_launcher.rst
@@ -5,17 +5,28 @@ Understanding the interface
The Launcher
===============
-The main ScummVM window is called the Launcher. The Launcher opens whenever you start ScummVM, unless you launch a game directly from the command line.
+The main ScummVM window is called the Launcher. The Launcher opens whenever you start ScummVM, unless you launch a game directly from the command line. Use the buttons on the bottom left of the screen to toggle between list and grid view.
-.. figure:: ../images/Launcher/launcher.png
+.. figure:: ../images/Launcher/launcher_list.jpg
- The Launcher, with labels for each GUI element.
+ The Launcher in list view.
+
+.. figure:: ../images/Launcher/launcher_grid.jpg
+
+ The Launcher in grid view.
The games list
********************
-The pane on the left is the games list, which lists all the games that have been added to ScummVM. The games list usually offers some additional information about each game, such as original platform and language. To highlight any game on the list, type the first letter(s) of its title, or click on it.
+The pane on the left, when the Launcher is in list view, shows the games list, which shows all the games that have been added to ScummVM. The games list usually offers some additional information about each game, such as original platform and language. To highlight any game on the list, type the first letter(s) of its title, or click on it.
+
+In grid view, all game icons are in the pane below the buttons, and show the game artwork. See :ref:`Update Icons <updateicons>` for information on how to update these. Use the **Icons per row** slider at the bottom of the page to change the size of the icons. Click on a game to select it. Click on the play icon in the pop-up menu to start the game, the gear icon to open the Game Options menu, or the export icon to load a saved game.
+
+.. figure:: ../images/Launcher/launcher_popup.jpg
+
+ Game pop-up menu in grid view
+
.. _search_box:
@@ -26,17 +37,29 @@ The search box lets you filter the games list. It is located at the top of the p
There are many ways to filter games. For example, you can type "Monkey Island" to locate all "Monkey Island" games on the list, or you can type "lang:de" to find German games. For a comprehensive look at how to use the search box, check out our :doc:`../advanced_topics/understand_search_box` guide.
+The grouping menu
+******************
+
+.. _group:
+
+To the right of the search box is the grouping menu. Use this menu to group games in alphabetical order, or by engine, series, publisher, language or platform. Hide or show groups of games by clicking on the black arrow to the left of each group heading.
+
+.. figure:: ../images/Launcher/launcher_group.jpg
+
+ The grouping menu.
+
+
The buttons
************************
-To the right of the games list there are a number of buttons. Their functions are as follows:
+To the right of the games list in list view, or above the games list in grid view, there are a number of buttons. Their functions are as follows:
-Start
-^^^^^^^^
+Start (list view only)
+^^^^^^^^^^^^^^^^^^^^^^^
Launches the highlighted game.
-Load
-^^^^^^^
+Load (list view only)
+^^^^^^^^^^^^^^^^^^^^^
Opens the load game window, from which you can go to a saved game without having to start the game first.
@@ -49,8 +72,8 @@ Opens a file browser. To add a game, select a folder containing game files.
See the :doc:`add_play_games` page.
-Edit Game
-^^^^^^^^^^^^
+Game Options (list view only)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Opens the game settings window. This window also opens whenever a game is added to the games list in the Launcher.
@@ -63,8 +86,8 @@ Remove Game
Removes the highlighted game from the list. This does not remove any saved games, so if you add a game to the games list again, you are able to resume where you left off.
-Options
-^^^^^^^^^^^
+Global Options
+^^^^^^^^^^^^^^^^^^^^
Opens the global settings window. Use this window to define global game settings, as well as change a number of the ScummVM Launcher settings. For more information, see the :doc:`../use_scummvm/how_to_settings` page.
Commit: 6bd75d08103459aaf3153851fd6d333acf3d97d7
https://github.com/scummvm/scummvm/commit/6bd75d08103459aaf3153851fd6d333acf3d97d7
Author: cadihowley (cadihowley at gmail.com)
Date: 2022-07-11T00:59:01+01:00
Commit Message:
DOCS: updates all screenshots
Changed paths:
A doc/docportal/images/Launcher/launcher_grid.png
A doc/docportal/images/Launcher/launcher_group.png
A doc/docportal/images/Launcher/launcher_group_grid.png
A doc/docportal/images/Launcher/launcher_list.png
A doc/docportal/images/Launcher/launcher_list_group.png
A doc/docportal/images/Launcher/launcher_popup.png
A doc/docportal/images/Launcher/load_game_grid.png
A doc/docportal/images/Launcher/save_game_grid.png
A doc/docportal/images/Launcher/save_game_grid_desc.png
A doc/docportal/images/cloud_and_lan/LAN_server_running.png
A doc/docportal/images/settings/game.png
A doc/docportal/images/settings/update_icons.png
R doc/docportal/images/Launcher/edit_game.png
R doc/docportal/images/Launcher/gmm_help.png
R doc/docportal/images/Launcher/gmm_load_save.png
R doc/docportal/images/Launcher/launcher_grid.jpg
R doc/docportal/images/Launcher/launcher_group.jpg
R doc/docportal/images/Launcher/launcher_list.jpg
R doc/docportal/images/Launcher/launcher_popup.jpg
R doc/docportal/images/Launcher/load_game_tile.png
R doc/docportal/images/Launcher/options.png
R doc/docportal/images/Launcher/quicksearch.png
R doc/docportal/images/Launcher/remove_game.png
R doc/docportal/images/Launcher/save_game_tile.png
R doc/docportal/images/Launcher/save_game_tile_desc.png
R doc/docportal/images/Launcher/the_launcher.png
R doc/docportal/images/cloud_and_lan/lan_server_running.png
R doc/docportal/images/settings/engine.png
R doc/docportal/images/settings/game.jpg
R doc/docportal/images/settings/graphics_game.png
R doc/docportal/images/settings/misc.jpg
R doc/docportal/images/settings/paths.jpg
doc/docportal/images/Launcher/add_game.png
doc/docportal/images/Launcher/choose_game_directory.png
doc/docportal/images/Launcher/game_settings.png
doc/docportal/images/Launcher/gmm.png
doc/docportal/images/Launcher/gmm_options_audio.png
doc/docportal/images/Launcher/gmm_options_keymaps.png
doc/docportal/images/Launcher/gmm_save.png
doc/docportal/images/Launcher/load_game_list.png
doc/docportal/images/Launcher/mass_add.png
doc/docportal/images/Launcher/mass_add_confirm.png
doc/docportal/images/Launcher/mass_add_success.png
doc/docportal/images/Launcher/save_game_list.png
doc/docportal/images/Launcher/start_game.png
doc/docportal/images/cloud_and_lan/LAN.png
doc/docportal/images/cloud_and_lan/LAN_server.png
doc/docportal/images/cloud_and_lan/LAN_server_new.png
doc/docportal/images/cloud_and_lan/LAN_server_upload.png
doc/docportal/images/cloud_and_lan/cloud_code.png
doc/docportal/images/cloud_and_lan/cloud_connect.png
doc/docportal/images/cloud_and_lan/cloud_enable.png
doc/docportal/images/cloud_and_lan/cloud_storage.png
doc/docportal/images/settings/MIDI.png
doc/docportal/images/settings/MIDI_game.png
doc/docportal/images/settings/MT32.png
doc/docportal/images/settings/MT32_game.png
doc/docportal/images/settings/accessibility.png
doc/docportal/images/settings/audio.png
doc/docportal/images/settings/audio_game.png
doc/docportal/images/settings/cloud.png
doc/docportal/images/settings/control.png
doc/docportal/images/settings/fluidsynth.png
doc/docportal/images/settings/graphics.png
doc/docportal/images/settings/keymaps.png
doc/docportal/images/settings/keymaps_dropdown.png
doc/docportal/images/settings/misc.png
doc/docportal/images/settings/paths.png
doc/docportal/images/settings/volume.png
doc/docportal/images/settings/volume_game.png
doc/docportal/settings/game.rst
doc/docportal/settings/graphics.rst
doc/docportal/settings/misc.rst
doc/docportal/settings/paths.rst
doc/docportal/use_scummvm/LAN.rst
doc/docportal/use_scummvm/save_load_games.rst
doc/docportal/use_scummvm/the_launcher.rst
diff --git a/doc/docportal/images/Launcher/add_game.png b/doc/docportal/images/Launcher/add_game.png
old mode 100644
new mode 100755
index f45f342cf73..56189ad6a20
Binary files a/doc/docportal/images/Launcher/add_game.png and b/doc/docportal/images/Launcher/add_game.png differ
diff --git a/doc/docportal/images/Launcher/choose_game_directory.png b/doc/docportal/images/Launcher/choose_game_directory.png
old mode 100644
new mode 100755
index ff30edd2ad5..4187a3e9850
Binary files a/doc/docportal/images/Launcher/choose_game_directory.png and b/doc/docportal/images/Launcher/choose_game_directory.png differ
diff --git a/doc/docportal/images/Launcher/edit_game.png b/doc/docportal/images/Launcher/edit_game.png
deleted file mode 100644
index 7e253807eea..00000000000
Binary files a/doc/docportal/images/Launcher/edit_game.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/game_settings.png b/doc/docportal/images/Launcher/game_settings.png
old mode 100644
new mode 100755
index 65ab29e8087..4e6f15e91b6
Binary files a/doc/docportal/images/Launcher/game_settings.png and b/doc/docportal/images/Launcher/game_settings.png differ
diff --git a/doc/docportal/images/Launcher/gmm.png b/doc/docportal/images/Launcher/gmm.png
old mode 100644
new mode 100755
index e638e6fb5ce..cd8b479f95d
Binary files a/doc/docportal/images/Launcher/gmm.png and b/doc/docportal/images/Launcher/gmm.png differ
diff --git a/doc/docportal/images/Launcher/gmm_help.png b/doc/docportal/images/Launcher/gmm_help.png
deleted file mode 100644
index ecb7d9731a7..00000000000
Binary files a/doc/docportal/images/Launcher/gmm_help.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/gmm_load_save.png b/doc/docportal/images/Launcher/gmm_load_save.png
deleted file mode 100644
index d77445b7557..00000000000
Binary files a/doc/docportal/images/Launcher/gmm_load_save.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/gmm_options_audio.png b/doc/docportal/images/Launcher/gmm_options_audio.png
old mode 100644
new mode 100755
index 2ccc187719b..cce0a609b26
Binary files a/doc/docportal/images/Launcher/gmm_options_audio.png and b/doc/docportal/images/Launcher/gmm_options_audio.png differ
diff --git a/doc/docportal/images/Launcher/gmm_options_keymaps.png b/doc/docportal/images/Launcher/gmm_options_keymaps.png
old mode 100644
new mode 100755
index 5ff2313361f..1a03212fb6e
Binary files a/doc/docportal/images/Launcher/gmm_options_keymaps.png and b/doc/docportal/images/Launcher/gmm_options_keymaps.png differ
diff --git a/doc/docportal/images/Launcher/gmm_save.png b/doc/docportal/images/Launcher/gmm_save.png
old mode 100644
new mode 100755
index bd85af69064..83dd20f067e
Binary files a/doc/docportal/images/Launcher/gmm_save.png and b/doc/docportal/images/Launcher/gmm_save.png differ
diff --git a/doc/docportal/images/Launcher/launcher_grid.jpg b/doc/docportal/images/Launcher/launcher_grid.jpg
deleted file mode 100644
index b23dd134b56..00000000000
Binary files a/doc/docportal/images/Launcher/launcher_grid.jpg and /dev/null differ
diff --git a/doc/docportal/images/Launcher/launcher_grid.png b/doc/docportal/images/Launcher/launcher_grid.png
new file mode 100755
index 00000000000..10d7694c93d
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_grid.png differ
diff --git a/doc/docportal/images/Launcher/launcher_group.jpg b/doc/docportal/images/Launcher/launcher_group.jpg
deleted file mode 100644
index 7b8db64ad2b..00000000000
Binary files a/doc/docportal/images/Launcher/launcher_group.jpg and /dev/null differ
diff --git a/doc/docportal/images/Launcher/launcher_group.png b/doc/docportal/images/Launcher/launcher_group.png
new file mode 100755
index 00000000000..0cb1a86e891
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_group.png differ
diff --git a/doc/docportal/images/Launcher/launcher_group_grid.png b/doc/docportal/images/Launcher/launcher_group_grid.png
new file mode 100755
index 00000000000..9f23c711740
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_group_grid.png differ
diff --git a/doc/docportal/images/Launcher/launcher_list.jpg b/doc/docportal/images/Launcher/launcher_list.jpg
deleted file mode 100644
index 0083ff169f2..00000000000
Binary files a/doc/docportal/images/Launcher/launcher_list.jpg and /dev/null differ
diff --git a/doc/docportal/images/Launcher/launcher_list.png b/doc/docportal/images/Launcher/launcher_list.png
new file mode 100755
index 00000000000..7d1af40b84b
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_list.png differ
diff --git a/doc/docportal/images/Launcher/launcher_list_group.png b/doc/docportal/images/Launcher/launcher_list_group.png
new file mode 100755
index 00000000000..748039213a8
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_list_group.png differ
diff --git a/doc/docportal/images/Launcher/launcher_popup.jpg b/doc/docportal/images/Launcher/launcher_popup.jpg
deleted file mode 100644
index 036083fac42..00000000000
Binary files a/doc/docportal/images/Launcher/launcher_popup.jpg and /dev/null differ
diff --git a/doc/docportal/images/Launcher/launcher_popup.png b/doc/docportal/images/Launcher/launcher_popup.png
new file mode 100755
index 00000000000..b6add32f0ae
Binary files /dev/null and b/doc/docportal/images/Launcher/launcher_popup.png differ
diff --git a/doc/docportal/images/Launcher/load_game_grid.png b/doc/docportal/images/Launcher/load_game_grid.png
new file mode 100755
index 00000000000..2123f1a8633
Binary files /dev/null and b/doc/docportal/images/Launcher/load_game_grid.png differ
diff --git a/doc/docportal/images/Launcher/load_game_list.png b/doc/docportal/images/Launcher/load_game_list.png
old mode 100644
new mode 100755
index 9c213688d5f..491f8c52279
Binary files a/doc/docportal/images/Launcher/load_game_list.png and b/doc/docportal/images/Launcher/load_game_list.png differ
diff --git a/doc/docportal/images/Launcher/load_game_tile.png b/doc/docportal/images/Launcher/load_game_tile.png
deleted file mode 100644
index d8381d32ace..00000000000
Binary files a/doc/docportal/images/Launcher/load_game_tile.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/mass_add.png b/doc/docportal/images/Launcher/mass_add.png
old mode 100644
new mode 100755
index 7d16482da6d..23f834a5e09
Binary files a/doc/docportal/images/Launcher/mass_add.png and b/doc/docportal/images/Launcher/mass_add.png differ
diff --git a/doc/docportal/images/Launcher/mass_add_confirm.png b/doc/docportal/images/Launcher/mass_add_confirm.png
old mode 100644
new mode 100755
index 1c4687dbb93..fea201e1169
Binary files a/doc/docportal/images/Launcher/mass_add_confirm.png and b/doc/docportal/images/Launcher/mass_add_confirm.png differ
diff --git a/doc/docportal/images/Launcher/mass_add_success.png b/doc/docportal/images/Launcher/mass_add_success.png
old mode 100644
new mode 100755
index 817355da46e..4054e06ecff
Binary files a/doc/docportal/images/Launcher/mass_add_success.png and b/doc/docportal/images/Launcher/mass_add_success.png differ
diff --git a/doc/docportal/images/Launcher/options.png b/doc/docportal/images/Launcher/options.png
deleted file mode 100644
index 0ba527c9afc..00000000000
Binary files a/doc/docportal/images/Launcher/options.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/quicksearch.png b/doc/docportal/images/Launcher/quicksearch.png
deleted file mode 100644
index 7db9507cf0f..00000000000
Binary files a/doc/docportal/images/Launcher/quicksearch.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/remove_game.png b/doc/docportal/images/Launcher/remove_game.png
deleted file mode 100644
index 18ec67027b0..00000000000
Binary files a/doc/docportal/images/Launcher/remove_game.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/save_game_grid.png b/doc/docportal/images/Launcher/save_game_grid.png
new file mode 100755
index 00000000000..a85ade0b32c
Binary files /dev/null and b/doc/docportal/images/Launcher/save_game_grid.png differ
diff --git a/doc/docportal/images/Launcher/save_game_grid_desc.png b/doc/docportal/images/Launcher/save_game_grid_desc.png
new file mode 100755
index 00000000000..1f71cb2b3c7
Binary files /dev/null and b/doc/docportal/images/Launcher/save_game_grid_desc.png differ
diff --git a/doc/docportal/images/Launcher/save_game_list.png b/doc/docportal/images/Launcher/save_game_list.png
old mode 100644
new mode 100755
index c9f987ecd89..bfe4a52b805
Binary files a/doc/docportal/images/Launcher/save_game_list.png and b/doc/docportal/images/Launcher/save_game_list.png differ
diff --git a/doc/docportal/images/Launcher/save_game_tile.png b/doc/docportal/images/Launcher/save_game_tile.png
deleted file mode 100644
index 31abc8d91a1..00000000000
Binary files a/doc/docportal/images/Launcher/save_game_tile.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/save_game_tile_desc.png b/doc/docportal/images/Launcher/save_game_tile_desc.png
deleted file mode 100644
index b2425b0ad12..00000000000
Binary files a/doc/docportal/images/Launcher/save_game_tile_desc.png and /dev/null differ
diff --git a/doc/docportal/images/Launcher/start_game.png b/doc/docportal/images/Launcher/start_game.png
old mode 100644
new mode 100755
index 89e60c4b475..371d0678a7e
Binary files a/doc/docportal/images/Launcher/start_game.png and b/doc/docportal/images/Launcher/start_game.png differ
diff --git a/doc/docportal/images/Launcher/the_launcher.png b/doc/docportal/images/Launcher/the_launcher.png
deleted file mode 100644
index db1386f94cf..00000000000
Binary files a/doc/docportal/images/Launcher/the_launcher.png and /dev/null differ
diff --git a/doc/docportal/images/cloud_and_lan/LAN.png b/doc/docportal/images/cloud_and_lan/LAN.png
old mode 100644
new mode 100755
index 527712f588b..f9d3f239d28
Binary files a/doc/docportal/images/cloud_and_lan/LAN.png and b/doc/docportal/images/cloud_and_lan/LAN.png differ
diff --git a/doc/docportal/images/cloud_and_lan/LAN_server.png b/doc/docportal/images/cloud_and_lan/LAN_server.png
old mode 100644
new mode 100755
index b1a9186b4ff..dc771d6f56a
Binary files a/doc/docportal/images/cloud_and_lan/LAN_server.png and b/doc/docportal/images/cloud_and_lan/LAN_server.png differ
diff --git a/doc/docportal/images/cloud_and_lan/LAN_server_new.png b/doc/docportal/images/cloud_and_lan/LAN_server_new.png
old mode 100644
new mode 100755
index c9ef83c69ea..f51a13f80db
Binary files a/doc/docportal/images/cloud_and_lan/LAN_server_new.png and b/doc/docportal/images/cloud_and_lan/LAN_server_new.png differ
diff --git a/doc/docportal/images/cloud_and_lan/LAN_server_running.png b/doc/docportal/images/cloud_and_lan/LAN_server_running.png
new file mode 100755
index 00000000000..4199ed0c325
Binary files /dev/null and b/doc/docportal/images/cloud_and_lan/LAN_server_running.png differ
diff --git a/doc/docportal/images/cloud_and_lan/LAN_server_upload.png b/doc/docportal/images/cloud_and_lan/LAN_server_upload.png
old mode 100644
new mode 100755
index c3487404051..91c4ec07722
Binary files a/doc/docportal/images/cloud_and_lan/LAN_server_upload.png and b/doc/docportal/images/cloud_and_lan/LAN_server_upload.png differ
diff --git a/doc/docportal/images/cloud_and_lan/cloud_code.png b/doc/docportal/images/cloud_and_lan/cloud_code.png
old mode 100644
new mode 100755
index fd689d67379..6b0079f3987
Binary files a/doc/docportal/images/cloud_and_lan/cloud_code.png and b/doc/docportal/images/cloud_and_lan/cloud_code.png differ
diff --git a/doc/docportal/images/cloud_and_lan/cloud_connect.png b/doc/docportal/images/cloud_and_lan/cloud_connect.png
old mode 100644
new mode 100755
index 34af7747cc5..f0e3344fb0b
Binary files a/doc/docportal/images/cloud_and_lan/cloud_connect.png and b/doc/docportal/images/cloud_and_lan/cloud_connect.png differ
diff --git a/doc/docportal/images/cloud_and_lan/cloud_enable.png b/doc/docportal/images/cloud_and_lan/cloud_enable.png
old mode 100644
new mode 100755
index 6ecad8ce8c3..c4adbe7f0bd
Binary files a/doc/docportal/images/cloud_and_lan/cloud_enable.png and b/doc/docportal/images/cloud_and_lan/cloud_enable.png differ
diff --git a/doc/docportal/images/cloud_and_lan/cloud_storage.png b/doc/docportal/images/cloud_and_lan/cloud_storage.png
old mode 100644
new mode 100755
index 16baaa68376..7e610de2100
Binary files a/doc/docportal/images/cloud_and_lan/cloud_storage.png and b/doc/docportal/images/cloud_and_lan/cloud_storage.png differ
diff --git a/doc/docportal/images/cloud_and_lan/lan_server_running.png b/doc/docportal/images/cloud_and_lan/lan_server_running.png
deleted file mode 100644
index 82b3d4e619c..00000000000
Binary files a/doc/docportal/images/cloud_and_lan/lan_server_running.png and /dev/null differ
diff --git a/doc/docportal/images/settings/MIDI.png b/doc/docportal/images/settings/MIDI.png
old mode 100644
new mode 100755
index d3706e4846c..5ffd63b6a10
Binary files a/doc/docportal/images/settings/MIDI.png and b/doc/docportal/images/settings/MIDI.png differ
diff --git a/doc/docportal/images/settings/MIDI_game.png b/doc/docportal/images/settings/MIDI_game.png
old mode 100644
new mode 100755
index f50415fb472..bea39d40d0f
Binary files a/doc/docportal/images/settings/MIDI_game.png and b/doc/docportal/images/settings/MIDI_game.png differ
diff --git a/doc/docportal/images/settings/MT32.png b/doc/docportal/images/settings/MT32.png
old mode 100644
new mode 100755
index 77bb9f0eb63..bc066b6a010
Binary files a/doc/docportal/images/settings/MT32.png and b/doc/docportal/images/settings/MT32.png differ
diff --git a/doc/docportal/images/settings/MT32_game.png b/doc/docportal/images/settings/MT32_game.png
old mode 100644
new mode 100755
index de9f5c293a8..0eb6c5b50df
Binary files a/doc/docportal/images/settings/MT32_game.png and b/doc/docportal/images/settings/MT32_game.png differ
diff --git a/doc/docportal/images/settings/accessibility.png b/doc/docportal/images/settings/accessibility.png
old mode 100644
new mode 100755
index c077716f138..f622a9b7d24
Binary files a/doc/docportal/images/settings/accessibility.png and b/doc/docportal/images/settings/accessibility.png differ
diff --git a/doc/docportal/images/settings/audio.png b/doc/docportal/images/settings/audio.png
old mode 100644
new mode 100755
index cc6c3e10bcb..259aa0a278a
Binary files a/doc/docportal/images/settings/audio.png and b/doc/docportal/images/settings/audio.png differ
diff --git a/doc/docportal/images/settings/audio_game.png b/doc/docportal/images/settings/audio_game.png
old mode 100644
new mode 100755
index 10d8cd949bf..1117bf20dfa
Binary files a/doc/docportal/images/settings/audio_game.png and b/doc/docportal/images/settings/audio_game.png differ
diff --git a/doc/docportal/images/settings/cloud.png b/doc/docportal/images/settings/cloud.png
old mode 100644
new mode 100755
index e9ad46bd8eb..b7bc35c1212
Binary files a/doc/docportal/images/settings/cloud.png and b/doc/docportal/images/settings/cloud.png differ
diff --git a/doc/docportal/images/settings/control.png b/doc/docportal/images/settings/control.png
old mode 100644
new mode 100755
index eed47c76ab2..2946739c0d8
Binary files a/doc/docportal/images/settings/control.png and b/doc/docportal/images/settings/control.png differ
diff --git a/doc/docportal/images/settings/engine.png b/doc/docportal/images/settings/engine.png
deleted file mode 100644
index 3eb4fb88622..00000000000
Binary files a/doc/docportal/images/settings/engine.png and /dev/null differ
diff --git a/doc/docportal/images/settings/fluidsynth.png b/doc/docportal/images/settings/fluidsynth.png
old mode 100644
new mode 100755
index 11f27093b60..103825386b1
Binary files a/doc/docportal/images/settings/fluidsynth.png and b/doc/docportal/images/settings/fluidsynth.png differ
diff --git a/doc/docportal/images/settings/game.jpg b/doc/docportal/images/settings/game.jpg
deleted file mode 100644
index b6f82dce8eb..00000000000
Binary files a/doc/docportal/images/settings/game.jpg and /dev/null differ
diff --git a/doc/docportal/images/settings/game.png b/doc/docportal/images/settings/game.png
new file mode 100755
index 00000000000..838b767f7f8
Binary files /dev/null and b/doc/docportal/images/settings/game.png differ
diff --git a/doc/docportal/images/settings/graphics.png b/doc/docportal/images/settings/graphics.png
old mode 100644
new mode 100755
index ed06f6ead74..a250c09f242
Binary files a/doc/docportal/images/settings/graphics.png and b/doc/docportal/images/settings/graphics.png differ
diff --git a/doc/docportal/images/settings/graphics_game.png b/doc/docportal/images/settings/graphics_game.png
deleted file mode 100644
index f29197f2881..00000000000
Binary files a/doc/docportal/images/settings/graphics_game.png and /dev/null differ
diff --git a/doc/docportal/images/settings/keymaps.png b/doc/docportal/images/settings/keymaps.png
old mode 100644
new mode 100755
index 98446ec27d0..5cfb36a4884
Binary files a/doc/docportal/images/settings/keymaps.png and b/doc/docportal/images/settings/keymaps.png differ
diff --git a/doc/docportal/images/settings/keymaps_dropdown.png b/doc/docportal/images/settings/keymaps_dropdown.png
old mode 100644
new mode 100755
index 93a6ba00ec6..46d2c558b18
Binary files a/doc/docportal/images/settings/keymaps_dropdown.png and b/doc/docportal/images/settings/keymaps_dropdown.png differ
diff --git a/doc/docportal/images/settings/misc.jpg b/doc/docportal/images/settings/misc.jpg
deleted file mode 100644
index 811fb35aa7a..00000000000
Binary files a/doc/docportal/images/settings/misc.jpg and /dev/null differ
diff --git a/doc/docportal/images/settings/misc.png b/doc/docportal/images/settings/misc.png
old mode 100644
new mode 100755
index 24bd02f126b..46c14e6e5b5
Binary files a/doc/docportal/images/settings/misc.png and b/doc/docportal/images/settings/misc.png differ
diff --git a/doc/docportal/images/settings/paths.jpg b/doc/docportal/images/settings/paths.jpg
deleted file mode 100644
index 3ae62ea4601..00000000000
Binary files a/doc/docportal/images/settings/paths.jpg and /dev/null differ
diff --git a/doc/docportal/images/settings/paths.png b/doc/docportal/images/settings/paths.png
old mode 100644
new mode 100755
index b626140f8f6..0a245f62edc
Binary files a/doc/docportal/images/settings/paths.png and b/doc/docportal/images/settings/paths.png differ
diff --git a/doc/docportal/images/settings/update_icons.png b/doc/docportal/images/settings/update_icons.png
new file mode 100755
index 00000000000..cb1d5a75a79
Binary files /dev/null and b/doc/docportal/images/settings/update_icons.png differ
diff --git a/doc/docportal/images/settings/volume.png b/doc/docportal/images/settings/volume.png
old mode 100644
new mode 100755
index 3ce9d8f3986..a960d344f7f
Binary files a/doc/docportal/images/settings/volume.png and b/doc/docportal/images/settings/volume.png differ
diff --git a/doc/docportal/images/settings/volume_game.png b/doc/docportal/images/settings/volume_game.png
old mode 100644
new mode 100755
index 4d535e6ead2..9342aebc1a2
Binary files a/doc/docportal/images/settings/volume_game.png and b/doc/docportal/images/settings/volume_game.png differ
diff --git a/doc/docportal/settings/game.rst b/doc/docportal/settings/game.rst
index 10436bc0dec..2a094c0a14b 100644
--- a/doc/docportal/settings/game.rst
+++ b/doc/docportal/settings/game.rst
@@ -8,7 +8,7 @@ identified by ScummVM.
From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. The menu opens on the **Game** tab.
-.. figure:: ../images/settings/game.jpg
+.. figure:: ../images/settings/game.png
The Game tab in the Game Options menu
diff --git a/doc/docportal/settings/graphics.rst b/doc/docportal/settings/graphics.rst
index a2699a25bbf..e4e16d49587 100644
--- a/doc/docportal/settings/graphics.rst
+++ b/doc/docportal/settings/graphics.rst
@@ -17,7 +17,7 @@ For a comprehensive look at how to use these settings, check out our :doc:`../ad
.. figure:: ../images/settings/graphics.png
- The Graphics tab in the global settings
+ The Graphics tab in the Global Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
diff --git a/doc/docportal/settings/misc.rst b/doc/docportal/settings/misc.rst
index e538358b3a1..f81e39ebca5 100644
--- a/doc/docportal/settings/misc.rst
+++ b/doc/docportal/settings/misc.rst
@@ -6,13 +6,13 @@ Use the Misc tab to change miscellaneous settings that don’t belong on any of
From the Launcher, select **Global Options**, if necessary click the **>** scroll arrow until the Misc tab is visible, and then select the **Misc** tab.
-.. figure:: ../images/settings/misc.jpg
+.. figure:: ../images/settings/misc.png
The Misc tab in the Global Options menu
All settings can also be changed in the :doc:`../advanced_topics/configuration_file`. The configuration key is listed in italics after each setting description.
-,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,
.. _theme:
@@ -76,3 +76,6 @@ Ask for confirmation on exit
Update Icons
Downloads updated artwork for game icons. The Icon Path must be set on the :doc:`../settings/paths` tab. ScummVM comes preloaded with the icons for all the freeware games on the `ScummVM Downloads page <https://www.scummvm.org/games/#games>`_ .
+
+Enable Discord Integration
+ Use this option to automatically check for updates to ScummVM. Click the Check now button to manually check for updates.
\ No newline at end of file
diff --git a/doc/docportal/settings/paths.rst b/doc/docportal/settings/paths.rst
index 2b88a2589ff..e7d06bc10eb 100644
--- a/doc/docportal/settings/paths.rst
+++ b/doc/docportal/settings/paths.rst
@@ -13,7 +13,7 @@ Use the Paths tab to tell ScummVM where to look for files.
From the Launcher, highlight the game in the games list, and select the **Game Options** button. If the Launcher is in grid view, select the game and then select the gear icon in the popup window. Select the **Paths** tab.
-.. figure:: ../images/settings/paths.jpg
+.. figure:: ../images/settings/paths.png
The Paths tab in the Global Options menu
diff --git a/doc/docportal/use_scummvm/LAN.rst b/doc/docportal/use_scummvm/LAN.rst
index 7f451ca6daa..8c1847572a2 100644
--- a/doc/docportal/use_scummvm/LAN.rst
+++ b/doc/docportal/use_scummvm/LAN.rst
@@ -18,7 +18,7 @@ From the Launcher, select **Options**, click the **>** scroll arrow until the LA
Click **Run server** to start the server.
-.. figure:: ../images/cloud_and_lan/lan_server_running.png
+.. figure:: ../images/cloud_and_lan/LAN_server_running.png
The LAN tab, with the server running.
@@ -34,13 +34,13 @@ To create a new directory, click **Create Directory**.
.. figure:: ../images/cloud_and_lan/LAN_server_new.png
- Create a new directory.
+ Create a new directory
To upload files, click **Upload Files** and select files from the system file browser.
.. figure:: ../images/cloud_and_lan/LAN_server_upload.png
- Upload files.
+ Upload files
To change which files are accessible on the web server, set the **/root/ Path** to the directory containing the files you wish to access. You can access anything inside that directory, but you cannot access its parent directory. On some platforms ScummVM automatically sets the **/root/ Path**, but on some other platforms you need to configure this manually before running the web server for the first time.
diff --git a/doc/docportal/use_scummvm/save_load_games.rst b/doc/docportal/use_scummvm/save_load_games.rst
index fb8ff900e29..69df25ea696 100644
--- a/doc/docportal/use_scummvm/save_load_games.rst
+++ b/doc/docportal/use_scummvm/save_load_games.rst
@@ -18,17 +18,17 @@ When you're playing a game and you're ready to save, press :kbd:`Ctrl+F5` (:kbd:
The Global Main Menu (GMM).
-There are two views: list view and tile view. Click the list and tile icons at the bottom left of the window to toggle between the two.
+There are two views: list view and grid view. Click the list and grid icons at the bottom left of the window to toggle between the two.
In tile view, click on the **New Save** tile. Enter a description for the game, then click **OK**.
-.. figure:: ../images/Launcher/save_game_tile.png
+.. figure:: ../images/Launcher/save_game_grid.png
- Saving a game, tile view.
+ Saving a game, grid view.
-.. figure:: ../images/Launcher/save_game_tile_desc.png
+.. figure:: ../images/Launcher/save_game_grid_desc.png
- Save game decription, tile view.
+ Save game decription, grid view.
In list view, click on a slot to save the game to that slot. Enter a description for the game, then click **Save**.
@@ -97,11 +97,11 @@ To delete a saved game, highlight the saved game and click **Delete**.
Loading a game, list view.
-In tile view, each tile shows a screenshot of the saved state, as well as a description and a save slot number. Click on the tile to load that saved game.
+In grid view, each tile shows a screenshot of the saved state, as well as a description and a save slot number. Click on the tile to load that saved game.
-.. figure:: ../images/Launcher/load_game_tile.png
+.. figure:: ../images/Launcher/load_game_grid.png
- Loading a game, tile view.
+ Loading a game, grid view.
.. _savelocation:
diff --git a/doc/docportal/use_scummvm/the_launcher.rst b/doc/docportal/use_scummvm/the_launcher.rst
index cc067299982..7b1d8fdfeb5 100755
--- a/doc/docportal/use_scummvm/the_launcher.rst
+++ b/doc/docportal/use_scummvm/the_launcher.rst
@@ -7,11 +7,11 @@ The Launcher
The main ScummVM window is called the Launcher. The Launcher opens whenever you start ScummVM, unless you launch a game directly from the command line. Use the buttons on the bottom left of the screen to toggle between list and grid view.
-.. figure:: ../images/Launcher/launcher_list.jpg
+.. figure:: ../images/Launcher/launcher_list.png
The Launcher in list view.
-.. figure:: ../images/Launcher/launcher_grid.jpg
+.. figure:: ../images/Launcher/launcher_grid.png
The Launcher in grid view.
@@ -23,7 +23,7 @@ The pane on the left, when the Launcher is in list view, shows the games list, w
In grid view, all game icons are in the pane below the buttons, and show the game artwork. See :ref:`Update Icons <updateicons>` for information on how to update these. Use the **Icons per row** slider at the bottom of the page to change the size of the icons. Click on a game to select it. Click on the play icon in the pop-up menu to start the game, the gear icon to open the Game Options menu, or the export icon to load a saved game.
-.. figure:: ../images/Launcher/launcher_popup.jpg
+.. figure:: ../images/Launcher/launcher_popup.png
Game pop-up menu in grid view
@@ -44,7 +44,7 @@ The grouping menu
To the right of the search box is the grouping menu. Use this menu to group games in alphabetical order, or by engine, series, publisher, language or platform. Hide or show groups of games by clicking on the black arrow to the left of each group heading.
-.. figure:: ../images/Launcher/launcher_group.jpg
+.. figure:: ../images/Launcher/launcher_group.png
The grouping menu.
@@ -143,7 +143,7 @@ Displays the ScummVM **About** dialog. This is also available from the Launcher.
Help
^^^^^^
-Displays a list of keyboard shortcuts for the game.
+Displays a list of keyboard shortcuts for the game. Note that this is not available for all games; refer to the :doc:`../settings/keymaps` tab for keyboard shortcuts.
Return to Launcher
^^^^^^^^^^^^^^^^^^^^^
Commit: 95ea8057f828041c3e195f8e910709242325064f
https://github.com/scummvm/scummvm/commit/95ea8057f828041c3e195f8e910709242325064f
Author: cadihowley (cadihowley at gmail.com)
Date: 2022-07-11T00:59:01+01:00
Commit Message:
DOCS: updates to reflect new default iconspath
Changed paths:
doc/docportal/settings/misc.rst
doc/docportal/use_scummvm/taskbar_integration.rst
diff --git a/doc/docportal/settings/misc.rst b/doc/docportal/settings/misc.rst
index f81e39ebca5..1844765f12f 100644
--- a/doc/docportal/settings/misc.rst
+++ b/doc/docportal/settings/misc.rst
@@ -75,7 +75,11 @@ Ask for confirmation on exit
.. _updateicons:
Update Icons
- Downloads updated artwork for game icons. The Icon Path must be set on the :doc:`../settings/paths` tab. ScummVM comes preloaded with the icons for all the freeware games on the `ScummVM Downloads page <https://www.scummvm.org/games/#games>`_ .
+ Click on the Update Icons button to download new or updated artwork for game icons. ScummVM will scan to find applicable icons; once these have been found, click on the **Download** button in the pop up window to start the download. Click the **Hide** button to close the window and continue the download in the background. Use the **Cancel download** button to cancel the download.
+
+.. figure:: ../images/settings/update_icons.png
+
+ The Update Icons window
Enable Discord Integration
Use this option to automatically check for updates to ScummVM. Click the Check now button to manually check for updates.
\ No newline at end of file
diff --git a/doc/docportal/use_scummvm/taskbar_integration.rst b/doc/docportal/use_scummvm/taskbar_integration.rst
index 7d83b24a69a..dfd2ca93d32 100644
--- a/doc/docportal/use_scummvm/taskbar_integration.rst
+++ b/doc/docportal/use_scummvm/taskbar_integration.rst
@@ -4,18 +4,16 @@ Taskbar integration
The taskbar integration has several features:
-- Adds an overlay icon in the taskbar/dock when running a game (Windows and macOS)
-- Updates a list of recently played games that can be started from the taskbar/dock (Windows and macOS).
-- Shows a progress bar when doing a mass add of games, and shows the number of games found at the end (Windows, macOS and Linux).
-- Shows an error state in the taskbar if an error occurs when running a game (Windows only).
+ - Adds an overlay icon in the taskbar/dock when running a game (Windows and macOS)
+ - Updates a list of recently played games that can be started from the taskbar/dock (Windows and macOS).
+ - Shows a progress bar when doing a mass add of games, and shows the number of games found at the end (Windows, macOS and Linux).
+ - Shows an error state in the taskbar if an error occurs when running a game (Windows only).
Setting up the icon overlay
================================
-Icons for many games can be found on our `Github repository <https://github.com/scummvm/scummvm-icons>`__.
-
-Place the icons in a folder, and change either the :ref:`Icon Path <iconspath>` or the :ref:`Extra Path <extra>` to point to this folder.
+Currently the taskbar cannot yet use the icons .dat files that can be dowloaded from the **Global Options**. This means the icons need to be downloaded manually from our `Github repository <https://github.com/scummvm/scummvm-icons>`__. Either place these in the default :ref:`Icon Path <iconspath>` or change the Icon Path to point to the folder containing the icons.
The icon files must be ICO files for Windows, or PNG files for macOS. They must follow one of these naming conventions, where xxx is the file extension:
Commit: 913c7a05d1bcdec6b736e907949a41cafbdc9935
https://github.com/scummvm/scummvm/commit/913c7a05d1bcdec6b736e907949a41cafbdc9935
Author: cadihowley (cadihowley at gmail.com)
Date: 2022-07-11T00:59:01+01:00
Commit Message:
DOCS: edits to better reflect updated Launcher GUI
Changed paths:
doc/docportal/use_scummvm/add_play_games.rst
doc/docportal/use_scummvm/the_launcher.rst
diff --git a/doc/docportal/use_scummvm/add_play_games.rst b/doc/docportal/use_scummvm/add_play_games.rst
index e09612a22f5..ab436f5a494 100644
--- a/doc/docportal/use_scummvm/add_play_games.rst
+++ b/doc/docportal/use_scummvm/add_play_games.rst
@@ -60,16 +60,16 @@ Sometimes, ScummVM detects multiple versions of a single game. In this case, hig
If you are adding an unknown version of a game, ScummVM is not able to add the game to the games list. An error message appears to warn you that the game has not been added.
-4. The **Edit Game** dialog opens to allow configuration of various settings for the game. These can be reconfigured at any time, but for now everything should be OK at the default settings. Any settings changed here override the global settings. Click **Ok**.
+4. The **Game Options** window opens to allow configuration of various settings for the game. These can be reconfigured at any time, but for now everything should be OK at the default settings. Any settings changed here override the global settings. Click **Ok**.
.. image:: ../images/Launcher/game_settings.png
:class: with-shadow
.. note::
- The **Edit Game** dialog does not open when **Mass Add** is used.
+ The **Game Options** window does not open when **Mass Add** is used.
-6. Games are now ready to play! To play, highlight a game in the games list and click **Start**, or double-click the game in the games list.
+5. Games are now ready to play! To play, either double-click on the game in the games list, or highlight the game by clicking on it, and then click **Start**. In grid view, either double-click on a game to start it, or select the game and click the play icon in the pop-up window.
.. image:: ../images/Launcher/start_game.png
:class: with-shadow
diff --git a/doc/docportal/use_scummvm/the_launcher.rst b/doc/docportal/use_scummvm/the_launcher.rst
index 7b1d8fdfeb5..8e90352be2c 100755
--- a/doc/docportal/use_scummvm/the_launcher.rst
+++ b/doc/docportal/use_scummvm/the_launcher.rst
@@ -44,9 +44,9 @@ The grouping menu
To the right of the search box is the grouping menu. Use this menu to group games in alphabetical order, or by engine, series, publisher, language or platform. Hide or show groups of games by clicking on the black arrow to the left of each group heading.
-.. figure:: ../images/Launcher/launcher_group.png
+.. figure:: ../images/Launcher/launcher_list_group.png
- The grouping menu.
+ The grouping menu, with the Launcher in list view
The buttons
More information about the Scummvm-git-logs
mailing list