diff --git a/Changes.txt b/Changes.txt index 2452472df..2952f2ae0 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -6.0.2 to 6.1: (MM dd, 2020) +6.0.2 to 6.1: (March 22, 2020) * IMPORTANT NOTES: - Because of major event remapping changes, all remappings will be reset diff --git a/debian/changelog b/debian/changelog index 3d045e4ef..553ddda1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (6.1-1) stable; urgency=high + + * Version 6.1 release + + -- Stephen Anthony Sun, 22 Mar 2020 17:09:59 -0230 + + stella (6.0.2-1) stable; urgency=high * Version 6.0.2 release diff --git a/docs/index_r77.html b/docs/index_r77.html index 6050d1367..710f5e561 100644 --- a/docs/index_r77.html +++ b/docs/index_r77.html @@ -58,7 +58,7 @@

Stella for RetroN 77

Atari 2600 VCS emulator

-
Release 6.1 Beta 1
+
Release 6.1

Quick Navigation Guide


diff --git a/src/common/StateManager.hxx b/src/common/StateManager.hxx index 41bed3517..09de785fb 100644 --- a/src/common/StateManager.hxx +++ b/src/common/StateManager.hxx @@ -18,7 +18,7 @@ #ifndef STATE_MANAGER_HXX #define STATE_MANAGER_HXX -#define STATE_HEADER "06000008state" +#define STATE_HEADER "06010000state" class OSystem; class RewindManager; diff --git a/src/common/Version.hxx b/src/common/Version.hxx index 2c534019a..51da31362 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -18,7 +18,7 @@ #ifndef VERSION_HXX #define VERSION_HXX -#define STELLA_VERSION "6.1_rc1" -#define STELLA_BUILD "5657" +#define STELLA_VERSION "6.1" +#define STELLA_BUILD "5729" #endif diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 3a7e0841e..5a2617409 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -745,7 +745,7 @@ void Console::updateVcenter(Int32 vcenter) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Console::changeScanlineAdjust(int direction) { - Int32 newAdjustVSize = myTIA->adjustVSize();; + Int32 newAdjustVSize = myTIA->adjustVSize(); if (direction != -1 && direction != +1) return; diff --git a/src/emucore/tia/frame-manager/FrameManager.cxx b/src/emucore/tia/frame-manager/FrameManager.cxx index 81d8d75d7..477f0fd2f 100644 --- a/src/emucore/tia/frame-manager/FrameManager.cxx +++ b/src/emucore/tia/frame-manager/FrameManager.cxx @@ -236,7 +236,7 @@ void FrameManager::recalculateMetrics() { throw runtime_error("frame manager: invalid TV mode"); } - myHeight = BSPF::clamp(roundf(static_cast(baseHeight) * (1.f - myVSizeAdjust / 100.f)), 0, myFrameLines); + myHeight = BSPF::clamp(roundf(static_cast(baseHeight) * (1.F - myVSizeAdjust / 100.F)), 0, myFrameLines); myYStart = BSPF::clamp(ystartBase + (baseHeight - static_cast(myHeight)) / 2 - myVcenter, 0, myFrameLines); // TODO: why "- 1" here: ??? myMaxVcenter = BSPF::clamp(ystartBase + (baseHeight - static_cast(myHeight)) / 2 - 1, 0, TIAConstants::maxVcenter); diff --git a/src/unix/stella.spec b/src/unix/stella.spec index e4f1dbe65..09d4d2827 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog -* ddd Jan d 2020 Stephen Anthony 6.1-1 +* Sun Mar 22 2020 Stephen Anthony 6.1-1 - Version 6.1 release * Fri Oct 11 2019 Stephen Anthony 6.0.2-1