summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog74
-rw-r--r--src/CMakeLists.txt5
2 files changed, 44 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 174fbcfd..2e0e1b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-19 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * src/CMakeLists.txt: Updated CMake file.
+ * data/equipment.xml: Fixed typo in female light plate mail.
+
2007-08-19 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/localplayer.h: Fixed typo.
@@ -53,32 +58,34 @@
2007-08-08 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/gui/equipmentwindow.cpp, data/graphics/gui/Makefile.am,
- data/graphics/images/EquipBackground.png: Moved equipment background to
- the gui directory. Changed name to lowercase only.
- * src/localplayer.cpp, src/equipment.h, src/equipment.cpp: Ensured that
- equipment is cleared at the same time as the inventory.
+ data/graphics/images/EquipBackground.png: Moved equipment background
+ to the gui directory. Changed name to lowercase only.
+ * src/localplayer.cpp, src/equipment.h, src/equipment.cpp: Ensured
+ that equipment is cleared at the same time as the inventory.
* src/net/beinghandler.cpp: Fixed position of the cleaning bit for
looks, so that it actually fits into network data.
2007-08-08 Josh Langley <joshlangley[at]optusnet.com.au>
- * src/equipment.h, src/gui/equipmentwindow.cpp, src/gui/equipmentwindow.h,
- src/localplayer.cpp, src/net/gameserver/player.cpp,
- src/net/gameserver/player.h, data/graphics/images/EquipBackground.png:
- Re-designed equipment window, un-equip created.
+ * src/equipment.h, src/gui/equipmentwindow.cpp,
+ src/gui/equipmentwindow.h, src/localplayer.cpp,
+ src/net/gameserver/player.cpp, src/net/gameserver/player.h,
+ data/graphics/images/EquipBackground.png: Re-designed equipment
+ window, un-equip created.
2007-08-07 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* po/Makevars, src/main.cpp: Replaced PACKAGE by tmw to reduce
preprocessing hell. Set gettext charset to utf8.
- * src/gui/menuwindow.cpp, src/gui/connection.cpp, src/gui/register.cpp,
- src/gui/equipmentwindow.cpp, src/gui/quitdialog.cpp, src/gui/login.cpp,
- src/gui/item_amount.cpp, src/gui/npclistdialog.cpp, src/gui/setup.cpp,
- src/gui/char_select.cpp, src/gui/setup_audio.cpp, src/gui/npc_text.cpp,
- src/gui/setup_video.cpp, src/gui/ministatus.cpp, src/gui/ok_dialog.cpp,
- src/gui/confirm_dialog.cpp, src/gui/setup_joystick.cpp,
- src/gui/serverdialog.cpp, src/gui/minimap.cpp, src/gui/popupmenu.cpp:
- Marked as translatable.
+ * src/gui/menuwindow.cpp, src/gui/connection.cpp,
+ src/gui/register.cpp, src/gui/equipmentwindow.cpp,
+ src/gui/quitdialog.cpp, src/gui/login.cpp, src/gui/item_amount.cpp,
+ src/gui/npclistdialog.cpp, src/gui/setup.cpp, src/gui/char_select.cpp,
+ src/gui/setup_audio.cpp, src/gui/npc_text.cpp,
+ src/gui/setup_video.cpp, src/gui/ministatus.cpp,
+ src/gui/ok_dialog.cpp, src/gui/confirm_dialog.cpp,
+ src/gui/setup_joystick.cpp, src/gui/serverdialog.cpp,
+ src/gui/minimap.cpp, src/gui/popupmenu.cpp: Marked as translatable.
* src/gui/trade.cpp, src/gui/equipmentwindow.cpp, src/gui/window.cpp,
src/gui/inventorywindow.h, src/gui/chat.cpp, src/gui/debugwindow.cpp,
src/gui/skill.cpp, src/gui/help.cpp, src/gui/inventorywindow.cpp,
@@ -92,8 +99,8 @@
2007-08-06 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/Makefile.am, src/utils/strprintf.h, src/utils/strprintf.cpp:
- Added a helper function for printf-formatting a (gettext) C string into
- a dynamically-sized C++ string.
+ Added a helper function for printf-formatting a (gettext) C string
+ into a dynamically-sized C++ string.
* src/gui/inventory.cpp: Completed marking of translatable strings for
inventory window.
* po/tmw.pot: Updated with new translatable strings.
@@ -101,16 +108,16 @@
* src/resources/gettext.h, src/main.cpp: Moved header to utils
directory.
* src/utils/tostring.h: Fixed typo in macro guard.
- * po/Makefile.in.in, po/remove-potcdate.sin, configure.ac, Makefile.am,
- autogen.sh: Used autopoint for generating gettext environment, and
- removed conflicting files.
+ * po/Makefile.in.in, po/remove-potcdate.sin, configure.ac,
+ Makefile.am, autogen.sh: Used autopoint for generating gettext
+ environment, and removed conflicting files.
2007-08-05 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* configure.ac, Makefile.am, po, src/Makefile.am, src/main.cpp,
src/resources/gettext.h: Added support for internationalization.
- * src/gui/inventorywindow.cpp: Marked a few strings as translatable for
- testing purpose.
+ * src/gui/inventorywindow.cpp: Marked a few strings as translatable
+ for testing purpose.
* po/tmw.pot: Generated the main template.
* po/LINGUAS, po/fr.po: Added French translation.
@@ -192,8 +199,8 @@
2007-07-12 Guillaume Melquiond <guillaume.melquiond@gmail.com>
- * src/net/beinghandler.cpp, src/net/beinghandler.h, src/net/protocol.h:
- Added support for visible equipment.
+ * src/net/beinghandler.cpp, src/net/beinghandler.h,
+ src/net/protocol.h: Added support for visible equipment.
2007-07-11 Bjørn Lindeijer <bjorn@lindeijer.nl>
@@ -201,8 +208,8 @@
2007-07-08 Guillaume Melquiond <guillaume.melquiond@gmail.com>
- * src/player.cpp, src/player.h, src/localplayer.h, src/being.h: Changed
- signatures to prevent the wrong members to be overloaded on
+ * src/player.cpp, src/player.h, src/localplayer.h, src/being.h:
+ Changed signatures to prevent the wrong members to be overloaded on
architectures with 64-bit integers and to shut some compiler warnings.
* src/localplayer.cpp: Fixed some uninitialized variables.
@@ -222,15 +229,16 @@
2007-06-29 Philipp Sehmisch <tmw@crushnet.org>
- * src/particle.cpp, src/particleemitter.cpp: Corrected some perspective
- issues of the particle engine and fixed a crash caused by particles
- with child emitters that have an image than isn't used elsewhere.
+ * src/particle.cpp, src/particleemitter.cpp: Corrected some
+ perspective issues of the particle engine and fixed a crash caused by
+ particles with child emitters that have an image than isn't used
+ elsewhere.
* data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point
in Tulimshar.
2007-06-21 Philipp Sehmisch <tmw@crushnet.org>
- * data/monsters.xml, data/graphics/sprites/monster-logmonster.png,
+ * data/monsters.xml, data/graphics/sprites/monster-logmonster.png,
data/graphics/sprites/monster-logmonster.xml: Added logmonster by
Enigmatik (Monster ID is 23).
* data/items.xml, data/equipment.xml,
@@ -264,8 +272,8 @@
2007-06-11 Philipp Sehmisch <tmw@crushnet.org>
- * src/particle.h, src/being.cpp: Fixed a bug that prevented
- being-controlled particles from being deleted (thanks to tuchs for
+ * src/particle.h, src/being.cpp: Fixed a bug that prevented
+ being-controlled particles from being deleted (thanks to tuchs for
reporting).
2007-06-06 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e09e08ff..fa19cfb5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,8 +188,6 @@ SET(SRCS
net/chathandler.h
net/connection.cpp
net/connection.h
- net/equipmenthandler.cpp
- net/equipmenthandler.h
net/internal.cpp
net/internal.h
net/inventoryhandler.cpp
@@ -278,7 +276,10 @@ SET(SRCS
utils/base64.h
utils/dtor.h
utils/fastsqrt.h
+ utils/gettext.h
utils/minmax.h
+ utils/strprintf.cpp
+ utils/strprintf.h
utils/tostring.h
utils/xml.cpp
utils/xml.h