Some documentation updates for the upcoming release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2469 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

Announce.txt

@@ -9,7 +9,7 @@
      SSSS     ttt  eeeee llll llll  aaaaa
 
 ===========================================================================
-                Release 3.6 for Linux, MacOSX and Windows
+                Release 3.7 for Linux, MacOSX and Windows
 ===========================================================================
 
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@@ -21,31 +21,31 @@ 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 3.6 release of Stella for Linux, Mac OSX and Windows.  The
+This is the 3.7 release of Stella for Linux, Mac OSX and Windows.  The
 distributions currently available are:
 
   * Binaries for Windows XP/Vista/7 :
-      Stella-3.6-win32.exe   (32-bit EXE installer)
+      Stella-3.7-win32.exe   (32-bit EXE installer)
-      Stella-3.6-x64.exe     (64-bit EXE installer)
+      Stella-3.7-x64.exe     (64-bit EXE installer)
-      Stella-3.6-windows.zip (32/64 bit versions)
+      Stella-3.7-windows.zip (32/64 bit versions)
 
   * Binaries for Windows 98/2000 :
-      Stella-3.6_98_2k-windows.zip (32-bit for Windows 98/2000)
+      Stella-3.7_98_2k-windows.zip (32-bit for Windows 98/2000)
 
   * Binary distribution for MacOSX 32-bit & 64-bit :
-      Stella-3.6-macosx.dmg (32-bit Universal Binary)
+      Stella-3.7-macosx.dmg (32-bit Universal Binary)
-      Stella-3.6_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
+      Stella-3.7_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
 
   * Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
-      stella_3.6-1_i386.deb
+      stella_3.7-1_i386.deb
-      stella_3.6-1_amd64.deb
+      stella_3.7-1_amd64.deb
 
   * Binary distribution in 32-bit & 64-bit RPM format :
-      stella-3.6-2.i386.rpm
+      stella-3.7-2.i386.rpm
-      stella-3.6-2.x86_64.rpm
+      stella-3.7-2.x86_64.rpm
 
   * Source code distribution for all platforms :
-      stella-3.6-src.tar.gz
+      stella-3.7-src.tar.gz
 
 PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH
 REQUESTS WILL BE IGNORED!

Changes.txt

@@ -12,7 +12,15 @@
                                Release History
 ===========================================================================
 
-3.6.1 to 3.7: (May xx, 2012)
+3.6.1 to 3.7: (May 18, 2012)
+
+  * Added Blargg TV effects, with presets for Composite, S-video, RGB,
+    and badly adjusted TV, and well as a custom mode with full
+    configurability of contrast, brightness, gamma, etc.  Many
+    keyboard shortcuts and commandline arguments were added to support
+    this; see the documentation for a detailed explanation.  These
+    effects are OpenGL-only.  Special thanks to Ian Bogost and the
+    Georgia Tech Atari Team for the preliminary implementation.
 
   * Updated the CompuMate keyboard handler to recognize more keys on an
     actual keyboard, instead of having to remember the weird combinations

Readme.txt

@@ -1,4 +1,4 @@
-This is release 3.6 of Stella.  Stella is a multi-platform Atari 2600 VCS
+This is release 3.7 of Stella.  Stella is a multi-platform Atari 2600 VCS
 emulator which allows you to play all of your favourite Atari 2600 games
 on your PC.  You'll find the Stella Users Manual in the docs subdirectory.
 If you'd like to verify that you have the latest release of Stella visit
@@ -9,4 +9,4 @@ the Stella Website at:
 Enjoy,
 
 The Stella Team
-March 16, 2012
+May 18, 2012

debian/changelog

@@ -1,3 +1,10 @@
+stella (3.7-1) stable; urgency=high
+
+  * Version 3.7 release
+
+ -- Stephen Anthony <stephena@users.sf.net>  Fri, 18 May 2012 18:38:25 +0200
+
+
 stella (3.6-1) stable; urgency=high
 
   * Version 3.6 release

docs/index.html

@@ -54,7 +54,7 @@
 
   <br><br><br>
 
-  <center><b>February 1999 - April 2012</b></center>
+  <center><b>February 1999 - May 2012</b></center>
     <center><b>The Stella Team</b></center>
   <center><b><a href="http://stella.sourceforge.net">Stella Homepage</a></b></center>
 
@@ -262,7 +262,7 @@
       computer's mouse</li>
     <li>Emulates Spectravideo CompuMate system using your computer's keyboard,
       including mapping of CompuMate 'Backspace', 'Space' and 'Enter' functionality to
-      to the actual keys on your keyboard.</li>
+      to the actual keys on your keyboard</li>
     <li>Emulates the Mindlink Controller using your computer's mouse</li>
     <li>Support for real Atari 2600 controllers using the
       <a href="http://www.stelladaptor.com">Stelladaptor</a> and
@@ -286,10 +286,10 @@
     <li>TIA emulation supports full collision checking, with ability to disable
       both TIA sprites and collisions for each object separately</li>
     <li>Built-in extensive debugger, including the Distella disassembler</li>
-<!-- FIXME 
+    <li>Emulation of CRT TV systems using <a href="http://slack.net/~ant/libs/ntsc.html">
-    <li>Emulation of CRT TV systems with OpenGL shaders, including texturing,
+      Blargg filtering</a>, including presets for several common TV outputs
-      colour bleed, RF noise, and phosphor burn-off</li>
+      (composite, S-video, RGB, etc), and ability to fully customize
--->
+      many attributes (contrast, brightness, saturation, gamma, etc).</li>
     <li>Built-in ROM database with information compiled by RomHunter</li>
   </ul>
 
@@ -313,9 +313,7 @@
     <li>Enough RAM for the OS + 64MB RAM for the emulation; 128MB+ highly recommended</li>
     <li>15/16 bit color minimum; 24/32 bit color graphics card highly recommended</li>
     <li>SDL version 1.2.10 or greater, latest version highly recommended</li>
-<!-- FIXME
+    <li>CRT TV emulation effects require OpenGL/OpenGLES 1.2</li>
-    <li>CRT emulation effects require OpenGL 2.0 with GLSL (GL shading language) support</li>
--->
     <li>Joysticks or gamepads are highly recommended</li>
     <li>Mouse or <a href="http://www.stelladaptor.com">Stelladaptor</a> / 
     <a href="http://2600-daptor.com">2600-adaptor</a> with real paddles required for paddle emulation</li>
@@ -1294,6 +1292,90 @@
 
   </table>
 
+  <p><b>TV effects (only active in TIA mode when using OpenGL rendering)</b></p>
+
+  <table BORDER=2 cellpadding=5>
+    <tr>
+      <th>Function</th>
+      <th>Key (Standard)</th>
+      <th>Key (MacOSX)</th>
+    </tr>
+    <tr>
+      <td>Disable TV effects</td>
+      <td>Alt + 1</td>
+      <td>Cmd + 1</td>
+    </tr>
+    <tr>
+      <td>Select 'Composite' preset</td>
+      <td>Alt + 2</td>
+      <td>Cmd + 2</td>
+    </tr>
+    <tr>
+      <td>Select 'S-video' preset</td>
+      <td>Alt + 3</td>
+      <td>Cmd + 3</td>
+    </tr>
+    <tr>
+      <td>Select 'RGB' preset</td>
+      <td>Alt + 4</td>
+      <td>Cmd + 4</td>
+    </tr>
+    <tr>
+      <td>Select 'Badly adjusted' preset</td>
+      <td>Alt + 5</td>
+      <td>Cmd + 5</td>
+    </tr>
+    <tr>
+      <td>Select 'Custom' preset</td>
+      <td>Alt + 6</td>
+      <td>Cmd + 6</td>
+    </tr>
+    <tr>
+      <td>Decrease scanline intensity</td>
+      <td>Shift-Alt + 7</td>
+      <td>Shift-Cmd + 7</td>
+    </tr>
+    <tr>
+      <td>Increase scanline intensity</td>
+      <td>Alt + 7</td>
+      <td>Cmd + 7</td>
+    </tr>
+    <tr>
+      <td>Disable scanline interpolation</td>
+      <td>Shift-Alt + 8</td>
+      <td>Shift-Cmd + 8</td>
+    </tr>
+    <tr>
+      <td>Enable scanline interpolation</td>
+      <td>Alt + 8</td>
+      <td>Cmd + 8</td>
+    </tr>
+    <tr>
+      <td>Select previous 'Custom' mode attribute (*)</td>
+      <td>Shift-Alt + 9</td>
+      <td>Shift-Cmd + 9</td>
+    </tr>
+    <tr>
+      <td>Select next 'Custom' mode attribute (*)</td>
+      <td>Alt + 9</td>
+      <td>Cmd + 9</td>
+    </tr>
+    <tr>
+      <td>Decrease 'Custom' selected attribute value (*)</td>
+      <td>Shift-Alt + 0</td>
+      <td>Shift-Cmd + 0</td>
+    </tr>
+    <tr>
+      <td>Increase 'Custom' selected attribute value (*)</td>
+      <td>Alt + 0</td>
+      <td>Cmd + 0</td>
+    </tr>
+    <tr>
+      <td colspan="3"><center><font size="-1">
+      Items marked as (*) are only available in 'Custom' preset mode</font></center></td>
+    </tr>
+  </table>
+
   <a name="DeveloperKeys"></a>
   <p><b>Developer Keys in TIA mode (cannot be remapped)</b></p>
 
@@ -1476,12 +1558,6 @@
       <td>Control + f</td>
     </tr>
 
-    <tr>
-      <td>Toggle Blargg NTSC filtering</td>
-      <td>Alt + f</td>
-      <td>Cmd + f</td>
-    </tr>
-
     <tr>
       <td>Save current properties to a new properties file</td>
       <td>Control + s</td>

src/macosx/Info-Stella.plist

@@ -53,7 +53,7 @@
 	<key>CFBundleSignature</key>
 	<string>StLa</string>
 	<key>CFBundleVersion</key>
-	<string>3.6</string>
+	<string>3.7</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain.nib</string>
 	<key>NSPrincipalClass</key>

src/unix/stella.SlackBuild

@@ -13,7 +13,7 @@ die() {
 	exit 1
 }
 
-VERSION=3.6
+VERSION=3.7
 ARCH=${ARCH-i486}
 BUILD=1
 

src/unix/stella.spec

@@ -1,5 +1,5 @@
 %define name    stella
-%define version 3.6
+%define version 3.7
 %define rel     1
 
 %define enable_gl 1
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
+* Fri May 18 2012 Stephen Anthony <stephena@users.sf.net> 3.7-1
+- Version 3.7 release
+
 * Fri Mar 16 2012 Stephen Anthony <stephena@users.sf.net> 3.6-1
 - Version 3.6 release
 

src/win32/stella.rc

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