[stella] 01/03: Imported Upstream version 4.6.7
Stephen Kitt
skitt at moszumanska.debian.org
Sat Oct 31 22:36:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository stella.
commit 62c6f36910e64c3516420befcedd7c8e967d8553
Author: Stephen Kitt <steve at sk2.org>
Date: Wed Oct 28 23:24:03 2015 +0100
Imported Upstream version 4.6.7
---
Announce.txt | 22 +++++++++++-----------
Changes.txt | 12 ++++++++++--
debian/changelog | 7 +++++++
docs/index.html | 2 +-
src/common/Version.hxx | 6 +++---
src/emucore/CartMDM.cxx | 6 +++---
src/emucore/Paddles.cxx | 6 +++---
src/macosx/Info-Stella.plist | 2 +-
src/unix/stella.spec | 5 ++++-
src/windows/stella.rc | 8 ++++----
10 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/Announce.txt b/Announce.txt
index e136aae..17a2213 100644
--- a/Announce.txt
+++ b/Announce.txt
@@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
- Release 4.6.6 for Linux, MacOSX and Windows
+ Release 4.6.7 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.6.6 release of Stella for Linux, Mac OSX and Windows. The
+This is the 4.6.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.6-win32.exe (32-bit EXE installer)
- Stella-4.6.6-x64.exe (64-bit EXE installer)
- Stella-4.6.6-windows.zip (32/64 bit versions)
+ 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)
* Binary distribution for MacOS X 10.7 and above :
- Stella-4.6.6-macosx.dmg (64-bit Intel)
+ Stella-4.6.7-macosx.dmg (64-bit Intel)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
- stella_4.6.6-1_i386.deb
- stella_4.6.6-1_amd64.deb
+ stella_4.6.7-1_i386.deb
+ stella_4.6.7-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
- stella-4.6.6-2.i386.rpm
- stella-4.6.6-2.x86_64.rpm
+ stella-4.6.7-2.i386.rpm
+ stella-4.6.7-2.x86_64.rpm
* Source code distribution for all platforms :
- stella-4.6.6-src.tar.gz
+ stella-4.6.7-src.tar.gz
Distribution Site
diff --git a/Changes.txt b/Changes.txt
index 7fbb6a9..275ac85 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,6 +12,16 @@
Release History
===========================================================================
+4.6.6 to 4.6.7: (October 28, 2015)
+
+ * Fixed bug when using real paddles plugged into a Stelladaptor
+ 2600-daptor device; the movement was very erratic.
+
+ * Fixed small logic error in 'MDM' bankswitching scheme.
+
+-Have fun!
+
+
4.6.5 to 4.6.6: (October 11, 2015)
* Added 'Alt/Cmd + j' shortcut key and 'tv.jitter' commandline argument
@@ -21,8 +31,6 @@
* Fixed bug in 'MDM' bankswitch scheme; bankswitching wasn't being
done under certain circumstances.
--Have fun!
-
4.6.1 to 4.6.5: (September 26, 2015)
diff --git a/debian/changelog b/debian/changelog
index 5fdb8a8..482d48d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stella (4.6.7-1) stable; urgency=high
+
+ * Version 4.6.7 release
+
+ -- Stephen Anthony <stephena at users.sf.net> Wed, 28 Oct 2015 17:09:59 -0230
+
+
stella (4.6.6-1) stable; urgency=high
* Version 4.6.6 release
diff --git a/docs/index.html b/docs/index.html
index 6c41c99..facd6f0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -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.6</b></h4></center>
+ <center><h4><b>Release 4.6.7</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 9633de4..0db7f7f 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// $Id: Version.hxx 3226 2015-10-11 15:19:16Z stephena $
+// $Id: Version.hxx 3231 2015-10-28 19:52:12Z stephena $
//============================================================================
#ifndef VERSION_HXX
@@ -22,7 +22,7 @@
#include <cstdlib>
-#define STELLA_VERSION "4.6.6"
-#define STELLA_BUILD atoi("$Rev: 3226 $" + 6)
+#define STELLA_VERSION "4.6.7"
+#define STELLA_BUILD atoi("$Rev: 3231 $" + 6)
#endif
diff --git a/src/emucore/CartMDM.cxx b/src/emucore/CartMDM.cxx
index 48c2a97..bd441c7 100644
--- a/src/emucore/CartMDM.cxx
+++ b/src/emucore/CartMDM.cxx
@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// $Id: CartMDM.cxx 3225 2015-10-11 14:51:50Z stephena $
+// $Id: CartMDM.cxx 3228 2015-10-12 15:49:55Z stephena $
//============================================================================
#include <cstring>
@@ -83,7 +83,7 @@ uInt8 CartridgeMDM::peek(uInt16 address)
{
// Because of the way we've set up accessing above, we can only
// get here when the addresses are from 0x800 - 0xBFF
- if((address & 0xBFF) < 0xC00)
+ if((address & 0x1C00) == 0x0800)
bank(address & 0x0FF);
int hotspot = ((address & 0x0F00) >> 8) - 8;
@@ -97,7 +97,7 @@ bool CartridgeMDM::poke(uInt16 address, uInt8 value)
// about those below $1000
if(!(address & 0x1000))
{
- if((address & 0xBFF) < 0xC00)
+ if((address & 0x1C00) == 0x0800)
bank(address & 0x0FF);
int hotspot = ((address & 0x0F00) >> 8) - 8;
diff --git a/src/emucore/Paddles.cxx b/src/emucore/Paddles.cxx
index 53a3825..fc40785 100644
--- a/src/emucore/Paddles.cxx
+++ b/src/emucore/Paddles.cxx
@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
-// $Id: Paddles.cxx 3204 2015-09-14 18:14:00Z stephena $
+// $Id: Paddles.cxx 3229 2015-10-28 15:27:34Z stephena $
//============================================================================
#include <cassert>
@@ -269,12 +269,12 @@ void Paddles::update()
int sa_yaxis = myEvent.get(myP1AxisValue);
if(abs(myLastAxisX - sa_xaxis) > 10)
{
- myAnalogPinValue[Nine] = Int32(1400000 * (32767 - Int16(sa_xaxis)) / 65536.0);
+ myAnalogPinValue[Nine] = Int32(1400000 * ((32767 - Int16(sa_xaxis)) / 65536.0));
sa_changed = true;
}
if(abs(myLastAxisY - sa_yaxis) > 10)
{
- myAnalogPinValue[Five] = Int32(1400000 * (32767 - Int16(sa_yaxis)) / 65536.0);
+ myAnalogPinValue[Five] = Int32(1400000 * ((32767 - Int16(sa_yaxis)) / 65536.0));
sa_changed = true;
}
myLastAxisX = sa_xaxis;
diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist
index b7170ff..9ad47c6 100644
--- a/src/macosx/Info-Stella.plist
+++ b/src/macosx/Info-Stella.plist
@@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
- <string>4.6.6</string>
+ <string>4.6.7</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key>
diff --git a/src/unix/stella.spec b/src/unix/stella.spec
index b9f955e..0e82239 100644
--- a/src/unix/stella.spec
+++ b/src/unix/stella.spec
@@ -1,5 +1,5 @@
%define name stella
-%define version 4.6.6
+%define version 4.6.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
+* Wed Oct 28 2015 Stephen Anthony <stephena at users.sf.net> 4.6.7-1
+- Version 4.6.7 release
+
* Sun Oct 11 2015 Stephen Anthony <stephena at users.sf.net> 4.6.6-1
- Version 4.6.6 release
diff --git a/src/windows/stella.rc b/src/windows/stella.rc
index 98a4266..a4ce12f 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,6,6,0
- PRODUCTVERSION 4,6,6,0
+ FILEVERSION 4,6,7,0
+ PRODUCTVERSION 4,6,7,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.6"
+ VALUE "FileVersion", "4.6.7"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2015 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
- VALUE "ProductVersion", "4.6.6"
+ VALUE "ProductVersion", "4.6.7"
END
END
BLOCK "VarFileInfo"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git
More information about the Pkg-games-commits
mailing list