diff --git a/Announce.txt b/Announce.txt index e092c51af..64e1c57a4 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 4.0 for Linux, MacOSX and Windows + Release 4.1 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,27 +21,27 @@ 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 4.0 release of Stella for Linux, Mac OSX and Windows. The +This is the 4.1 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: - * Binaries for Windows XP/Vista/7/8 : - Stella-4.0-win32.exe (32-bit EXE installer) - Stella-4.0-x64.exe (64-bit EXE installer) - Stella-4.0-windows.zip (32/64 bit versions) + * Binaries for Windows XP_SP3/Vista/7/8 : + Stella-4.1-win32.exe (32-bit EXE installer) + Stella-4.1-x64.exe (64-bit EXE installer) + Stella-4.1-windows.zip (32/64 bit versions) * Binary distribution for MacOS X 10.5 and above : - Stella-4.0-macosx.dmg (32/64-bit Intel Universal Binary) + Stella-4.1-macosx.dmg (32/64-bit Intel Universal Binary) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_4.0-1_i386.deb - stella_4.0-1_amd64.deb + stella_4.1-1_i386.deb + stella_4.1-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-4.0-2.i386.rpm - stella-4.0-2.x86_64.rpm + stella-4.1-2.i386.rpm + stella-4.1-2.x86_64.rpm * Source code distribution for all platforms : - stella-4.0-src.tar.gz + stella-4.1-src.tar.gz Distribution Site diff --git a/Changes.txt b/Changes.txt index 460cd8f67..88998e0c0 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -4.0 to 4.1: (xxx xx, 2014) +4.0 to 4.1: (September xx, 2014) * Improved 'DASH' bankswitching scheme support; there is now a debugger tab for changing banks and viewing internal cart RAM, and diff --git a/debian/changelog b/debian/changelog index 87df4cfee..5485ef4a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (4.1-1) stable; urgency=high + + * Version 4.1 release + + -- Stephen Anthony Sun, 31 Aug 2014 20:43:06 -0230 + + stella (4.0-1) stable; urgency=high * Version 4.0 release diff --git a/docs/index.html b/docs/index.html index e611caec1..be50955d3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 4.0

+

Release 4.1



User's Guide

@@ -54,7 +54,7 @@


-
February 1999 - July 2014
+
February 1999 - September 2014
The Stella Team
Stella Homepage
@@ -354,13 +354,12 @@

Windows

-

The Windows version of Stella is designed to work on Windows XP/Vista/7/8 +

The Windows version of Stella is designed to work on Windows XP_SP3/Vista/7/8 with the following:

diff --git a/src/common/Version.hxx b/src/common/Version.hxx index a4b96953b..c743a8912 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -22,7 +22,7 @@ #include -#define STELLA_VERSION "4.1_pre3" +#define STELLA_VERSION "4.1_beta1" #define STELLA_BUILD atoi("$Rev$" + 6) #endif diff --git a/src/debugger/gui/CartMDMWidget.cxx b/src/debugger/gui/CartMDMWidget.cxx index 1b245a13d..02643462e 100644 --- a/src/debugger/gui/CartMDMWidget.cxx +++ b/src/debugger/gui/CartMDMWidget.cxx @@ -74,7 +74,7 @@ void CartridgeMDMWidget::loadConfig() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void CartridgeMDMWidget::handleCommand(CommandSender* sender, - int cmd, int data, int id) + int cmd, int data, int id) { if(cmd == kBankChanged) { @@ -88,3 +88,15 @@ void CartridgeMDMWidget::handleCommand(CommandSender* sender, myCart.myBankingDisabled = myBankDisabled->getState(); } } + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +string CartridgeMDMWidget::bankState() +{ + ostringstream& buf = buffer(); + + buf << "Bank = " << dec << myCart.myCurrentBank + << ", hotspot = " << "$" << Common::Base::HEX4 + << (myCart.myCurrentBank+0x800); + + return buf.str(); +} diff --git a/src/debugger/gui/CartMDMWidget.hxx b/src/debugger/gui/CartMDMWidget.hxx index ff89dfb7f..4f14608a5 100644 --- a/src/debugger/gui/CartMDMWidget.hxx +++ b/src/debugger/gui/CartMDMWidget.hxx @@ -38,6 +38,8 @@ class CartridgeMDMWidget : public CartDebugWidget void loadConfig(); void handleCommand(CommandSender* sender, int cmd, int data, int id); + string bankState(); + private: CartridgeMDM& myCart; PopUpWidget* myBank; diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index f631924af..832d34b4d 100644 --- a/src/macosx/Info-Stella.plist +++ b/src/macosx/Info-Stella.plist @@ -53,7 +53,7 @@ CFBundleSignature StLa CFBundleVersion - 4.0 + 4.1 LSMinimumSystemVersionByArchitecture i386 diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 2521959e0..0efb6b257 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 4.0 +%define version 4.1 %define rel 1 %define enable_gl 1 diff --git a/src/windows/stella.rc b/src/windows/stella.rc index 8424adcdf..0f1e57271 100755 --- a/src/windows/stella.rc +++ b/src/windows/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,0,0,0 - PRODUCTVERSION 4,0,0,0 + FILEVERSION 4,1,0,0 + PRODUCTVERSION 4,1,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", "4.0" + VALUE "FileVersion", "4.1" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2014 The Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "4.0" + VALUE "ProductVersion", "4.1" END END BLOCK "VarFileInfo"