Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15815

Modified Files:
	NEWS ChangeLog 
Log Message:
conquer gloating

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- NEWS	22 Apr 2006 11:31:52 -0000	1.15
+++ NEWS	23 Apr 2006 13:30:38 -0000	1.16
@@ -1,3 +1,6 @@
+- change to conquest sequence to add a parade [Cameron]
+- fix unrealistic robot boredom timer [Cameron]
+- add galaxy configuration tool, setplanet [Cameron]
 - move common code into a libnetrek [Cameron]
 - lesser lights minimal compilation target [Cameron]
 - factorise god log access functions [Cameron]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	23 Apr 2006 12:47:45 -0000	1.30
+++ ChangeLog	23 Apr 2006 13:30:39 -0000	1.31
@@ -1,3 +1,17 @@
+Sun Apr 23 23:20:15 2006  James Cameron  <quozl at us.netrek.org>
+
+	* ntserv/daemonII.c (checkwin): change to conquest sequence,
+	instead of merely blowing everybody up, pause the game for a few
+	seconds, during which cloakers are decloaked, weapons don't fire,
+	ships are placed in a circular parade formation around the final
+	planet, and then blown up.  Also, if there is no queue, do not
+	force the players to exit their client.
+
+	* include/struct.h: add new gameup flag.
+	* ntserv/death.c: allow winners to stay on if no queue.
+	* ntserv/detonate.c, ntserv/phaser.c, ntserv/torp.c: no firing.
+	* ntserv/getentry.c: allow winners to change teams.
+
 Sun Apr 23 22:46:42 2006  James Cameron  <quozl at us.netrek.org>
 
 	* robots/rmove.c (BOREDOM_TIME): fix unrealistic boredom timer for