diff --git a/Changes.txt b/Changes.txt
index f75f2c30f..deb6723ec 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -62,6 +62,8 @@
new option allows to preserve TIA image aspect ratio in fullscreen
mode, or stretch to fill the entire screen. (TODO: doc)
+ * Allow mapping of modifier-key combinations
+
* Added hotkey for sound on/off.
* Added support for CDFJ bankswitching type.
diff --git a/docs/index.html b/docs/index.html
index f02b9534d..7ac6f73fe 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -10,7 +10,7 @@
A multi-platform Atari 2600 VCS emulator
- Release 6.0
+ Release 6.1
User's Guide
@@ -287,7 +287,7 @@
AtariVox and SaveKey controllers,
as well as FLASH support in various cartridge schemes
Supports all known bankswitching schemes (let us know if there's one we missed)
- Supports DPC+/CDF bankswitching schemes from the Harmony Cart,
+ Supports DPC+/CDF(J) bankswitching schemes from the Harmony Cart,
including partial emulation of the ARM processor
Supports cartridge autodetection for almost all bankswitching schemes
Supports using ROM filename extensions to force specific bankswitching schemes
@@ -2156,12 +2156,13 @@
- -ctrlcombo <1|0> |
- Use control-x key combos. This is normally enabled, since the
- 'Quit' command is tied to 'Control-q'. However, there are times when
- a 2-player game is using either the 'f' or 'r' keys for movement,
+ | -modcombo <1|0> |
+ Use modifier(Shift/Alt/Control)-x key combos. This is normally enabled,
+ since the 'Quit' command is tied to 'Control-q'. However, there are times
+ when you want to disable them.
+ E.g. a 2-player game is using either the 'f' or 'r' keys for movement,
and pressing Control (for Fire) will perform an unwanted action
- associated with Control-r or Control-f. |
+ associated with Control-r or Control-f default keys.
@@ -2535,17 +2536,17 @@
-<plr.|dev.>cpurandom <S,A,X,Y,P> |
On reset, randomize the content of the specified CPU registers. |
- dev.tiadriven <1|0> |
+ -dev.tiadriven <1|0> |
Set unused TIA pins to be randomly driven high or low on a read/peek.
If disabled, use the last databus value for those pins instead. |
- dev.rwportbreak <1|0> |
+ -dev.rwportbreak <1|0> |
Since the 2600 has no dedicated R/W line, different addresses are used
for RAM read or write access. If the code reads from such a write address, this causes
an unwanted, semi-random write to that address.
When this option is enabled, such reads interrupt emulation and the debugger is entered. |
- dev.thumb.trapfatal <1|0> |
+ -dev.thumb.trapfatal <1|0> |
When enabled, this allows the Thumb ARM emulation to
throw an exception and enter the debugger on fatal errors. When disabled, such
fatal errors are simply logged, and emulation continues. Do not use this
@@ -2646,7 +2647,7 @@
|
VSync | Enable vertical synced updates | -vsync |
Fast SuperCharger load | Skip progress loading bars for SuperCharger ROMs | -fastscbios |
Show UI messages | Overlay UI messages onscreen | -uimessages |
- Center window | Attempt to center application window | -center |
+ Center window | Attempt to center application windows, else position at last position | -center |
Multi-threading | Enable multi-threaded rendering | -threads |
@@ -2858,10 +2859,10 @@
If you wish to remap emulation events, click the 'Emul. Events' tab.
Otherwise, click the 'UI Events' tab for user interface events.
Select event you want to remap and click the 'Map' button.
- Press a key or a joystick button, and that key/button will be bound
- to the selected event. If nothing seems to happen, either Stella
- can't see the input device, or the selected event doesn't support being
- remapped to the input device.
+ Press a key (or a modifier+key combination) or a joystick button, and that
+ key/button will be bound to the selected event. If nothing seems to happen,
+ either Stella can't see the input device, or the selected event doesn't
+ support being remapped to the input device.
Cancel a remap in progress by clicking 'Cancel', erase a mapping by
clicking 'Erase', or reset to default mapping by clicking 'Reset'
Reset to default all mappings by clicking 'Defaults'.
@@ -2899,7 +2900,7 @@
Allow all 4 directions ... | Allow all 4 joystick directions to be pressed simultaneously | -joyallow4 |
Grab mouse ... | Keep mouse in window in emulation mode (only when used as controller)
Note: The sensitivity may greatly vary when the mouse is not grabbed. | -grabmouse |
- Use control key combos | Enable using Control key in keyboard actions | -ctrlcombo |
+ Use modifier key combos | Enable using modifier keys in keyboard actions | -modcombo |
Swap Stelladaptor ports | Swap the order of the detected Stelladaptors/2600-daptors (see Advanced Configuration - Stelladaptor/2600-daptor Support) | -saport |
Joystick database | Show all joysticks that Stella knows about, with the option to remove them | |
Erase EEPROM | Erase the whole AtariVox/SaveKey flash memory | |