Merged revisions 4031-4044,4046-4058,4061-4062,4064,4066-4067,4069-4070,4072-4079,4082-4092,4094-4097,4099,4101-4109,4112-4115,4117-4129,4131-4150 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4031 | the_enemy | 2008-04-03 14:53:00 +0200 (Thu, 03 Apr 2008) | 1 line
  
  Tweaked disconnect dialog to fix crash bug id=250
........
  r4050 | b_lindeijer | 2008-04-07 19:37:23 +0200 (Mon, 07 Apr 2008) | 2 lines
  
  Merged changes made for the 0.0.24.1 release (4046:4048 from 0.0.24 branch).
........
  r4066 | b_lindeijer | 2008-04-10 23:48:36 +0200 (Thu, 10 Apr 2008) | 2 lines
  
  Fixed compile warning.
........
  r4076 | b_lindeijer | 2008-04-12 20:36:15 +0200 (Sat, 12 Apr 2008) | 3 lines
  
  Fixed display of item shortcut container. gcn::Widget::setWidth is no longer
  virtual.
........
  r4079 | crush_tmw | 2008-04-14 09:50:25 +0200 (Mon, 14 Apr 2008) | 1 line
  
  Fixed multi-channel image dyeing (patch by fate)
........
  r4096 | b_lindeijer | 2008-04-16 10:39:59 +0200 (Wed, 16 Apr 2008) | 3 lines
  
  Restored the text wrapping in TextBox, since it was based on overriding a
  method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
........
  r4097 | peaveydk | 2008-04-16 13:27:31 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Fix a basic_string::at sometimes being out of range in BrowserBox::draw when checking for line separators.
........
  r4099 | peaveydk | 2008-04-16 13:50:12 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Also fix potential out of range in BrowserBox::draw when checking for color codes.
........
  r4150 | b_lindeijer | 2008-04-20 21:24:33 +0200 (Sun, 20 Apr 2008) | 2 lines
  
  Forgot to remove the sound effects apparently, removed now.
........

1 files changed, 31 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e6544b6..ea235d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -140,11 +140,23 @@
 	* src/gui/guildlistbox.cpp, src/gui/guildwindow.h,
 	src/gui/widgets/tabbedarea.cpp, src/gui/chat.cpp,
 	src/gui/guildlistbox.h, src/gui/guildwindow.cpp, src/guild.cpp,
-	src/guild.h, src/net/guildhandler.cpp: Fixed online status so that 
+	src/guild.h, src/net/guildhandler.cpp: Fixed online status so that
 	users are shown as online.
-	* src/gui/chat.cpp, src/net/protocol.h, 
+	* src/gui/chat.cpp, src/net/protocol.h,
 	src/net/chatserver/chatserver.cpp: Remove private channels.
 
+2008-04-16  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/npc_text.h, src/gui/textbox.cpp, src/gui/npc_text.cpp,
+	src/gui/scrollarea.h, src/gui/textbox.h: Restored the text wrapping in
+	TextBox, since it was based on overriding a method that is no longer
+	virtual in Guichan 0.8.0.
+
+2008-04-16  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/browserbox.cpp: Fix a basic_string::at sometimes being out
+	of range in BrowserBox::draw when checking for color codes.
+
 2008-04-15  David Athay  <ko2fan@gmail.com>
 
 	* src/gui/guildlistbox.cpp, src/gui/guildwindow.h
@@ -168,6 +180,10 @@
 	Added new TabbedArea which extends gui::TabbedArea. Changed Guild and
 	Chat windows to use new TabbedArea. Added private messaging.
 
+2008-04-14  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/resources/dye.cpp: Fixed multi-channel dyeing (patch by fate)
+
 2008-04-12  Yohann Ferreira  <bertram@cegetel.net>
 
 	* src/CMakeLists.txt: Fixed a compilation error using Cmake.
@@ -180,6 +196,10 @@
 	src/log.h, src/resources/mapreader.cpp, src/resources/spritedef.cpp:
 	Fixed some compiler warnings and don't try to load particle effects
 	when no file is set.
+	* src/gui/itemshortcutcontainer.h, src/gui/itemshortcutcontainer.cpp,
+	src/gui/itemshortcutwindow.cpp, src/gui/scrollarea.h,
+	src/gui/scrollarea.cpp, src/gui/itemshortcutwindow.h: Fixed display of
+	item shortcut container. gcn::Widget::setWidth is no longer virtual.
 
 2008-04-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -207,6 +227,9 @@
 	* src/resources/spritedef.cpp, src/resources/spritedef.h,
 	data/graphics/sprites/item008.xml: Added support for basing one sprite
 	definition on another by including it.
+	* data/help/changes.txt, data/help/header.txt, NEWS: Updates to news
+	from 0.0.24.1 release.
+	* src/being.cpp: Fixed crash on trying to show out of range emoticon.
 
 2008-04-03  Philipp Sehmisch  <tmw@crushnet.org>
 
@@ -216,10 +239,11 @@
 
 2008-04-03  David Athay  <ko2fan@gmail.com>
 
+	* src/game.cpp: Tweaked disconnect dialog, hoping to fix a crash bug.
 	* src/localplayer.cpp, src/gui/popupmenu.cpp, src/localplayer.h,
 	tmw.cbp: Added ability to right click a player and invite to guild.
-	* src/gui/connection.cpp, src/gui/login.cpp, 
-	src/gui/char_select.cpp, src/main.cpp: Added patch from 
+	* src/gui/connection.cpp, src/gui/login.cpp,
+	src/gui/char_select.cpp, src/main.cpp: Added patch from
 	postalworker bug id=117 to fix cancel connecting to a sick server.
 	* src/net/guildhandler.cpp, src/net/protocol.h: Added updating guild
 	member list.
@@ -227,7 +251,7 @@
 2008-04-01  David Athay  <ko2fan@gmail.com>
 
 	* src/game.cpp, src/gui/guildwindow.h, src/gui/chat.cpp,
-	src/gui/guildwindow.cpp, src/net/guildhandler.cpp: Fixed up chat 
+	src/gui/guildwindow.cpp, src/net/guildhandler.cpp: Fixed up chat
 	and guilds.
 	* src/gui/chat.cpp: Made it possible to move the chat window.
 
@@ -237,7 +261,8 @@
 	src/resources/npcdb.cpp, data/npcs.xml, src/Makefile.am, tmc.cbp:
 	Implemented NPC XML database which maps NPC IDs to one or more
 	animation files and thus enables animated NPCs.
-	* data/graphics/sprites/npc-test.png, data/graphics/sprites/npc-test.xml,
+	* data/graphics/sprites/npc-test.png,
+	data/graphics/sprites/npc-test.xml,
 	data/graphics/sprites/npc-treasurebox.png,
 	data/graphics/sprites/npc-treasurebox.xml: Added some animated NPCs by
 	lost soul for testing purpose.