Update NEWS and ChangeLog, bump version number.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1941

8 files changed, 107 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index a5bd7228..0120d5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,81 @@
+2010-05-30 04:03:44 fraggle
+	
+	Add INSTALL to all distribution packages, add note in README.
+
+2010-05-30 03:56:58 fraggle
+	
+	Clarify/update install instructions.
+
+2010-05-14 19:42:32 fraggle
+	
+	Don't grab the mouse when the demo sequence advances.
+
+2010-05-03 17:47:25 fraggle
+	
+	Oops.
+
+2010-05-03 16:58:52 fraggle
+	
+	Update NEWS.
+
+2010-05-01 22:47:26 fraggle
+	
+	Further sanity checking on use of strcpy() with dehacked string
+	replacements.
+
+2010-05-01 22:20:30 fraggle
+	
+	Silence printf(DEH_String(...)) warnings, by providing a DEH_printf
+	function that checks the format string is a valid replacement.  Also
+	add DEH_fprintf and DEH_snprintf functions to use throughout the code
+	to do similar checking.
+
+2010-05-01 20:22:52 fraggle
+	
+	Fix compiler warnings with savegame and response file code.
+
+2010-04-30 20:58:30 fraggle
+	
+	Merge contents of OPL-TODO into TODO file.
+
+2010-04-30 20:38:24 fraggle
+	
+	Add textscreen Doxyfile to dist.  Add .desktop file to svn:ignore.  Add
+	opl ctags file to localvimrc.
+
+2010-04-25 00:53:03 fraggle
+	
+	Add -reject_pad_with_ff parameter to allow padding value to be
+	specified.
+
+2010-04-23 21:46:29 fraggle
+	
+	Add REJECT buffer overflow emulation, based on code from PrBoom+
+	(thanks entryway).  Fixes YDFEAR25.LMP.
+
+2010-04-22 22:38:51 fraggle
+	
+	Disable OPL debugging messages.
+
+2010-03-08 18:52:59 fraggle
+	
+	Add OPL-TODO to dist, set svn:ignore properties.
+
+2010-03-08 18:50:29 fraggle
+	
+	Use native MIDI music by default.
+
+2010-03-08 01:14:23 fraggle
+	
+	Merge opl-branch to trunk.
+	
+	OPL support still isn't perfect, and it certainly isn't complete.
+	However, for now, it's good enough.
+
+2010-02-10 20:21:21 fraggle
+	
+	Bump version number, update ChangeLog and NEWS.
+
 2010-01-31 18:21:50 fraggle
 	
 	Change Windows resource file to use PACKAGE_COPYRIGHT and
diff --git a/NEWS b/NEWS
index ea6ba572..c2705062 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-1.4.0 (2010-??-??):
+1.4.0 (2010-07-10):
 
      The biggest change in this version is the addition of OPL
      emulation.  This emulates Vanilla Doom's MIDI playback when
@@ -21,6 +21,13 @@
      * Warnings are now generated for invalid dehacked replacements of
        printf format strings.  Some potential buffer overflows are
        also checked.
+     * The installation instructions (INSTALL file) have been
+       clarified and made more platform-agnostic.
+     * The mouse is no longer warped to the center of the screen when
+       the demo sequence advances.
+     * Key bindings can now be changed for the demo recording quit key
+       (normally 'q') and the multiplayer messaging keys (normally
+       't', 'g', 'i', 'b' and 'r').
 
 1.3.0 (2010-02-10):
 
diff --git a/codeblocks/config.h b/codeblocks/config.h
index 70a4a742..d092bf73 100644
--- a/codeblocks/config.h
+++ b/codeblocks/config.h
@@ -9,19 +9,19 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 1.3.0"
+#define PACKAGE_STRING "Chocolate Doom 1.4.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "chocolate-doom"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.0"
+#define PACKAGE_VERSION "1.4.0"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.3.0"
+#define VERSION "1.4.0"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc
index 98e58491..eef24852 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/doom.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 1,3,0,0
-FILEVERSION 1,3,0,0
+PRODUCTVERSION 1,4,0,0
+FILEVERSION 1,4,0,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "1.3.0"
-   VALUE "FileDescription", "1.3.0"
+   VALUE "FileVersion", "1.4.0"
+   VALUE "FileDescription", "1.4.0"
    VALUE "InternalName", "Chocolate-Doom"
    VALUE "CompanyName", "Chocolate-Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate-Doom"
-   VALUE "ProductVersion", "1.3.0"
+   VALUE "ProductVersion", "1.4.0"
   }
  }
 }
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index 906658f3..f1602adb 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -3,21 +3,21 @@
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
 
 1 VERSIONINFO
-PRODUCTVERSION 1,3,0,0
-FILEVERSION 1,3,0,0
+PRODUCTVERSION 1,4,0,0
+FILEVERSION 1,4,0,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "1.3.0"
+   VALUE "FileVersion", "1.4.0"
    VALUE "FileDescription", "Chocolate-Doom Setup"
    VALUE "InternalName", "chocolate-setup"
    VALUE "CompanyName", "fraggle@gmail.com"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate-Doom Setup"
-   VALUE "ProductVersion", "1.3.0"
+   VALUE "ProductVersion", "1.4.0"
   }
  }
 }
diff --git a/configure.in b/configure.in
index 258822ce..501064c6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 1.3.0, fraggle@gmail.com, chocolate-doom)
+AC_INIT(Chocolate Doom, 1.4.0, fraggle@gmail.com, chocolate-doom)
 
 PACKAGE_SHORTDESC="Conservative Doom source port"
 PACKAGE_COPYRIGHT="Copyright (C) 1993-2010"
diff --git a/msvc/config.h b/msvc/config.h
index 2dbf8c11..006d7c74 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -11,16 +11,16 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 1.3.0"
+#define PACKAGE_STRING "Chocolate Doom 1.4.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "chocolate-doom"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.0"
+#define PACKAGE_VERSION "1.4.0"
 
 /* Version number of package */
-#define VERSION "1.3.0"
+#define VERSION "1.4.0"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/msvc/win32.rc b/msvc/win32.rc
index 72bb7802..94a35372 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -32,21 +32,21 @@
 #endif

 

 1 VERSIONINFO

-PRODUCTVERSION 1,3,0,0

-FILEVERSION 1,3,0,0

+PRODUCTVERSION 1,4,0,0

+FILEVERSION 1,4,0,0

 FILETYPE 1

 BEGIN

 	BLOCK "StringFileInfo"

 	BEGIN

 		BLOCK "040904E4"

 		BEGIN

-			VALUE "FileVersion", "1.3.0"

-			VALUE "FileDescription", "Chocolate Doom 1.3.0"

+			VALUE "FileVersion", "1.4.0"

+			VALUE "FileDescription", "Chocolate Doom 1.4.0"

 			VALUE "InternalName", "chocolate-doom"

 			VALUE "CompanyName", "fraggle@gmail.com"

 			VALUE "LegalCopyright", "GNU General Public License"

 			VALUE "ProductName", "Chocolate Doom"

-			VALUE "ProductVersion", "1.3.0"

+			VALUE "ProductVersion", "1.4.0"

 		END

 	END

 END