diff --git a/Announce.txt b/Announce.txt
index 1eb6fef3e..d566176bd 100644
--- a/Announce.txt
+++ b/Announce.txt
@@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
- Release 3.3 for Linux, MacOSX and Windows
+ Release 3.4 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@@ -21,31 +21,31 @@ all of your favourite Atari 2600 games again! Stella was originally
developed for Linux by Bradford W. Mott, however, it has been ported to a
number of other platforms and is currently maintained by Stephen Anthony.
-This is the 3.3 release of Stella for Linux, Mac OSX and Windows. The
+This is the 3.4 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP/Vista/7 :
- Stella-3.3-win32.exe (32-bit EXE installer)
- Stella-3.3-x64.exe (64-bit EXE installer)
- Stella-3.3-windows.zip (32/64 bit versions)
+ Stella-3.4-win32.exe (32-bit EXE installer)
+ Stella-3.4-x64.exe (64-bit EXE installer)
+ Stella-3.4-windows.zip (32/64 bit versions)
* Binaries for Windows 98/2000 :
- Stella-3.3_98_2k-windows.zip (32-bit for Windows 98/2000)
+ Stella-3.4_98_2k-windows.zip (32-bit for Windows 98/2000)
* Binary distribution for MacOSX 32-bit & 64-bit :
- Stella-3.3-macosx.dmg (32-bit Universal Binary)
- Stella-3.3_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only)
+ Stella-3.4-macosx.dmg (32-bit Universal Binary)
+ Stella-3.4_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
- stella_3.3-1_i386.deb
- stella_3.3-1_amd64.deb
+ stella_3.4-1_i386.deb
+ stella_3.4-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
- stella-3.3-2.i386.rpm
- stella-3.3-2.x86_64.rpm
+ stella-3.4-2.i386.rpm
+ stella-3.4-2.x86_64.rpm
* Source code distribution for all platforms :
- stella-3.3-src.tar.gz
+ stella-3.4-src.tar.gz
PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH
REQUESTS WILL BE IGNORED!
diff --git a/Changes.txt b/Changes.txt
index 0e4d52186..9cf775f07 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,7 +12,7 @@
Release History
===========================================================================
-3.3 to 3.4: (May. xx, 2011)
+3.3 to 3.4: (May. 29, 2011)
* Many improvements to input handling, particularly with the mouse and
paddles:
@@ -39,7 +39,8 @@
have been updated.
* Added preliminary support for emulating ARM code to the DPC+
- bankswitching scheme (thanks to Batari).
+ bankswitching scheme (thanks to Batari). Related to this, fatal
+ errors in the DPC+ ARM code are now caught and shown in the debugger.
* Updated internal ROM properties database to ROM-Hunter version 6
(thanks go to RomHunter for his tireless research in this area).
diff --git a/README-GP2X.txt b/README-GP2X.txt
deleted file mode 100644
index 2f06c087c..000000000
--- a/README-GP2X.txt
+++ /dev/null
@@ -1,178 +0,0 @@
----------------------------------------
-Stella 2.3.5
-Ported to GP2X by Alex Zaballa
-Contact: azaballa@users.sourceforge.net
-Homepage: http://stella.sourceforge.net
----------------------------------------
-
---------
-Changes:
---------
->From 2.3
-* All menus are now available through the Options button in the
- Launcher.
-* Pause function has been removed, pressing a menu button serves
- the same function.
-* Vertical Centering during gameplay is now implemented.
-* UI Color Schemes are now implemented. At the moment there's only
- Classic and GP2X. More are coming in the future. ;)
->From 2.2-rv1
-* Moved away from using joymouse emulation, which was frustrating
- many users, to a more effective GUI button control scheme.
-* PAL ROMs are now playable thanks to Paeryn's scaling libs. ;)
-* Paddle games like 'Tac-scan,' 'Demons to Diamonds,' 'Video
- Olympics,' and others are now playable thanks to Steve.
-* Made '/mnt/sd' the default ROM and Snapshot directory this way
- Stella doesn't look anywhere it shouldn't.
-* Changed button mapping.
-* Various performance tweaks.
-
->From 2.2
-* Ms. Pacman sound issue resolved.
-
->From 2.1-rv3
-* Added Rom Browser mode and enabled it by default.
-
->From 2.1-rv2
-* Scroll bug fixed (finally).
-
->From 2.1-rv1
-* Warlords graphics bug fixed.
-
->From 2.1
-* Joystick fixed.
-* Phosphor effect enabled.
-
->From 2.0.1:
-* Stopped using the ROM Script (No more ROM limit. 'Single binary'
- zip support available.).
-* Opened up the Native GUI for use through Joymouse Emulation.
-* SOUND!
-* Diagonals.
-* Snapshots.
-* Some button mapping (but still comfortably familiar).
-
------------
-Known Bugs:
------------
-None reported.
-Please report all bugs to me at azaballa@users.sourceforge.net.
-
-------------------------------
-Known GP2X Performance Issues:
-------------------------------
-Pitfall 2 runs slow due to the need for extra hardware emulation.
-Steve foresees this being fixed in the future.
-
----------------------
-Installation to GP2X:
----------------------
-Note: Stella for the GP2X does not need external SDL libraries.
-
-Place files 'stella' and 'stella.gpe' into its own directory.
-Stella defaults to '/mnt/sd' for the ROM and Snapshot directory.
-This can be changed by using the 'Options' button in the Launcher
-menu. If you are having issues with getting Stella to run after
-an older install, delete the 'stellarc' file located in the root
-Stella install folder.
-
------------
-Navigation:
------------
-The joystick selects item by item in a list. In menu mode, VOL+ and
-VOL- highlight the next and previous GUI elements respectively.
-Pressing B activates the highlighted GUI element. Pressing START
-or X is equivalent to clicking Cancel or Close. Pressing SELECT is
-equivalent to clicking OK. To move to the previous directory without
-the 'Go Up' button, just use the '[..]' item at the top of the ROM
-Browser list. For complete button mapping, check below.
-
--------------
-GP2X Mapping:
--------------
-Navigating Menus:
- A = Previous Tab
- B = Select GUI Item
- X = Menu Cancel
- Y = Next Tab
- L = Page Up
- R = Page Down
- START = Menu Cancel
- SELECT = Menu OK
- VOL+ = Navigate to Next GUI Button (or other GUI element)
- VOL- = Navigate to Previous GUI Button (or other GUI element)
-During Emulation:
- A = Command Menu
- B = Fire
- X =
- Y = Settings Menu
- L = Console Reset
- R = Console Select
- START = Launcher Menu
- SELECT = Snapshot
-
-Caution: Changing video and audio settings could lead to a non-working Stella
-setup. If you do feel the need to change the settings (as we all do) and happen
-to cause a crash or hang, delete the 'stellarc' file and that should clear up
-the problem. If anyone finds any settings that give better performance in
-sound and gameplay, let me know and I might incorporate them into the next
-version. Happy tinkering.
-
--------------
-Other:
--------------
-For user friendly ROM names, try out Cowering's Good2600. It is a reliable
-and easy to use ROM renamer. It has a nifty Windows frontend and will also
-work under Linux when used with Wine (wineconsole). Check accompanying
-documentation for further details.
-
-GoodTools is available from Cowering's homepage and at http://archive.gp2x.de/.
-
--------------
-Compile Info:
--------------
-Since the GP2X branch was so graciously added to Stella, GP2X compilation is
-now built in. If you plan on doing a compile yourself, you need the GP2X devkit
-pro and SDL Open2X libs with zlib support. I recommend theoddbot's Open2X
-libraries which work very nicely for this. Paeryn's are also a must (combine
-them with theoddbot's). Any questions, email me.
-
-Make sure your path includes your arm-linux compilers and tools:
-export PATH=:$PATH
-
-This is what my configure line looks like:
-./configure
- --enable-cheats
- --disable-debugger
- --host=gp2x
- --with-zlib-prefix=
- --with-sdl-prefix=
- --x-libraries=
-
-Then:
-make
-
-Then strip the exec:
-make gp2x-strip
-
-You should get an exec ~2MB in size. Much better than 7MB right?
-
-To gather all necessary files into directory './stella/gp2x' for easy
-access, type:
-make gp2x-organize
-
-Note: stella/gp2x directory created in the main stella source directory
-(next to configure, Makefile, etc.).
-
----------------
-Special Thanks:
----------------
-... to Steve Anthony for the major improvements in the port and incorporating
- the GP2X. Not to mention the wealth of information and help... did I
- mention patience? ;-)
-... to Eckhard Stolberg for making me known to the Stella Team.
-... to the Stella Team for the excellent emulator and the hospitality.
-... to theoddbot for the excellent Open2X toolchain libs.
-... to paeryn for the wonderful scaling libs.
-... to TelcoLou for his hardwork, playtesting ad infinitum.
-... to the community for all of the interest.
diff --git a/README-WinCE.txt b/README-WinCE.txt
deleted file mode 100644
index 42a43d15b..000000000
--- a/README-WinCE.txt
+++ /dev/null
@@ -1,95 +0,0 @@
--=-=-=-=-=-=-=-=-=-=-=-=-=-= PocketStella -=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-... is the official Windows CE port of the Stella emulator. It is coded
-and maintained by Kostas Nakos (knakos.AT.gmail.com). Currently, supported
-devices are all Smartphones (176x220 & QVGA), and Pocket PCs (QVGA & VGA).
-This port makes use of the excellent STLport cross platform C++ template library.
-Here are some news for you:
-
-(This file last updated: 29 Jan 07)
-
-v.2.3.5 : support for QGVA landscape smartphones,
- greatly improved UI rendering for low res smartphones,
- keyboard events can be now arbitrarily remapped,
- UI menus accessibility in smartphones
-v.2.2 : native VGA support, better backlight handling
-
-
-Installing and Running:
-First create a directory for PocketStella, and copy the executable in it.
-Also create a subdirectory called "Roms" (without the quotes, of course).
-You should place your rom files there. On first run, this is where
-PocketStella will look for roms. You can set an alternate path using the
-dialogs.
-
-Warning for users of previous versions:
-There have been three significant changes in PocketStella. First, you no
-longer need the zlibce.dll inside the emulator directory. The library
-is statically linked in the executable and can be safely deleted.
-Second, the stella.pro is also no longer needed as its functionality
-has been included in the emulator core. Please delete this file as well
-as it leads to increased load times. The stella.cache is also no longer
-needed. You can delete this as well.
-Third, it is best to delete your already existing stella.ini file when
-upgrading to this version.
-
-Controls:
-You can remap the action each button performs by using the UI menus.
-The default keymap is:
-
-A. Smartphones
-
-DPad Up, Down, Left, Right : Menus -> Up, Down, Page Up, Page Down $
- Emulation -> Joystick 0 or Paddle 0 emulation $
-Dpad Start (or Enter) : Emulation -> Reset
-Softkey A : Menus -> Select (mouse click)
- Emulation -> Fire Joystick/Paddle 0
-Softkey B : Menus -> Focus next item (tab) #
- Emulation -> In game menu #
-Softkey C (usually *) : Emulation -> Select
-Backspace (arrow key) : Menus -> Cancel
- Emulation -> Back to launcher
-Call/Talk/Green button : Emulation -> Rotate display
-
-($): These buttons follow screen orientation.
-(#): This key cannot be reassigned.
-
-B. Pocket PCs
-Pocket PC users get the same actions as Smartphone users attributed to
-their keys, except the Call key. You can use the stylus to fully access
-all menus and also:
-
-Stylus drag : Emulation -> Emulate Paddle 0
-Tap top left : Emulation -> Bring up menu
-Tap bottom left : Emulation -> Back to Launcher
-Tap bottom right : Emulation -> Rotate display
-
-
-Build instructions:
-The build environment of evc3 has maximum compatibility, but the emulator
-can certainly be built using evc4 of higher. The following instructions
-pertain to evc3. wince2002 does not include support for C++ STL, so I use
-STLport. Get the latest release (I used the CVS version which has wince
-support) and build it. Copy the two folders under the bin directory into
-a folder named stlport in the src\wince of stella (the .lib files).
-Also get the SDL library and copy the include files into a folder named sdl
-in src\wince. Get zconf.h and zlib.h of the zlib library and copy them in a
-folder named zlib in src\wince. Further, copy the arm and x86 zlibce.lib files
-into their respective src\wince\zlib\arm and src\wince\zlib\x86 folders.
-Finally, you need to add the includes directory of stlport (stlport\) to
-the default searched include directories. To do this use the dialog box:
-Tools->Options->Directories->Include files. The stlport include dir should
-be listed here before all other paths. To be able to emulate in the x86
-emulator you also need the GAPI emulation.
-Things are much easier in Visual Studio 2005. No external C++ STL library
-is needed.
-
-Have fun :-)
-
-Links:
-Stella project homepage: http://stella.sourceforge.net
-contact the author : knakos.AT.gmail.com
-STLport library home : http://www.stlport.org/
-PocketStella home : N/A yet
-Microsoft eMbedded Visual Tools 3.0 : http://msdn.microsoft.com/mobility/windowsmobile/downloads/default.aspx
-GAPI emulation : http://pocketfrog.droneship.com/
diff --git a/Readme.txt b/Readme.txt
index 59b74dc57..78ef3f8ae 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,4 +1,4 @@
-This is release 3.3 of Stella. Stella is a multi-platform Atari 2600 VCS
+This is release 3.4 of Stella. Stella is a multi-platform Atari 2600 VCS
emulator which allows you to play all of your favourite Atari 2600 games
on your PC. You'll find the Stella Users Manual in the docs subdirectory.
If you'd like to verify that you have the latest release of Stella visit
@@ -9,4 +9,4 @@ the Stella Website at:
Enjoy,
The Stella Team
-November 12, 2010
+May 29, 2011
diff --git a/docs/debugger.html b/docs/debugger.html
index 8f6c79564..e6ad3dc82 100644
--- a/docs/debugger.html
+++ b/docs/debugger.html
@@ -637,6 +637,7 @@ can also get rid of all traps at once with the "cleartraps" command.
disasm - Disassemble address xx [yy lines] (default=PC)
dump - Dump 128 bytes of memory at address xx
exec - Execute script file xx
+ exitrom - Exit emulator, return to ROM launcher
frame - Advance emulation by xx frames (default=1)
function - Define function name xx for expression yy
gfx - Mark 'CFX' range in disassembly
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 4851abe93..b218302a1 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
#include
-#define STELLA_VERSION "3.4_beta1"
+#define STELLA_VERSION "3.4_rc1"
#define STELLA_BUILD atoi("$Rev$" + 6)
#endif
diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist
index aa1713f05..bf6cae800 100644
--- a/src/macosx/Info-Stella.plist
+++ b/src/macosx/Info-Stella.plist
@@ -53,7 +53,7 @@
CFBundleSignature
StLa
CFBundleVersion
- 3.3
+ 3.4
NSMainNibFile
SDLMain.nib
NSPrincipalClass
diff --git a/src/unix/stella.SlackBuild b/src/unix/stella.SlackBuild
index cbbeac76c..28872591a 100644
--- a/src/unix/stella.SlackBuild
+++ b/src/unix/stella.SlackBuild
@@ -13,7 +13,7 @@ die() {
exit 1
}
-VERSION=3.3
+VERSION=3.4
ARCH=${ARCH-i486}
BUILD=1
diff --git a/src/unix/stella.spec b/src/unix/stella.spec
index 704377b14..5179ecf60 100644
--- a/src/unix/stella.spec
+++ b/src/unix/stella.spec
@@ -1,5 +1,5 @@
%define name stella
-%define version 3.3
+%define version 3.4
%define rel 1
%define enable_gl 1
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png
%changelog
+* Sun May 29 2011 Stephen Anthony 3.4-1
+- Version 3.4 release
+
* Fri Nov 12 2010 Stephen Anthony 3.3-1
- Version 3.3 release
diff --git a/src/win32/stella.rc b/src/win32/stella.rc
index 96eef8a2f..1fb2cdb33 100755
--- a/src/win32/stella.rc
+++ b/src/win32/stella.rc
@@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,0
- PRODUCTVERSION 3,3,0,0
+ FILEVERSION 3,4,0,0
+ PRODUCTVERSION 3,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -55,12 +55,12 @@ BEGIN
VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2."
VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
VALUE "FileDescription", "Stella"
- VALUE "FileVersion", "3.3"
+ VALUE "FileVersion", "3.4"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2011 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
- VALUE "ProductVersion", "3.3"
+ VALUE "ProductVersion", "3.4"
END
END
BLOCK "VarFileInfo"