summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-09-11 20:56:10 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-09-11 20:56:10 +0200
commit18b60037c4c5d7f7d880213e3b1005c4a2f9db95 (patch)
tree1934d564c6958ec1b54c5064d353e6bbdbdf76fa /data
parent47d2a4737844b967074dc90bdb984ddbdc0ecd29 (diff)
parent965cad21750b45206ceea4523d94b7ec92bb8ac6 (diff)
downloadmana-18b60037c4c5d7f7d880213e3b1005c4a2f9db95.tar.gz
mana-18b60037c4c5d7f7d880213e3b1005c4a2f9db95.tar.bz2
mana-18b60037c4c5d7f7d880213e3b1005c4a2f9db95.tar.xz
mana-18b60037c4c5d7f7d880213e3b1005c4a2f9db95.zip
Merge branch '0.5'
Conflicts: CMakeLists.txt src/map.cpp src/winver.h
Diffstat (limited to 'data')
-rw-r--r--data/help/changes.txt13
-rw-r--r--data/help/header.txt4
2 files changed, 7 insertions, 10 deletions
diff --git a/data/help/changes.txt b/data/help/changes.txt
index 2453a608..33fb2845 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,11 @@
##3 === RECENT CHANGES ===
+ 0.5.3 (11 September 2011)
+ - Fixed endless loop when a sprite definition promises too many images
+ - Fixed crash when selecting a character that has a Dark Talisman equipped
+ - Fixed building without OpenGL
+
0.5.2 (17 April 2011)
- Removed NPC "Thanks for buying/selling" messages from the chat
- Added a few missing authentication failure reasons
@@ -142,11 +147,3 @@
- Fixed inability to chat while talking to NPCs
- Updated Swedish translation
- 0.0.28 (25 January 2009)
- - Added support for animated map tiles
- - Added support for internationalization, plus many translations
- - Added support for TrueType fonts
- - Trade window is now resizable
- - Obscure precise home directory name when making screenshots
- - Fixed follow-parent of nested and being-following particle emitters
-
diff --git a/data/help/header.txt b/data/help/header.txt
index 505ae25c..52ecedae 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,8 +1,8 @@
-##1 M A N A S O U R C E
+##1 M A N A C L I E N T
##1 ==========================================
- ##2Version:##6 0.5.2 ##2Date:##3 17 April 2011
+ ##2Version:##6 0.5.3 ##2Date:##3 11 September 2011
##2 Website: http://manasource.org