summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-20 12:27:56 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-20 12:27:56 +0000
commitca58ec1faedca0081ecd233f2cefa1ba783cebf4 (patch)
tree11216c01bb8867a9bd4ad6d4b8bdefc3c61a952a /ChangeLog
parent5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (diff)
downloadmana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.tar.gz
mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.tar.bz2
mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.tar.xz
mana-ca58ec1faedca0081ecd233f2cefa1ba783cebf4.zip
Merged revisions 3642,3662-3664,3667 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line Factored code between resource handlers. Implemented failure-friendly sprite loader. ........ r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line Added persistent positioning. ........ r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line Fixed missing pixels at bottom and right. ........ r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line Changed to use default values when restoring missing settings. ........ r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line Fixed invisible text in dropboxes and shopboxes. ........
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog20
1 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c480370..9510b750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,11 +85,31 @@
* src/resources/monsterdb.cpp: Plugged memory leak in database reader.
* src/engine.cpp, src/engine.h, src/game.cpp: Fixed current map not
deleted on server change.
+ * src/gui/trade.cpp: Added persistent positioning.
+ * src/gui/menuwindow.cpp: Fixed missing pixels at bottom and right.
+ * src/gui/window.cpp, src/gui/window.h: Changed to use default values
+ when restoring missing settings.
+ * src/gui/shoplistbox.cpp, src/gui/listbox.cpp: Fixed invisible text.
2007-10-20 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/gui/playerbox.cpp: Centered sprite inside selection box.
+2007-10-19 Guillaume Melquiond <guillaume.melquiond@gmail.com>
+
+ * src/resources/resource.cpp, src/resources/resource.h,
+ src/resources/imageset.cpp, src/resources/imageset.h: Removed mandatory
+ identifier path.
+ * src/resources/resourcemanager.cpp, src/resources/resourcemanager.h:
+ Factored code between resource handlers.
+ * src/resources/soundeffect.h, src/resources/soundeffect.cpp,
+ src/resources/music.h, src/resources/music.cpp, src/resources/image.h,
+ src/resources/image.cpp: Reworked resource loaders.
+ * src/resources/spritedef.h, src/resources/spritedef.cpp: Implemented
+ a failure-friendly loader.
+ * src/gui/truetypefont.cpp, src/resources/imageloader.cpp,
+ src/tileset.h: Removed dummy parameter.
+
2007-10-19 Philipp Sehmisch <tmw@crushnet.org>
* data/graphics/images/ambient/fog.png: Added fog effect overlay