This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella.
commit dc9f9e8809c06fc5e9da3d084d901631a8f69730 Author: Stephen Kitt <[email protected]> Date: Mon Oct 12 18:19:16 2015 +0200 Imported Upstream version 4.6.6 --- Announce.txt | 22 +++++++++++----------- Changes.txt | 14 ++++++++++++-- debian/changelog | 7 +++++++ docs/index.html | 10 ++++++++-- src/common/Version.hxx | 6 +++--- src/emucore/CartMDM.cxx | 10 +++++----- src/emucore/Console.cxx | 10 +++++++++- src/emucore/Console.hxx | 9 +++++++-- src/emucore/EventHandler.cxx | 6 +++++- src/emucore/Settings.cxx | 3 ++- src/emucore/TIA.cxx | 24 ++++++++++++++++++++---- src/emucore/TIA.hxx | 17 +++++++++++++++-- src/macosx/Info-Stella.plist | 2 +- src/unix/stella.spec | 5 ++++- src/windows/stella.rc | 8 ++++---- 15 files changed, 113 insertions(+), 40 deletions(-) diff --git a/Announce.txt b/Announce.txt index 4524f6b..e136aae 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 4.6.5 for Linux, MacOSX and Windows + Release 4.6.6 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.5 release of Stella for Linux, Mac OSX and Windows. The +This is the 4.6.6 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.5-win32.exe (32-bit EXE installer) - Stella-4.6.5-x64.exe (64-bit EXE installer) - Stella-4.6.5-windows.zip (32/64 bit versions) + 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) * Binary distribution for MacOS X 10.7 and above : - Stella-4.6.5-macosx.dmg (64-bit Intel) + Stella-4.6.6-macosx.dmg (64-bit Intel) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_4.6.5-1_i386.deb - stella_4.6.5-1_amd64.deb + stella_4.6.6-1_i386.deb + stella_4.6.6-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-4.6.5-2.i386.rpm - stella-4.6.5-2.x86_64.rpm + stella-4.6.6-2.i386.rpm + stella-4.6.6-2.x86_64.rpm * Source code distribution for all platforms : - stella-4.6.5-src.tar.gz + stella-4.6.6-src.tar.gz Distribution Site diff --git a/Changes.txt b/Changes.txt index 58016d6..7fbb6a9 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,6 +12,18 @@ Release History =========================================================================== +4.6.5 to 4.6.6: (October 11, 2015) + + * Added 'Alt/Cmd + j' shortcut key and 'tv.jitter' commandline argument + to toggle the TV scanline jittering emulation added in the last + release. Also, this jittering now defaults to off. + + * 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) * Added mappable events for toggling TV color/BW, left difficulty A/B @@ -50,8 +62,6 @@ * Updated included PNG library to latest stable version. --Have fun! - 4.6 to 4.6.1: (April 22, 2015) diff --git a/debian/changelog b/debian/changelog index 5476845..5fdb8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (4.6.6-1) stable; urgency=high + + * Version 4.6.6 release + + -- Stephen Anthony <[email protected]> Sun, 11 Oct 2015 12:11:09 -0230 + + stella (4.6.5-1) stable; urgency=high * Version 4.6.5 release diff --git a/docs/index.html b/docs/index.html index 167ab06..6c41c99 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.5</b></h4></center> + <center><h4><b>Release 4.6.6</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 - September 2015</b></center> + <center><b>February 1999 - October 2015</b></center> <center><b>The Stella Team</b></center> <center><b><a href="http://stella.sourceforge.net";>Stella Homepage</a></b></center> @@ -1447,6 +1447,12 @@ <td>Shift-Alt + .</td> <td>Shift-Cmd + .</td> </tr> + + <tr> + <td>Toggle TV scanline 'jitter'</td> + <td>Shift-Alt + j</td> + <td>Shift-Cmd + j</td> + </tr> </table> <p><b>Other Keys (cannot be remapped, except those marked with '*')</b></p> diff --git a/src/common/Version.hxx b/src/common/Version.hxx index 05f757e..9633de4 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 3219 2015-09-25 23:08:08Z stephena $ +// $Id: Version.hxx 3226 2015-10-11 15:19:16Z stephena $ //============================================================================ #ifndef VERSION_HXX @@ -22,7 +22,7 @@ #include <cstdlib> -#define STELLA_VERSION "4.6.5" -#define STELLA_BUILD atoi("$Rev: 3219 $" + 6) +#define STELLA_VERSION "4.6.6" +#define STELLA_BUILD atoi("$Rev: 3226 $" + 6) #endif diff --git a/src/emucore/CartMDM.cxx b/src/emucore/CartMDM.cxx index 9d9b4b3..48c2a97 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 3131 2015-01-01 03:49:32Z stephena $ +// $Id: CartMDM.cxx 3225 2015-10-11 14:51:50Z stephena $ //============================================================================ #include <cstring> @@ -71,7 +71,7 @@ void CartridgeMDM::install(System& system) // Set the page accessing methods for the hot spots System::PageAccess access(this, System::PA_READWRITE); - for(uInt32 i = 0x0800; i < 0x0FFF; i += (1 << System::PAGE_SHIFT)) + for(uInt32 i = 0x0800; i < 0x0BFF; i += (1 << System::PAGE_SHIFT)) mySystem->setPageAccess(i >> System::PAGE_SHIFT, access); // Install pages for bank 0 @@ -82,8 +82,8 @@ void CartridgeMDM::install(System& system) 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 - 0xFFF - if(address < 0xC00) + // get here when the addresses are from 0x800 - 0xBFF + if((address & 0xBFF) < 0xC00) 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 < 0xC00) + if((address & 0xBFF) < 0xC00) bank(address & 0x0FF); int hotspot = ((address & 0x0F00) >> 8) - 8; diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 6da84d5..70c9836 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.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: Console.cxx 3204 2015-09-14 18:14:00Z stephena $ +// $Id: Console.cxx 3221 2015-09-29 21:14:12Z stephena $ //============================================================================ #include <cassert> @@ -892,6 +892,14 @@ void Console::toggleFixedColors() const } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +void Console::toggleJitter() const +{ + bool enabled = myTIA->toggleJitter(); + string message = string("TV scanline jitter") + (enabled ? " enabled" : " disabled"); + myOSystem.frameBuffer().showMessage(message); +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Console::attachDebugger(Debugger& dbg) { #ifdef DEBUGGER_SUPPORT diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx index c6bdc4c..b1bdcbb 100644 --- a/src/emucore/Console.hxx +++ b/src/emucore/Console.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: Console.hxx 3203 2015-09-13 23:23:12Z stephena $ +// $Id: Console.hxx 3221 2015-09-29 21:14:12Z stephena $ //============================================================================ #ifndef CONSOLE_HXX @@ -56,7 +56,7 @@ struct ConsoleInfo This class represents the entire game console. @author Bradford W. Mott - @version $Id: Console.hxx 3203 2015-09-13 23:23:12Z stephena $ + @version $Id: Console.hxx 3221 2015-09-29 21:14:12Z stephena $ */ class Console : public Serializable { @@ -280,6 +280,11 @@ class Console : public Serializable */ void toggleFixedColors() const; + /** + Toggles the TIA 'scanline jitter' mode. + */ + void toggleJitter() const; + private: /** Sets various properties of the TIA (YStart, Height, etc) based on diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 2534626..befea1a 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.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: EventHandler.cxx 3209 2015-09-15 15:50:25Z stephena $ +// $Id: EventHandler.cxx 3221 2015-09-29 21:14:12Z stephena $ //============================================================================ #include <sstream> @@ -424,6 +424,10 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state) myOSystem.console().togglePhosphor(); break; + case KBDK_J: // Alt-j toggles scanline jitter + myOSystem.console().toggleJitter(); + break; + case KBDK_L: myOSystem.frameBuffer().toggleFrameStats(); break; diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index 655d25e..eaab69a 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.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: Settings.cxx 3205 2015-09-14 21:33:50Z stephena $ +// $Id: Settings.cxx 3221 2015-09-29 21:14:12Z stephena $ //============================================================================ #include <cassert> @@ -58,6 +58,7 @@ Settings::Settings(OSystem& osystem) setInternal("tv.filter", "0"); setInternal("tv.scanlines", "25"); setInternal("tv.scaninter", "true"); + setInternal("tv.jitter", "false"); // TV options when using 'custom' mode setInternal("tv.contrast", "0.0"); setInternal("tv.brightness", "0.0"); diff --git a/src/emucore/TIA.cxx b/src/emucore/TIA.cxx index 774988c..a8d29da 100644 --- a/src/emucore/TIA.cxx +++ b/src/emucore/TIA.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: TIA.cxx 3209 2015-09-15 15:50:25Z stephena $ +// $Id: TIA.cxx 3221 2015-09-29 21:14:12Z stephena $ //============================================================================ #include <cassert> @@ -58,6 +58,7 @@ TIA::TIA(Console& console, Sound& sound, Settings& settings) myPALFrameCounter(0), myBitsEnabled(true), myCollisionsEnabled(true), + myJitterEnabled(false), myNextFrameJitter(0), myCurrentFrameJitter(0) @@ -80,6 +81,9 @@ TIA::TIA(Console& console, Sound& sound, Settings& settings) // Should undriven pins be randomly pulled high or low? myTIAPinsDriven = mySettings.getBool("tiadriven"); + + // Enable scanline jittering + myJitterEnabled = mySettings.getBool("tv.jitter"); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -657,7 +661,7 @@ inline void TIA::endFrame() } // Account for frame jitter, skipping the first few frames - if(myFrameCounter > 3) + if(myJitterEnabled && myFrameCounter > 3) { // Set the jitter amount for the current frame myCurrentFrameJitter = myNextFrameJitter * 160; @@ -901,6 +905,19 @@ bool TIA::driveUnusedPinsRandom(uInt8 mode) return myTIAPinsDriven; } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +bool TIA::toggleJitter(uInt8 mode) +{ + // If mode is 0 or 1, use it as a boolean (off or on) + // Otherwise, flip the state + bool on = (mode == 0 || mode == 1) ? bool(mode) : + myJitterEnabled = !myJitterEnabled; + myJitterEnabled = on; + mySettings.setValue("tv.jitter", myJitterEnabled); + + return myJitterEnabled; +} + #ifdef DEBUGGER_SUPPORT // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void TIA::updateScanline() @@ -909,8 +926,7 @@ void TIA::updateScanline() if(!myPartialFrameFlag) startFrame(); - // true either way: - myPartialFrameFlag = true; + myPartialFrameFlag = true; // true either way int totalClocks = (mySystem->cycles() * 3) - myClockWhenFrameStarted; int endClock = ((totalClocks + 228) / 228) * 228; diff --git a/src/emucore/TIA.hxx b/src/emucore/TIA.hxx index 3b0897a..aed8ff3 100644 --- a/src/emucore/TIA.hxx +++ b/src/emucore/TIA.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: TIA.hxx 3199 2015-09-11 22:46:13Z stephena $ +// $Id: TIA.hxx 3221 2015-09-29 21:14:12Z stephena $ //============================================================================ #ifndef TIA_HXX @@ -41,7 +41,7 @@ class Sound; be displayed on screen. @author Bradford W. Mott - @version $Id: TIA.hxx 3199 2015-09-11 22:46:13Z stephena $ + @version $Id: TIA.hxx 3221 2015-09-29 21:14:12Z stephena $ */ class TIA : public Device { @@ -317,6 +317,16 @@ class TIA : public Device */ bool driveUnusedPinsRandom(uInt8 mode = 2); + /** + Enables/disable/toggle 'scanline jittering' mode. + + @param mode 1/0 indicates on/off, otherwise flip from + its current state + + @return Whether the mode was enabled or disabled + */ + bool toggleJitter(uInt8 mode = 2); + #ifdef DEBUGGER_SUPPORT /** This method should be called to update the TIA with a new scanline. @@ -616,6 +626,9 @@ class TIA : public Device // Whether TIA bits/collisions are currently enabled/disabled bool myBitsEnabled, myCollisionsEnabled; + // Whether to enable jitter emulation + bool myJitterEnabled; + // Derived from the difference between the scanline counts of the // current and prior frames. If non-zero the next frame should jitter. Int32 myNextFrameJitter; diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index d94663a..b7170ff 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.5</string> + <string>4.6.6</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 e4c2464..b9f955e 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 4.6.5 +%define version 4.6.6 %define rel 1 %define enable_sound 1 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Sun Oct 11 2015 Stephen Anthony <[email protected]> 4.6.6-1 +- Version 4.6.6 release + * Sat Sep 26 2015 Stephen Anthony <[email protected]> 4.6.5-1 - Version 4.6.5 release diff --git a/src/windows/stella.rc b/src/windows/stella.rc index aede1c1..98a4266 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,5,0 - PRODUCTVERSION 4,6,5,0 + FILEVERSION 4,6,6,0 + PRODUCTVERSION 4,6,6,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.5" + VALUE "FileVersion", "4.6.6" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2015 The Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "4.6.5" + VALUE "ProductVersion", "4.6.6" END END BLOCK "VarFileInfo" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
