[Scummvm-git-logs] scummvm master -> a562972acb31f89623e34d0ffda8121cc4aeb544
sev-
noreply at scummvm.org
Mon Jun 26 12:05:53 UTC 2023
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:
6904e2dc45 DOCS: Update shortcut for cycling graphic scalers
bbe42d5001 DOCS: Update keymaps page for scaler scrolling
87dd0b396a DOCS: Update scaler filter shortcuts in configuration_file
1c741d6a65 DOCS: Add cycle graphic filter shortcut under Software Scalers section
a562972acb DOCS: use kbd prefix for 0 and 9 keys in shortcut
Commit: 6904e2dc45c4304eedd14b8729a2e4ecaab01b0b
https://github.com/scummvm/scummvm/commit/6904e2dc45c4304eedd14b8729a2e4ecaab01b0b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-06-26T15:05:46+03:00
Commit Message:
DOCS: Update shortcut for cycling graphic scalers
Changed paths:
doc/docportal/advanced_topics/understand_graphics.rst
doc/docportal/use_scummvm/keyboard_shortcuts.rst
diff --git a/doc/docportal/advanced_topics/understand_graphics.rst b/doc/docportal/advanced_topics/understand_graphics.rst
index 30e00bc925f..09cd8ed390a 100644
--- a/doc/docportal/advanced_topics/understand_graphics.rst
+++ b/doc/docportal/advanced_topics/understand_graphics.rst
@@ -20,8 +20,6 @@ Graphics modes
Most platforms have either one or two available graphics modes. The most common ones are OpenGL and SDL Surface.
-To switch between graphics modes, press :kbd:`Ctrl + Alt` and :kbd:`1` to :kbd:`8`.
-
OpenGL graphics mode
*************************************
diff --git a/doc/docportal/use_scummvm/keyboard_shortcuts.rst b/doc/docportal/use_scummvm/keyboard_shortcuts.rst
index 0f3f3e328ec..332128ac91f 100755
--- a/doc/docportal/use_scummvm/keyboard_shortcuts.rst
+++ b/doc/docportal/use_scummvm/keyboard_shortcuts.rst
@@ -21,7 +21,7 @@ Default shortcuts are shown in the table.
:kbd:`Ctrl+z`,Quit (other platforms)
:kbd:`Ctrl+u` ,Mutes all sounds
:kbd:`Ctrl+m` ,Toggles mouse capture
- :kbd:`Ctrl+Alt+ 1-8` ,Switches between graphics filters
+ :kbd:`Ctrl+Alt` and `9` or `0` ,Cycles forwards/backwards between graphics filters
:kbd:`Ctrl+Alt` and :kbd:`+` or :kbd:`-`,Increases/decreases the scale factor
:kbd:`Ctrl+Alt+a` ,Toggles aspect ratio correction on/off
:kbd:`Ctrl+Alt+f` ,Toggles between nearest neighbor and bilinear interpolation (graphics filtering on/off)
Commit: bbe42d5001b71eb065cc52e401095c50da863a3c
https://github.com/scummvm/scummvm/commit/bbe42d5001b71eb065cc52e401095c50da863a3c
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-06-26T15:05:46+03:00
Commit Message:
DOCS: Update keymaps page for scaler scrolling
Changed paths:
doc/docportal/settings/keymaps.rst
diff --git a/doc/docportal/settings/keymaps.rst b/doc/docportal/settings/keymaps.rst
index c726e7cc5ff..b3e4a6bea23 100644
--- a/doc/docportal/settings/keymaps.rst
+++ b/doc/docportal/settings/keymaps.rst
@@ -134,45 +134,15 @@ Increase the scale factor
Decrease the scale factor
*keymap_sdl-graphics_SCL-*
-.. _FLT1:
+.. _FLTN:
-Switch to nearest neighbour scaling
- *keymap_sdl-graphics_FLT1*
+Switch to next graphical scale filter
+ *keymap_sdl-graphics_FLTN*
-.. _FLT2:
+.. _FLTP:
-Switch to AdvMame 2x/3x scaling
- *keymap_sdl-graphics_FLT2*
-
-.. _FLT3:
-
-Switch to HQ 2x/3x scaling
- *keymap_sdl-graphics_FLT3*
-
-.. _FLT4:
-
-Switch to 2XSai scaling
- *keymap_sdl-graphics_FLT4*
-
-.. _FLT5:
-
-Switch to Super2xSai scaling
- *keymap_sdl-graphics_FLT5*
-
-.. _FLT6:
-
-Switch to SuperEagle scaling
- *keymap_sdl-graphics_FLT6*
-
-.. _FLT7:
-
-Switch to TV 2x scaling
- *keymap_sdl-graphics_FLT7*
-
-.. _FLT8:
-
-Switch to DotMatrix scaling
- *keymap_sdl-graphics_FLT8*
+Switch to previous graphical scale filter
+ *keymap_sdl-graphics_FLTP*
GUI
*****
Commit: 87dd0b396ae1c82091dd2afc1ec56b45c82c41c5
https://github.com/scummvm/scummvm/commit/87dd0b396ae1c82091dd2afc1ec56b45c82c41c5
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-06-26T15:05:46+03:00
Commit Message:
DOCS: Update scaler filter shortcuts in configuration_file
Changed paths:
doc/docportal/advanced_topics/configuration_file.rst
diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index ff87ba66500..7974d7fd91b 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -306,14 +306,8 @@ There are many recognized configuration keys. In the table below, each key is ei
":ref:`keymap_sdl-graphics_ASPT <ASPT>`",string,C+A+a,
":ref:`keymap_sdl-graphics_CAPT <CAPT>`",string,C+m,
":ref:`keymap_sdl-graphics_FILT <FILT>`",string,C+A+f
- ":ref:`keymap_sdl-graphics_FLT1 <FLT1>`",string,C+A+1
- ":ref:`keymap_sdl-graphics_FLT2 <FLT2>`",string,C+A+2
- ":ref:`keymap_sdl-graphics_FLT3 <FLT3>`",string,C+A+3
- ":ref:`keymap_sdl-graphics_FLT4 <FLT4>`",string,C+A+4
- ":ref:`keymap_sdl-graphics_FLT5 <FLT5>`",string,C+A+5
- ":ref:`keymap_sdl-graphics_FLT6 <FLT6>`",string, C+A+6
- ":ref:`keymap_sdl-graphics_FLT7 <FLT7>`",string,C+A+7
- ":ref:`keymap_sdl-graphics_FLT8 <FLT8>`",string,C+A+8
+ ":ref:`keymap_sdl-graphics_FLTN <FLTN>`",string,C+A+0
+ ":ref:`keymap_sdl-graphics_FLTP <FLTP>`",string,C+A+9
":ref:`keymap_sdl-graphics_FULS <FULS>`",string,A+RETURN
":ref:`keymap_sdl-graphics_SCL- <SCL>`",string,C+A+MINUS
":ref:`keymap_sdl-graphics_SCL+ <SCL>`",string,C+A+PLUS
Commit: 1c741d6a656059d8125e22abee8dfcb012c44e46
https://github.com/scummvm/scummvm/commit/1c741d6a656059d8125e22abee8dfcb012c44e46
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-06-26T15:05:46+03:00
Commit Message:
DOCS: Add cycle graphic filter shortcut under Software Scalers section
Changed paths:
doc/docportal/advanced_topics/understand_graphics.rst
diff --git a/doc/docportal/advanced_topics/understand_graphics.rst b/doc/docportal/advanced_topics/understand_graphics.rst
index 09cd8ed390a..4989ed7006a 100644
--- a/doc/docportal/advanced_topics/understand_graphics.rst
+++ b/doc/docportal/advanced_topics/understand_graphics.rst
@@ -39,6 +39,8 @@ If the game originally ran at a resolution of 320x200—which is typical for mos
There is always a speed penalty when using a scaler other than Normal 1x.
+To cycle forwards or backwards between graphical filters, press :kbd:`Ctrl + Alt` and :kbd:`0` or :kbd:`9` (respectively).
+
.. figure:: ../images/graphics/graphics_mode/1x.png
**Normal 1x**: No filtering, no scaling (original resolution). Fastest.
Commit: a562972acb31f89623e34d0ffda8121cc4aeb544
https://github.com/scummvm/scummvm/commit/a562972acb31f89623e34d0ffda8121cc4aeb544
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-06-26T15:05:46+03:00
Commit Message:
DOCS: use kbd prefix for 0 and 9 keys in shortcut
Changed paths:
doc/docportal/use_scummvm/keyboard_shortcuts.rst
diff --git a/doc/docportal/use_scummvm/keyboard_shortcuts.rst b/doc/docportal/use_scummvm/keyboard_shortcuts.rst
index 332128ac91f..3d3d062c3ad 100755
--- a/doc/docportal/use_scummvm/keyboard_shortcuts.rst
+++ b/doc/docportal/use_scummvm/keyboard_shortcuts.rst
@@ -21,7 +21,7 @@ Default shortcuts are shown in the table.
:kbd:`Ctrl+z`,Quit (other platforms)
:kbd:`Ctrl+u` ,Mutes all sounds
:kbd:`Ctrl+m` ,Toggles mouse capture
- :kbd:`Ctrl+Alt` and `9` or `0` ,Cycles forwards/backwards between graphics filters
+ :kbd:`Ctrl+Alt` and :kbd:`9` or :kbd:`0`,Cycles forwards/backwards between graphics filters
:kbd:`Ctrl+Alt` and :kbd:`+` or :kbd:`-`,Increases/decreases the scale factor
:kbd:`Ctrl+Alt+a` ,Toggles aspect ratio correction on/off
:kbd:`Ctrl+Alt+f` ,Toggles between nearest neighbor and bilinear interpolation (graphics filtering on/off)
More information about the Scummvm-git-logs
mailing list