--- deliantra/server/ChangeLog	2006/02/22 18:01:08	1.1.1.2
+++ deliantra/server/ChangeLog	2006/03/15 14:04:30	1.1.1.3
@@ -17,6 +17,104 @@
 ------------------------------------------------------------------------------
 Changes for CVS:
 
+common/utils.c: apply patch #1445892 (transmute_materialname crash) courtesy
+ the cf.schmorp.de development team.
+include/spellist.h: disable big unused arrays, legacy of spell code.
+server/c_object.c: merge find_best_apply_object_match and find_best_object_match
+ which are really the same.
+server/init.c: fix memory leak.
+server/monster.c: fix a monster/scroll related crash, based on patch #1447242 by
+ the cf.schmorp.de development team.
+server/player.c: fix monitor_spells not initalized (before InitConnection()).
+server/skills.c: fix merging bug with inscription.
+socket/init.c: fix monitor_spells not being initialized.
+Ryo 2006-03-14
+
+Fix bug/exploit in setup command.  We were strcat'ing back data provided
+by the client.
+---
+socket/request.c: Modify SetUp() to use safe_strcat() - eliminates buffer
+   overflow issues.  Add some char* casts to spell/skill requestinfo
+   to eliminate compiler warnings.  Add IP address to log for incoming
+   connections.
+MSW 2006-03-13
+
+Fix possible exploit with shadow alchemy. Also improve the alchemy spell to
+yield more nuggets.
+---
+server/shop.c: In query_cost() apply the hack (to multiply non-GEM/non-MONEY
+   values by four) also if no player object is present.
+Andreas Kirschbaum 2006-03-07
+
+Add settings permanent_experience_percentage, death_penalty_percentage and
+death_penalty_levels to the settings file.
+---
+common/living.c: don't hardcode exp calculations
+common/init.c, include/config.h, lib/settings: set defaults for new  values
+doc/settings: document new values
+include/global.h: change settings struct to hold the new values
+server/init.c: parse new values in the settings file.
+server/skill_util.c: reference new value
+Brendan Lally 2006-03-07
+
+Apply modified parts of patch #1439490 (Fix in random map generation) by CF
+Development Team Schmorp.de <crossfire@schmorp.de>.
+---
+random_maps/exit.c: In place_exits() check for a valid exit path before
+   dereferencing it.
+random_maps/treasure.c: In find_closest_monster() include monsters at map
+   border. In find_enclosed_spot() prevent access to out of map tiles.
+Andreas Kirschbaum 2006-03-04
+
+Apply patch #1436833 (Patch for forked lightning crash at map borders) by CF
+Development Team Schmorp.de <crossfire@schmorp.de>.
+---
+server/spell_attack.c: In forklightning() prevent access to out of map tiles.
+Andreas Kirschbaum 2006-03-04
+
+common/loader.l: Prevent excess whitespace while saving objects.
+common/loader.c: Rebuilt.
+Andreas Kirschbaum 2006-02-27
+
+Apply patch by Marc Alexander Lehmann to improve server performance.
+---
+include/map.h: Move path field to end of struct. Since this field was huge it
+   pushed all other fields to large offsets in the struct. Moving it to the
+   end of the struct mapdef should not break anything but will improve
+   performance and reduce the server code by >3500 bytes.
+Andreas Kirschbaum 2006-02-27
+
+------------------------------------------------------------------------------
+Changes for 1.9.0:
+
+lib/collect.pl.in: Again fix generation of 'editor_folder' field to make
+   sub-folder selection work again.
+lib/archetypes: Rebuilt.
+Andreas Kirschbaum 2006-02-26
+
+*/Makefile{in.am}: Fix plugin makefiles so that 'make distcheck' works.  Using
+  relative path names for files to include in distribution does not work -
+  need to have a makefile in each directory.
+configure{.ac}: Updated as result of new Makefiles.
+MSW 2006-02-24
+
+Apply patch #1428057 courtesy Pippijn van Steenhoven: fix to a crashing bug in plugins
+(incoherent order of parameters).
+Also use plugin_common.h in CFAnim instead of having separate definitions.
+Modified files:
+ plugins/cfanim/cfanim.c
+ plugins/cfanim/include/cfanim.h
+ plugins/cfanim/include/cfanim_proto.h
+ plugins/common/plugin_common.c
+ plugins/common/include/plugin_common.h
+Ryo 2006-02-23
+
+Remove object type CONFUSION since it was not used anymore.
+---
+common/item.c: Remove CONFUSION entry from item_types[] array.
+include/define.h: Uncomment #define CONFUSION.
+Andreas Kirschbaum 2006-02-22
+
 lib/collect.pl.in: Fix generation of 'editor_folder' field. It did not work
    too well for .arc files in deep subdirs.
 lib/{archetypes,bmaps.paths,crossfire.0}: Rebuilt.
@@ -116,7 +214,7 @@
 lib/Makefile.am lib/Makefile.in: install the new help file
 Brendan Lally 2006-02-10
 
-Apply modified patch by Pippijn van Steenhoven to fix get_rangevector
+Apply modified patch by Marc Alexander Lehmann to fix get_rangevector
 functions on tiled maps.
 ---
 server/map.c: Add helper function adjacent_map() to check if two maps are