diff --git a/stella/docs/graphics/options_audio.png b/stella/docs/graphics/options_audio.png
index 5e282f76f..018849359 100644
Binary files a/stella/docs/graphics/options_audio.png and b/stella/docs/graphics/options_audio.png differ
diff --git a/stella/docs/graphics/options_gameinfo.png b/stella/docs/graphics/options_gameinfo.png
index da8e62c3b..a1c1c1312 100644
Binary files a/stella/docs/graphics/options_gameinfo.png and b/stella/docs/graphics/options_gameinfo.png differ
diff --git a/stella/docs/stella.html b/stella/docs/stella.html
index cab4c830a..4eb5f63e9 100644
--- a/stella/docs/stella.html
+++ b/stella/docs/stella.html
@@ -35,7 +35,7 @@
- February 1999 - September 2005
+ February 1999 - October 2005
The Stella Team
Stella Homepage
@@ -240,15 +240,20 @@
Added ZIP support. Stella can now open ROM's compressed in zip
format.
- Reworked properties system to use both a system-wide 'stella.pro' and
- a per-user 'user.pro' properties files. Changes made by the user
- and stored in 'user.pro' are no longer erased when upgrading Stella.
-
Added ability to edit current ROM properties from directly within
Stella, which can then be saved directly into the 'user.pro' file.
So creating a properties entry for a new ROM can be done without
any external tools.
+ Added initial support for using Stella in an 'arcade-box'
+ environment without a keyboard. This consists of an in-game
+ menu for choosing common actions in Stella, as well as using the
+ game to navigate the mouse pointer.
+
+ Reworked properties system to use both a system-wide 'stella.pro' and
+ a per-user 'user.pro' properties files. Changes made by the user
+ and stored in 'user.pro' are no longer erased when upgrading Stella.
+
Added cartridge 'frying', thanks to Fred "batari" Quimby. This
emulates the action of turning the power button on and off on a
real Atari, often resulting in some strange effects.
@@ -686,6 +691,11 @@
Indicates which paddle the mouse should emulate (defaults to paddle 0). |
+
+ -joymouse <0|1> |
+ Indicates whether the joystick emulates the mouse in GUI mode (defaults to off). |
+
+
-showinfo <0|1> |
Shows some game info while Stella is running. |
@@ -967,6 +977,12 @@
Tab |
+
+ | Enter/exit command mode |
+ Backslash (\) |
+ Backslash (\) |
+
+
| Select Game |
F1 |
diff --git a/stella/src/gui/AboutDialog.cxx b/stella/src/gui/AboutDialog.cxx
index 775468caa..1a5d97fce 100644
--- a/stella/src/gui/AboutDialog.cxx
+++ b/stella/src/gui/AboutDialog.cxx
@@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// $Id: AboutDialog.cxx,v 1.7 2005-08-25 15:19:17 stephena Exp $
+// $Id: AboutDialog.cxx,v 1.8 2005-10-09 21:55:53 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@@ -107,12 +107,12 @@ void AboutDialog::updateStrings(int page, int lines, string& title, string* &dsc
ADD_ATEXT("\\L\\c2"" Maintainer of the 'stella.pro' game properties file");
ADD_ATEXT("\\L\\c0"" Joe D'Andrea");
ADD_ATEXT("\\L\\c2"" Maintainer for Solaris port");
- ADD_ATEXT("\\L\\c0"" Darrell Spice Jr.");
- ADD_ATEXT("\\L\\c2"" Original author for OS/2 port");
- ADD_ATEXT("\\L\\c0"" Doodle");
- ADD_ATEXT("\\L\\c2"" Current maintainer for OS/2 port");
+ ADD_ATEXT("\\L\\c0"" Darrell Spice Jr. & Doodle");
+ ADD_ATEXT("\\L\\c2"" Authors for OS/2 port");
ADD_ATEXT("\\L\\c0"" David Voswinkel");
ADD_ATEXT("\\L\\c2"" Maintainer for PSP port");
+ ADD_ATEXT("\\L\\c0"" Kostas Nakos");
+ ADD_ATEXT("\\L\\c2"" Author/maintainer for WinCE port");
break;
case 4:
diff --git a/stella/src/gui/HelpDialog.cxx b/stella/src/gui/HelpDialog.cxx
index a293093c0..8fbae7da4 100644
--- a/stella/src/gui/HelpDialog.cxx
+++ b/stella/src/gui/HelpDialog.cxx
@@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// $Id: HelpDialog.cxx,v 1.12 2005-08-11 21:57:30 stephena Exp $
+// $Id: HelpDialog.cxx,v 1.13 2005-10-09 21:55:53 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@@ -72,7 +72,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines,
ADD_BIND("Ctrl Q", "Quit emulation");
ADD_BIND("Escape", "Exit current game");
ADD_BIND("Tab", "Enter/exit configuration menu");
- ADD_LINE;
+ ADD_BIND("\\", "Enter/exit command menu");
ADD_BIND("Alt =", "Increase window size");
ADD_BIND("Alt -", "Decrease window size");
ADD_BIND("Alt Enter", "Toggle fullscreen/windowed mode");
@@ -85,7 +85,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines,
title = "Special commands:";
ADD_BIND("Ctrl g", "Grab mouse (keep in window)");
ADD_BIND("Ctrl f", "Switch between NTSC and PAL");
- ADD_BIND("Ctrl s", "Save (or merge) game properties");
+ ADD_BIND("Ctrl s", "Save game properties to new file");
+ ADD_BIND("Alt s", "Merge game properties");
ADD_LINE;
ADD_BIND("Ctrl 0", "Mouse emulates paddle 0");
ADD_BIND("Ctrl 1", "Mouse emulates paddle 1");
@@ -107,40 +108,41 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines,
#else
case 1:
title = "Common commands:";
- ADD_BIND("Cmd Q", "Quit emulation");
- ADD_BIND("Escape", "Exit current game");
- ADD_BIND("Tab", "Enter/exit configuration menu");
+ ADD_BIND("Cmd Q", "Quit emulation");
+ ADD_BIND("Escape", "Exit current game");
+ ADD_BIND("Tab", "Enter/exit configuration menu");
+ ADD_BIND("\\", "Enter/exit command menu");
+ ADD_BIND("Shift-Cmd =", "Increase window size");
+ ADD_BIND("Shift-Cmd -", "Decrease window size");
+ ADD_BIND("Cmd Enter", "Toggle fullscreen/windowed mode");
ADD_LINE;
- ADD_BIND("Shift-Cmd =", "Increase window size");
- ADD_BIND("Shift-Cmd -", "Decrease window size");
- ADD_BIND("Shift-Cmd Enter", "Toggle fullscreen/windowed mode");
- ADD_LINE;
- ADD_BIND("Shift-Cmd ]", "Increase volume by 2%");
- ADD_BIND("Shift-Cmd [", "Decrease volume by 2%");
+ ADD_BIND("Shift-Cmd ]", "Increase volume by 2%");
+ ADD_BIND("Shift-Cmd [", "Decrease volume by 2%");
break;
case 2:
title = "Special commands:";
- ADD_BIND("Cmd g", "Grab mouse (keep in window)");
- ADD_BIND("Cmd f", "Switch between NTSC and PAL");
- ADD_BIND("Cmd s", "Save (or merge) game properties");
+ ADD_BIND("Cmd g", "Grab mouse (keep in window)");
+ ADD_BIND("Cmd f", "Switch between NTSC and PAL");
+ ADD_BIND("Cmd s", "Save (or merge) game properties");
+ ADD_BIND("Shift-Cmd s", "Merge game properties");
ADD_LINE;
- ADD_BIND("Cmd 0", "Mouse emulates paddle 0");
- ADD_BIND("Cmd 1", "Mouse emulates paddle 1");
- ADD_BIND("Cmd 2", "Mouse emulates paddle 2");
- ADD_BIND("Cmd 3", "Mouse emulates paddle 3");
+ ADD_BIND("Cmd 0", "Mouse emulates paddle 0");
+ ADD_BIND("Cmd 1", "Mouse emulates paddle 1");
+ ADD_BIND("Cmd 2", "Mouse emulates paddle 2");
+ ADD_BIND("Cmd 3", "Mouse emulates paddle 3");
break;
case 3:
title = "Developer commands:";
ADD_BIND("Shift-Cmd PageUp", "Increase Display.YStart");
ADD_BIND("Shift-Cmd PageDown", "Decrease Display.YStart");
- ADD_BIND("Cmd PageUp", "Increase Display.Height");
- ADD_BIND("Cmd PageDown", "Decrease Display.Height");
+ ADD_BIND("Cmd PageUp", "Increase Display.Height");
+ ADD_BIND("Cmd PageDown", "Decrease Display.Height");
ADD_BIND("Shift-Cmd End", "Increase Display.XStart");
ADD_BIND("Shift-Cmd Home", "Decrease Display.XStart");
- ADD_BIND("Cmd End", "Increase Display.Width");
- ADD_BIND("Cmd Home", "Decrease Display.Width");
+ ADD_BIND("Cmd End", "Increase Display.Width");
+ ADD_BIND("Cmd Home", "Decrease Display.Width");
break;
#endif
case 4: