ref: acd1a13a4f70973d7616df3f6de43f8f79b8e392
parent: baf0aa3a5356ea07956608ff43833d6cee6f85ae
author: Simon Howard <[email protected]>
date: Wed Dec 10 15:25:05 EST 2008
Bump version to 1.2.1, update NEWS and ChangeLog. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1421
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2008-12-10 20:20:10 fraggle
+
+ Fix crash when playing Doom 1 levels.
+
+2008-12-10 01:06:08 fraggle
+
+ Bump version to 1.2.0, update NEWS and ChangeLog.
+
+2008-12-10 01:01:19 fraggle
+
+ Undo previous change.
+
+2008-12-10 00:42:49 fraggle
+
+ Set icon before calling TXT_Init, for setup and ENDOOM screens.
+
+2008-12-10 00:00:55 fraggle
+
+ Fix window icon/title under Windows XP Luna theme.
+
+2008-12-09 23:32:19 fraggle
+
+ Make intermission screen work on MAP33, to be consistent with Vanilla
+ Doom. Also, make levels after MAP33 trigger a V_DrawPatch error.
+
2008-12-09 20:35:17 fraggle
Add check for sched_setaffinity to configure and only use it if it is
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.2.1 (2008-12-10):
+
+ This version just fixes a crash at the intermission screen when
+ playing Doom 1 levels.
+
1.2.0 (2008-12-10):
Happy 15th Birthday, Doom!
--- 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.2.0"
+#define PACKAGE_STRING "Chocolate Doom 1.2.1"
/* 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.2.0"
+#define PACKAGE_VERSION "1.2.1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,8 +1,8 @@
1 ICON "../data/doom.ico"
1 VERSIONINFO
-PRODUCTVERSION 1,2,0,0
-FILEVERSION 1,2,0,0
+PRODUCTVERSION 1,2,1,0
+FILEVERSION 1,2,1,0
FILETYPE 1
{BLOCK "StringFileInfo"
@@ -9,13 +9,13 @@
{BLOCK "040904E4"
{- VALUE "FileVersion", "1.2.0"
- VALUE "FileDescription", "1.2.0"
+ VALUE "FileVersion", "1.2.1"
+ VALUE "FileDescription", "1.2.1"
VALUE "InternalName", "Chocolate-Doom"
VALUE "CompanyName", "Chocolate-Doom"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate-Doom"
- VALUE "ProductVersion", "1.2.0"
+ VALUE "ProductVersion", "1.2.1"
}
}
}
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -3,8 +3,8 @@
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
1 VERSIONINFO
-PRODUCTVERSION 1,2,0,0
-FILEVERSION 1,2,0,0
+PRODUCTVERSION 1,2,1,0
+FILEVERSION 1,2,1,0
FILETYPE 1
{BLOCK "StringFileInfo"
@@ -11,13 +11,13 @@
{BLOCK "040904E4"
{- VALUE "FileVersion", "1.2.0"
+ VALUE "FileVersion", "1.2.1"
VALUE "FileDescription", "Chocolate-Doom Setup"
VALUE "InternalName", "chocolate-setup"
VALUE "CompanyName", "[email protected]"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate-Doom Setup"
- VALUE "ProductVersion", "1.2.0"
+ VALUE "ProductVersion", "1.2.1"
}
}
}
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 1.2.0, [email protected], chocolate-doom)
+AC_INIT(Chocolate Doom, 1.2.1, [email protected], chocolate-doom)
AC_CONFIG_AUX_DIR(autotools)
--- 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.2.0"
+#define PACKAGE_STRING "Chocolate Doom 1.2.1"
/* 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.2.0"
+#define PACKAGE_VERSION "1.2.1"
/* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -32,8 +32,8 @@
#endif
1 VERSIONINFO
-PRODUCTVERSION 1,2,0,0
-FILEVERSION 1,2,0,0
+PRODUCTVERSION 1,2,1,0
+FILEVERSION 1,2,1,0
FILETYPE 1
BEGIN
BLOCK "StringFileInfo"
@@ -40,13 +40,13 @@
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "FileVersion", "1.2.0"
- VALUE "FileDescription", "Chocolate Doom 1.2.0"
+ VALUE "FileVersion", "1.2.1"
+ VALUE "FileDescription", "Chocolate Doom 1.2.1"
VALUE "InternalName", "chocolate-doom"
VALUE "CompanyName", "[email protected]"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate Doom"
- VALUE "ProductVersion", "1.2.0"
+ VALUE "ProductVersion", "1.2.1"
END
END
END
--- a/setup/setup-manifest.xml
+++ b/setup/setup-manifest.xml
@@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<!-- The "name" field in this tag should be the same as the executable's
name -->
- <assemblyIdentity version="1.2.0.0" processorArchitecture="*"
+ <assemblyIdentity version="1.2.1.0" processorArchitecture="*"
name="chocolate-setup" type="win32"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>