Merged 0.0 changes from revision 2800 to 2825 to trunk.

1 files changed, 70 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 45b92cbd..663c53b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2006-11-05  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/images/login_wallpaper.png: Reverted to standard
+	wallpaper.
+	* src/resources/resourcemanager.cpp: More useful logging about
+	resources that are being loaded (including source).
+
+2006-11-05  Yohann Ferreira  <bertram@cegetel.net>
+
+	* src/Makefile.am, src/gui/buy.cpp, src/gui/buy.h, src/gui/shop.h,
+	src/gui/shop.cpp, src/gui/sell.cpp, src/gui/shoplistbox.h,
+	src/gui/shoplistbox.cpp: Added pictures to items in buy dialogs.
+	Also too expensive items are highlighted in gray and can't be
+	selected.
+	* src/gui/shop.cpp, src/gui/shop.h, src/gui.sell.h, src/gui/sell.cpp,
+	src/net/buysellhandler.cpp, src/gui/shoplistbox.h,
+	src/gui/shoplistbox.cpp: Added item's pictures in sell dialogs, and
+	precisions about the total money in it.
+	* src/gui/shop.h, src/gui/shop.cpp, src/gui/sell.cpp: Fixes to Sell
+	dialog.
+
+2006-11-05  Björn Steinbrink  <B.Steinbrink@gmx.de>
+
+	* data/graphics/sprites/Makefile.am: Use tabs instead of spaces as
+	required by automake (AFAIK).
+
+2006-11-05  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/weapon0.png,
+	data/graphics/sprites/weapon2.png,
+	data/graphics/sprites/weapon-bow.xml,
+	data/graphics/sprites/weapon-dagger.xml,
+	data/graphics/sprites/weapon-fist.xml,
+	data/graphics/sprites/weapon-scythe.xml,
+	data/graphics/items/weapon-polearm-scythe.png, src/player.cpp,
+	src/player.h, src/being.cpp, src/being.h, data/items.xml: Added scythe
+	as a permanent weapon (ID: 623)
+
 2006-11-04  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/main.cpp: Use \n instead of std::endl when writing to stdout.
@@ -9,6 +47,31 @@
 	instead of /dev/null to quieten libxml2. Actually initialize libxml2
 	before using it to load the configuration.
 
+2006-11-04  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/maps/new_1-1.tmx.gz, data/maps/new_10-1.tmx.gz,
+	data/maps/new_11-1.tmx.gz, data/maps/new_14-1.tmx.gz,
+	data/maps/new_15-1.tmx.gz, data/maps/new_16-1.tmx.gz,
+	data/maps/new_3-1.tmx.gz, data/maps/new_7-1.tmx.gz,
+	data/maps/new_9-1.tmx.gz: Reverted Halloween map versions, except for
+	map 10 and 11 which include the latest fixes by Crush but now have
+	their night layer removed.
+
+2006-11-04  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_17-1.tmx.gz, 
+	data/graphics/images/minimap_new_17-1.png,
+	data/graphics/images/Makefile.am,
+	data/graphics/images/CMakeLists.txt:
+	Added music and minimap to woodland cave level 2.
+	* data/maps/new_10-1.tmx.gz, maps/new_11-1.tmx.gz:
+	Fixed some map bugs (please update server sided walkmap)
+
+2006-11-03  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/updatewindow.cpp, src/main.cpp: Updated to the new default
+	updatehost.
+
 2006-11-02  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/gui/register.cpp, src/gui/register.h: Fixed a memory leak and a
@@ -59,17 +122,15 @@
 
 2006-10-31  Philipp Sehmisch  <tmw@crushnet.org>
 
-	*data/graphics/tiles/desert1.png, d
-	ata/graphics/tiles/desert_x2.png: adding a bunch of graphical 
-	improvements made by VxD.
+	* data/graphics/tiles/desert1.png, data/graphics/tiles/desert_x2.png:
+	Adding a bunch of graphical improvements made by VxD.
 
 2006-10-31  Frode Lindeijer  <f.lindeijer@gmail.com>
 
-	* /data/graphics/sprites/item011.png,
-	/data/graphics/sprites/item011.xml,
-	/data/graphics/sprites/item012.png,
-	/data/graphics/sprites/item018.xml,
-	/data/graphics/sprites/monster21.xml: Fixed some graphical issues,
+	* data/graphics/sprites/item011.png,
+	data/graphics/sprites/item011.xml, data/graphics/sprites/item012.png,
+	data/graphics/sprites/item018.xml,
+	data/graphics/sprites/monster21.xml: Fixed some graphical issues,
 	mostly a cosmetic update.
 
 2006-10-30  Yohann Ferreira  <bertram@cegetel.net>
@@ -78,7 +139,7 @@
 
 2006-10-30  Philipp Sehmisch  <tmw@crushnet.org>
 
-	* data/maps/new_9-1.tmx.gz: Removed the night effect that accidently
+	* data/maps/new_9-1.tmx.gz: Removed the night effect that accidentally
 	sneaked in with the last map change.
 
 2006-10-30  Eugenio Favalli  <elvenprogrammer@gmail.com>