ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final commit for 4.7 release, updating docs and some minor last-minute 

code cleanup.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3263 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2016-01-25 20:49:21 +00:00
parent 647aeb62b0
commit 86c7b229f0
11 changed files with 39 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Announce.txt
View File

@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 4.6.7 for Linux, MacOSX and Windows
Release 4.7 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@ -21,30 +21,30 @@ 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.6.7 release of Stella for Linux, Mac OSX and Windows. The
This is the 4.7 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP_SP3(*)/Vista/7/8/10 :
Stella-4.6.7-win32.exe (32-bit EXE installer)
Stella-4.6.7-x64.exe (64-bit EXE installer)
Stella-4.6.7-windows.zip (32/64 bit versions)
Stella-4.7-win32.exe (32-bit EXE installer)
Stella-4.7-x64.exe (64-bit EXE installer)
Stella-4.7-windows.zip (32/64 bit versions)
(*) Note: Support for Windows XP is problematic on some systems,
and will probably be discontinued in a future release.
* Binary distribution for MacOS X 10.7 and above :
Stella-4.6.7-macosx.dmg (64-bit Intel)
Stella-4.7-macosx.dmg (64-bit Intel)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_4.6.7-1_i386.deb
stella_4.6.7-1_amd64.deb
stella_4.7-1_i386.deb
stella_4.7-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
stella-4.6.7-2.i386.rpm
stella-4.6.7-2.x86_64.rpm
stella-4.7-2.i386.rpm
stella-4.7-2.x86_64.rpm
* Source code distribution for all platforms :
stella-4.6.7-src.tar.gz
stella-4.7-src.tar.gz
Distribution Site

2
Changes.txt
View File

@ -12,7 +12,7 @@
Release History
===========================================================================
4.6.7 to 4.7: (January xx, 2016)
4.6.7 to 4.7: (January 25, 2016)
* Improved paddle emulation in several ways:

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
stella (4.7-1) stable; urgency=high
* Version 4.7 release
-- Stephen Anthony <stephena@users.sf.net> Mon, 25 Jan 2016 17:09:59 -0230
stella (4.6.7-1) stable; urgency=high
* Version 4.6.7 release

4
docs/index.html
View File

@ -10,7 +10,7 @@
<br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 4.6.7</b></h4></center>
<center><h4><b>Release 4.7</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>
@ -54,7 +54,7 @@
<br><br><br>
<center><b>February 1999 - October 2015</b></center>
<center><b>February 1999 - January 2016</b></center>
<center><b>The Stella Team</b></center>
<center><b><a href="http://stella.sourceforge.net">Stella Homepage</a></b></center>

2
src/common/Version.hxx
View File

@ -22,7 +22,7 @@
#include <cstdlib>
#define STELLA_VERSION "4.7_pre"
#define STELLA_VERSION "4.7"
#define STELLA_BUILD atoi("$Rev$" + 6)
#endif

6
src/emucore/Cart.cxx
View File

@ -17,7 +17,6 @@
// $Id$
//============================================================================
#include <cassert>
#include <cstring>
#include <sstream>
@ -78,8 +77,7 @@ unique_ptr<Cartridge> Cartridge::create(const BytePtr& img, uInt32 size,
unique_ptr<Cartridge> cartridge;
string type = dtype;
// For now, we convert from BytePtr to the raw pointer
// Eventually, the Cartridge hierarchy should probably use BytePtr directly
// The cartridge hierarchy uses raw pointers ...
const uInt8* image = img.get();
// Collect some info about the ROM
@ -964,7 +962,7 @@ bool Cartridge::isProbablyX07(const uInt8* image, uInt32 size)
string Cartridge::myAboutString= "";
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge::BankswitchType Cartridge::ourBSList[] = {
Cartridge::BankswitchType Cartridge::ourBSList[ourNumBSTypes] = {
{ "AUTO", "Auto-detect" },
{ "0840", "0840 (8K ECONObank)" },
{ "2IN1", "2IN1 Multicart (4-32K)" },

30
src/emucore/TrackBall.cxx
View File

@ -146,33 +146,3 @@ bool TrackBall::setMouseControl(
(xid != -1 || yid != -1);
return true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableTB_H[2][2] = {
{ 0x40, 0x00 }, { 0xc0, 0x80 }
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableTB_V[2][2] = {
{ 0x00, 0x10 }, { 0x20, 0x30 }
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableST_H[4] = {
0x00, 0x80, 0xc0, 0x40
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableST_V[4] = {
0x00, 0x10, 0x30, 0x20
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableAM_H[4] = {
0x00, 0x10, 0x50, 0x40
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const uInt32 TrackBall::ourTrakBallTableAM_V[4] = {
0x00, 0x80, 0xa0, 0x20
};

12
src/emucore/TrackBall.hxx
View File

@ -110,16 +110,16 @@ class TrackBall : public Controller
int myMouseEnabled;
// CX-22
static const uInt32 ourTrakBallTableTB_H[2][2];
static const uInt32 ourTrakBallTableTB_V[2][2];
const uInt32 ourTrakBallTableTB_H[2][2] = {{ 0x40, 0x00 }, { 0xc0, 0x80 }};
const uInt32 ourTrakBallTableTB_V[2][2] = {{ 0x00, 0x10 }, { 0x20, 0x30 }};
// ST mouse / CX-80
static const uInt32 ourTrakBallTableST_H[4];
static const uInt32 ourTrakBallTableST_V[4];
const uInt32 ourTrakBallTableST_H[4] = { 0x00, 0x80, 0xc0, 0x40 };
const uInt32 ourTrakBallTableST_V[4] = { 0x00, 0x10, 0x30, 0x20 };
// Amiga mouse
static const uInt32 ourTrakBallTableAM_H[4];
static const uInt32 ourTrakBallTableAM_V[4];
const uInt32 ourTrakBallTableAM_H[4] = { 0x00, 0x10, 0x50, 0x40 };
const uInt32 ourTrakBallTableAM_V[4] = { 0x00, 0x80, 0xa0, 0x20 };
private:
// Following constructors and assignment operators not supported

2
src/macosx/Info-Stella.plist
View File

@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
<string>4.6.7</string>
<string>4.7</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key>

5
src/unix/stella.spec
View File

@ -1,5 +1,5 @@
%define name stella
%define version 4.6.7
%define version 4.7
%define rel 1
%define enable_sound 1
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png
%changelog
* Mon Jan 25 2016 Stephen Anthony <stephena@users.sf.net> 4.7-1
- Version 4.7 release
* Wed Oct 28 2015 Stephen Anthony <stephena@users.sf.net> 4.6.7-1
- Version 4.6.7 release

8
src/windows/stella.rc
View File

@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,6,7,0
PRODUCTVERSION 4,6,7,0
FILEVERSION 4,7,0,0
PRODUCTVERSION 4,7,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.6.7"
VALUE "FileVersion", "4.7"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2016 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
VALUE "ProductVersion", "4.6.7"
VALUE "ProductVersion", "4.7"
END
END
BLOCK "VarFileInfo"