From 9634bd52544d4083e0252ab47b3cf20829f91fa9 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 22 Jan 2012 13:03:44 +0000
Subject: Bumped version number to 0.2.1, updated changelog, corrected a
 spectator crashbug.

---
 ChangeLog                | 30 ++++++++++++++++++++++++++++++
 configure.in             |  2 +-
 src/client/mainwindow.cc |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 16448dc..39e69d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,36 @@
 
   ------------------------------------------------------------------
 
+* build-0.2.1-svn1082
+
+	2012-01-22
+	
+	src revision 1082
+
+	- Various lighting tweaks and enhancements.
+	- Added zone ambient color support.
+	- Added eject cargo dialog.
+	- Added tractor beam and eject cargo sound effects.
+	- Added support for saving and loading games in singleplayer.
+	- Added Material::Decal surface flag to enable polygon offset and alpha testing.
+	- Added Material::Origin surface flag for func_rotate groups.
+	- Enabled secondary entity color in the model viewer.
+	- Fixed the close button on the chat window.
+	- Cleanup of the main menu code.
+	- Corrected a bug where setting the jumpgate template radius wouldn't work.
+	- Corrected a bug where inventory capacity wasn't reset after loading player data.
+	
+	data revision 788
+	
+	- new oldlancer model
+	- new miningprotector model
+	- new goliath model
+	- new drake model
+	- new niobium model
+	- new jumpgate model
+	- new decal textures
+	- new tractor beam sound effect
+	- removed obsolete orion ship
 
 * build-0.2.0-svn1031 "OBJ in space"
 	
diff --git a/configure.in b/configure.in
index ee61ce4..775928c 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(configure.in)
 
 dnl ----------------------------------------------------------------
 dnl append SVN revision to the version number
-OSIRIONVERSION='0.2.0'
+OSIRIONVERSION='0.2.1'
 SVNREVISION=`svnversion $srcdir`
 
 if test ! -z "$SVNREVISION"; then
diff --git a/src/client/mainwindow.cc b/src/client/mainwindow.cc
index 8e7b2af..66244de 100644
--- a/src/client/mainwindow.cc
+++ b/src/client/mainwindow.cc
@@ -121,6 +121,7 @@ void MainWindow::draw()
 	if (!mainwindow_mainmenu->visible()) {
 		
 		if (!core::game()->interactive() || !core::localcontrol()) {
+			mainwindow_gamewindow->hide();
 			mainwindow_mainmenu->show();
 			
 		} else if (mainwindow_gamewindow->hidden()) {
-- 
cgit v1.2.3