Merged revisions 3962-3983,3985-3999,4001-4021 via svnmerge from

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

........
  r3962 | crush_tmw | 2008-03-09 16:35:00 +0100 (Sun, 09 Mar 2008) | 1 line
  
  Applied some patches by peavey related to chatlog and the quit dialog.
........
  r3968 | umperio | 2008-03-11 14:56:47 +0100 (Tue, 11 Mar 2008) | 1 line
  
  Removed unused image.
........
  r3969 | b_lindeijer | 2008-03-11 17:44:20 +0100 (Tue, 11 Mar 2008) | 2 lines
  
  Also removed unused image from the files to be installed.
........
  r4006 | crush_tmw | 2008-03-26 00:28:05 +0100 (Wed, 26 Mar 2008) | 1 line
  
  Initialized some uninitialized variables (patch by peavey).
........
  r4008 | b_lindeijer | 2008-03-27 15:51:10 +0100 (Thu, 27 Mar 2008) | 2 lines
  
  Applied patch by peavey and added his name to the ChangeLog some more.
........
  r4010 | b_lindeijer | 2008-03-30 16:06:14 +0200 (Sun, 30 Mar 2008) | 2 lines
  
  Updated configure.ac for tmwdata split (patch by peavey).
........
  r4018 | crush_tmw | 2008-04-01 03:02:30 +0200 (Tue, 01 Apr 2008) | 1 line
  
  Added makefile for TMXCopy by jaxad.
........
  r4019 | crush_tmw | 2008-04-01 03:34:29 +0200 (Tue, 01 Apr 2008) | 1 line
  
  compilation fixes suggested by peavey.
........
  r4020 | crush_tmw | 2008-04-01 03:37:51 +0200 (Tue, 01 Apr 2008) | 1 line
  
  renaming makefile to Makefile
........
  r4021 | crush_tmw | 2008-04-01 03:38:35 +0200 (Tue, 01 Apr 2008) | 1 line
  
  renaming makefile to Makefile
........

1 files changed, 35 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 58e8c72c..4e672369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2008-04-19  Yohann Ferreira  <bertram@cegetel.net>
 
-	* src/gui/char_select.cpp: Made the client clean characters information
-	to avoid a freeze at relogin with another account.
+	* src/gui/char_select.cpp: Made the client clean characters
+	information to avoid a freeze at relogin with another account.
 
 2008-04-19  Dennis Friis  <peavey@placid.dk>
 
@@ -168,11 +168,25 @@
 	* data/test.lua: Removed the +100 offset of NPC IDs (relict from
 	eAthena)
 
+2008-03-30  Dennis Friis  <peavey@placid.dk>
+
+	* configure.ac: Updated for tmwdata split.
+
 2008-03-28  David Athay  <ko2fan@gmail.com>
 
 	* tmw.cbp, src/gui/guildwindow.cpp, src/gui/shop.cpp: Updated
 	project file and added some headers to help compiling on gcc 4.3.
 
+2008-03-27  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/progressbar.cpp, src/gui/scrollarea.cpp: Revert progress bar
+	changes and initialize mWalkTime.
+
+2008-03-26  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/progressbar.cpp, src/localplayer.cpp: Initialized some
+	uninitialized variables.
+
 2008-03-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/main.h: Updated default account server name.
@@ -211,6 +225,15 @@
 	src/net/chatserver.cpp, src/net/chatserver.h: Added ability to 
 	quit guilds.
 
+2008-03-11  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
+	Removed unused image here too.
+
+2008-03-11  Eugenio Favalli  <elvenprogrammer@themanaworld.org>
+
+	* data/graphics/gui/attack_target.png: Removed unused image.
+
 2008-03-09  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
@@ -230,10 +253,17 @@
 	data/graphics/sprites/scorpion.xml: Gave the tail attack of the
 	scorpion a custom animation and a particle effect.
 
+2008-03-09  Dennis Friis  <peavey@placid.dk>
+
+	* src/game.cpp: Pressing escape in the quit dialog closes the dialog.
+	* src/gui/chat.cpp, src/gui/chat.h: Fixed a bug with chat messages
+	without a sender which include semicolons.
+	* src/chat.cpp: Added "/clear" command to clear chat window.
+
 2008-03-08  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* tools/tmxcopy/main.cpp, tools/tmxcopy/main.map.cpp,
-	tools/tmxcopy/plibutils.cpp: Fixed some width/height mixups in
+	tools/tmxcopy/zlibutils.cpp: Fixed some width/height mixups in
 	TMXCopy.
 
 2008-03-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
@@ -1004,7 +1034,7 @@
 
 	* src/gui/textfield.cpp: Fixed a windows compilation problem
 	caused by a define macro of the Windows API that conflicts
-	with a guichan identifier. 
+	with a guichan identifier.
 
 2007-10-27  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
@@ -2289,7 +2319,7 @@
 2007-03-16  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/char_select.cpp, src/net/accountserver/account.cpp,
-	src/net/accountserver/account.hpp: Implemented 7 atribute system
+	src/net/accountserver/account.hpp: Implemented 7 attribute system
 	in character creation.
 
 2007-03-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>