Bump version to 1.2.0, update NEWS and ChangeLog.

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

9 files changed, 307 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 37836295..925231a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,251 @@
+2008-12-09 20:35:17 fraggle
+	
+	Add check for sched_setaffinity to configure and only use it if it is
+	found.  Display a message if we don't have any way to set processor
+	affinity.
+
+2008-12-09 19:56:43 fraggle
+	
+	Add SDL_CFLAGS, SDL_LDFLAGS to default compile flags, and check for
+	SDL in configure before checking for libraries and headers, to fix
+	Windows.
+
+2008-12-03 22:09:22 fraggle
+	
+	Use FILE_MAP_COPY instead of FILE_MAP_ALL_ACCESS for mapping files
+	(thanks to Christian Chech).
+
+2008-12-01 21:08:23 fraggle
+	
+	Don't try to read SDL events until initialised.
+
+2008-10-01 21:22:09 fraggle
+	
+	Add .lvimrc local vim project settings.
+
+2008-09-21 19:20:32 fraggle
+	
+	Don't play DEMO4 if gameversion is emulating chex.exe - it only plays
+	demos 1-3.
+
+2008-09-20 19:18:06 fraggle
+	
+	Set processor affinity under non-Windows platforms using the POSIX
+	API.
+
+2008-09-16 01:17:20 rtc_marine
+	
+	- Force use of dwarf-2 debugging information - Fix an age-old problem
+	of not being able to find -lpcsound, the debug target was looking for
+	it rather than -lpcsound-dbg
+
+2008-09-14 19:14:46 fraggle
+	
+	Add -nocheat command line parameter to disable applying cheats from
+	dehacked files.
+
+2008-09-07 18:47:08 fraggle
+	
+	Strip out NUL characters from dehacked files; this makes the dehacked
+	patch with portal.wad load properly.
+
+2008-08-29 00:31:53 fraggle
+	
+	Update TODO.
+
+2008-08-24 03:06:26 fraggle
+	
+	Update INSTALL to include some notes about Chex Quest.
+
+2008-08-24 02:58:57 fraggle
+	
+	Update missing chex.deh to reference its location in the idgames
+	repository.
+
+2008-08-20 19:27:56 fraggle
+	
+	Use / as a path separator, to allow cross-compiling of resource files
+	(thanks Anonymous bug reporter)
+
+2008-08-19 20:51:41 fraggle
+	
+	Fix crash related to A_BFGSpray with NULL target when using dehacked
+	patches - discovered with insaned2.deh (thanks CSonicGo)
+
+2008-08-09 18:09:23 fraggle
+	
+	Don't modify level lumps when loading levels.
+
+2008-08-08 23:38:25 fraggle
+	
+	Use FILE_MAP_ALL_ACCESS rather than FILE_MAP_READ when mmapping files
+	under Windows (thanks entryway)
+
+2008-08-02 14:29:37 fraggle
+	
+	Search for chex.deh in WAD path.
+
+2008-07-31 23:01:38 fraggle
+	
+	Update netcode to allow chex quest gameversion.
+
+2008-07-31 22:29:20 fraggle
+	
+	Update Chocolate Setup to support chex.wad.
+
+2008-07-31 21:21:58 fraggle
+	
+	Fix crash on Chex Quest intermission screen (thanks entryway)
+
+2008-07-31 21:06:42 fraggle
+	
+	Automatically load chex.deh on startup if playing in chex mode.
+
+2008-07-31 20:43:45 fraggle
+	
+	Fix mistake in exit confirmation string that was breaking dehacked
+	patches that replace it.
+
+2008-07-31 12:55:35 rtc_marine
+	
+	Update codeblocks project to locate setup manifest
+
+2008-07-29 19:06:04 fraggle
+	
+	Don't do the Final Doom teleport quirk with Chex Quest, as chex.exe
+	doesn't do it.
+
+2008-07-29 19:05:16 fraggle
+	
+	Monsters don't drop ammo in Chex Quest.
+
+2008-07-29 01:50:56 fraggle
+	
+	Add magic dehacked comment to enable long cheat sequences (also for
+	Chex Quest support)
+
+2008-07-27 00:51:25 fraggle
+	
+	In chex mode, always warp to an episode 1 level, and display the level
+	title in the automap for the equivalent episode 1 level.
+
+2008-07-26 16:45:52 fraggle
+	
+	Allow magic comments in dehacked files that disable the DOS dehacked
+	text replacement limit, so that we can use a dehacked patch to emulate
+	chex.exe.
+
+2008-07-26 16:29:08 fraggle
+	
+	Chex Quest's chex.exe is based on the Final Doom exe, not the Ultimate
+	Doom exe.
+
+2008-07-26 16:23:06 fraggle
+	
+	Fix "dimensional shambler waiting at the dos prompt" quit message to
+	match the one in doom2.exe precisely.
+
+2008-07-25 20:56:39 fraggle
+	
+	Initial chex.exe emulation.
+
+2008-07-10 00:22:34 fraggle
+	
+	Fix dehacked replacements for the "press y to quit to dos" string.
+
+2008-07-07 10:10:26 fraggle
+	
+	Fix quit screen confirm message to say "quit to dos" rather than just
+	"quit" (thanks MikeRS)
+
+2008-06-14 18:42:06 fraggle
+	
+	Add a helpful message for people trying to play with the wrong IWAD.
+
+2008-06-11 01:14:07 fraggle
+	
+	Only apply dehacked green armor class to the green armor shirt, not
+	the armor helmets as well.
+
+2008-06-09 19:11:24 fraggle
+	
+	Always set armor class to 2 when picking up a megasphere (thanks
+	entryway).
+
+2008-05-05 04:52:08 GhostlyDeath
+	
+	Updated Code::Blocks project for new files
+
+2008-05-05 04:48:45 fraggle
+	
+	Add setup-manifest.xml to dist.
+
+2008-05-05 04:44:28 GhostlyDeath
+	
+	Updated VC++ Project for added files; Manifest should have version
+	1.1.1.0 not 1.0.0.0; the rc files in the codeblocks folder have been
+	updated
+
+2008-05-05 04:11:29 fraggle
+	
+	(Hopefully) fix for Windows Vista asking for security elevation when
+	running chocolate-setup.
+
+2008-05-04 22:43:38 fraggle
+	
+	Remove Vanilla Doom reload hack.
+
+2008-05-04 18:09:51 fraggle
+	
+	Add command line option to disable mmapped WAD I/O.
+
+2008-05-04 17:45:10 fraggle
+	
+	Fix win32 mmap driver and add to build.
+
+2008-05-02 23:52:00 fraggle
+	
+	Add Windows memory mapping backend.
+
+2008-05-02 20:19:38 fraggle
+	
+	Memory-mapped WAD access.
+
+2008-05-02 20:18:52 fraggle
+	
+	Fix up some more code calling Z_Free instead of W_ReleaseLumpNum.
+
+2008-05-02 19:48:43 fraggle
+	
+	Add W_CacheLumpNum,Name API to WAD code for releasing a lump back to
+	cache when it is no longer needed.  Switch existing code to use the
+	new API instead of Z_ChangeTag.
+
+2008-05-02 18:32:09 fraggle
+	
+	Add WAD I/O abstraction layer - first step for mmapped WAD access.
+
+2008-04-26 17:31:47 fraggle
+	
+	"Python Image Library" -> "Python Imaging Library" (thanks exp(x)).
+
+2008-04-26 15:33:14 fraggle
+	
+	Add new Chocolate Doom icon.
+
+2008-04-26 00:33:00 fraggle
+	
+	Generate transparency mask for the application icon from black parts
+	of the image.
+
+2008-04-23 08:44:17 GhostlyDeath
+	
+	VC++ Project now builds
+
+2008-04-20 02:00:11 fraggle
+	
+	Bump version to 1.1.1, update ChangeLog and NEWS.
+
 2008-04-19 17:41:58 fraggle
 	
 	Fix build problem when libsamplerate support is enabled.
diff --git a/NEWS b/NEWS
index ff1d9b59..8088fe2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,40 @@
+1.2.0 (2008-12-10):
+
+    Happy 15th Birthday, Doom!
+
+     * Chocolate Doom now has an icon that is not based on the proprietary
+       Doom artwork.
+     * There is now memory-mapped WAD I/O support, which should be useful
+       on some embedded systems.
+     * Chex quest emulation support is now included, although an
+       auxiliary dehacked patch is needed (chexdeh.zip in the idgames
+       archive).
+
+    Compatibility:
+     * The armor class is always set to 2 when picking up a megasphere
+       (thanks entryway).
+     * The quit screen prompts to quit "to dos" instead of just to quit
+       (thanks MikeRS)
+     * The "dimensional shambler" quit message was fixed.
+     * Fix crash related to A_BFGSpray with NULL target when using
+       dehacked patches - discovered with insaned2.deh
+       (thanks CSonicGo)
+     * NUL characters are stripped from dehacked files, to ensure correct
+       behavior with some dehacked patches (eg. the one with portal.wad).
+
+    Bugs fixed:
+     * "Python Image Library" should have been "Python Imaging Library"
+       (thanks exp(x)).
+     * The setup tool should no longer ask for elevated permissions
+       on Windows Vista (this fix possibly may not work).
+     * The application icon is set properly when running under Windows
+       XP with the "Luna" theme.
+     * Fix compilation under Cygwin to detect libraries and headers from
+       the correct environment.
+     * The video code does not try to read SDL events before SDL has
+       been properly initialised - this was causing problems with some
+       older versions of SDL.
+
 1.1.1 (2008-04-20):
 
     The previous release (v1.1.0) included a bug that broke compilation
diff --git a/codeblocks/config.h b/codeblocks/config.h
index c006d256..a0560009 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.1.1"
+#define PACKAGE_STRING "Chocolate Doom 1.2.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.1.1"
+#define PACKAGE_VERSION "1.2.0"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.1"
+#define VERSION "1.2.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 9219b149..de0afd76 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/doom.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 1,1,1,0
-FILEVERSION 1,1,1,0
+PRODUCTVERSION 1,2,0,0
+FILEVERSION 1,2,0,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "1.1.1"
-   VALUE "FileDescription", "1.1.1"
+   VALUE "FileVersion", "1.2.0"
+   VALUE "FileDescription", "1.2.0"
    VALUE "InternalName", "Chocolate-Doom"
    VALUE "CompanyName", "Chocolate-Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate-Doom"
-   VALUE "ProductVersion", "1.1.1"
+   VALUE "ProductVersion", "1.2.0"
   }
  }
 }
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index 41a7f1dc..50758e10 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,1,1,0
-FILEVERSION 1,1,1,0
+PRODUCTVERSION 1,2,0,0
+FILEVERSION 1,2,0,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "1.1.1"
+   VALUE "FileVersion", "1.2.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.1.1"
+   VALUE "ProductVersion", "1.2.0"
   }
  }
 }
diff --git a/configure.in b/configure.in
index 83c4739a..525a164c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 1.1.1, fraggle@gmail.com, chocolate-doom)
+AC_INIT(Chocolate Doom, 1.2.0, fraggle@gmail.com, chocolate-doom)
 
 AC_CONFIG_AUX_DIR(autotools)
 
diff --git a/msvc/config.h b/msvc/config.h
index 7a28c0c1..c370479d 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.1.1"
+#define PACKAGE_STRING "Chocolate Doom 1.2.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.1.1"
+#define PACKAGE_VERSION "1.2.0"
 
 /* Version number of package */
-#define VERSION "1.1.1"
+#define VERSION "1.2.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 668bdb0a..5e2d27a9 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -32,21 +32,21 @@
 #endif

 

 1 VERSIONINFO

-PRODUCTVERSION 1,1,1,0

-FILEVERSION 1,1,1,0

+PRODUCTVERSION 1,2,0,0

+FILEVERSION 1,2,0,0

 FILETYPE 1

 BEGIN

 	BLOCK "StringFileInfo"

 	BEGIN

 		BLOCK "040904E4"

 		BEGIN

-			VALUE "FileVersion", "1.1.1"

-			VALUE "FileDescription", "Chocolate Doom 1.1.1"

+			VALUE "FileVersion", "1.2.0"

+			VALUE "FileDescription", "Chocolate Doom 1.2.0"

 			VALUE "InternalName", "chocolate-doom"

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

 			VALUE "LegalCopyright", "GNU General Public License"

 			VALUE "ProductName", "Chocolate Doom"

-			VALUE "ProductVersion", "1.1.1"

+			VALUE "ProductVersion", "1.2.0"

 		END

 	END

 END

diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml
index 74dd5493..56ac9557 100644
--- 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.1.1.0" processorArchitecture="*"
+  <assemblyIdentity version="1.2.0.0" processorArchitecture="*"
                     name="chocolate-setup" type="win32"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>