From fc4938cdd5c1b37726a386fb866d3bf08a0fab45 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 25 Dec 2012 12:50:51 +0000
Subject: Release 0.2.3-svn1265.

---
 ChangeLog                     | 26 ++++++++++++++++++++++++++
 configure.in                  |  2 +-
 doc/installation_release.html |  2 +-
 src/client/hudtargetstatus.cc |  4 ++--
 src/game/base/shipmodel.cc    |  2 +-
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ac92e18..763532f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,32 @@
 
   ------------------------------------------------------------------
 
+* build-0.2.3-svn1265 "Pyrotechnics Santa"
+
+	2012-12-26
+	
+	src revision 1265
+	
+	- Added support for client-side projectiles.
+	- Lowered velocity threshold to prevent frozen entities.
+	- Added mount/unmount buttons.
+	- Improved info text parsing.
+	- Improved HUD and target graphics.
+	- Improved mouse control sensitivtiy.
+	
+	data revision 907
+	
+	- Added weapon specifications.
+	- Added weapon particles.
+	- Added Anansi light fighter,
+	- Added Iktomi medium fighter.
+	- Retired Avenger series of ships.
+	- Added Tyson science vessel.
+	- Improved trading definitions
+	- Added several starsystems.
+	- Added Brisbane Medical station.
+	- Added dumb mine model by Karvajalka.
+	
 * build-0.2.2-svn1195
 
 	2012-11-17
diff --git a/configure.in b/configure.in
index dcc6adf..d77d1dc 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.2'
+OSIRIONVERSION='0.2.3'
 SVNREVISION=`svnversion $srcdir`
 
 if test ! -z "$SVNREVISION"; then
diff --git a/doc/installation_release.html b/doc/installation_release.html
index 10a5b3f..746ef7e 100644
--- a/doc/installation_release.html
+++ b/doc/installation_release.html
@@ -101,7 +101,7 @@
 </p>
 <pre class="content">
 tar jxvf osirion-latest-linux.tar.bz2
-cd osirion-0.2.2-svn1195-linux
+cd osirion-0.2.3-svn1265-linux
 </pre>
 <p class="content">
 	Dowload the game data package:<br>
diff --git a/src/client/hudtargetstatus.cc b/src/client/hudtargetstatus.cc
index 1c910d3..f002b2a 100644
--- a/src/client/hudtargetstatus.cc
+++ b/src/client/hudtargetstatus.cc
@@ -76,8 +76,8 @@ void HUDTargetStatus::draw()
 				}
 				targetinfostr << eta << "sec";
 			}
-		} else if (target->has_flag(core::Entity::Dockable)) {
-				targetinfostr << "^FDock";
+//		} else if (target->has_flag(core::Entity::Dockable)) {
+//				targetinfostr << "^FDock";
 		} else {
 			targetinfostr << "^B--";
 		}
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index a308b64..ba87024 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -248,7 +248,7 @@ void ShipModel::generate_info()
 	add_line(str.str());
 	str.str("");
 	
-	str << "hull strength ^B" << maxarmor()  << "^N";
+	str << "hull:         ^B" << maxarmor()  << "^N";
 	add_line(str.str());
 	str.str("");
 	
-- 
cgit v1.2.3