summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-02-05 18:51:39 +0200
committerAndrei Karas <akaras@inbox.ru>2011-02-05 18:51:39 +0200
commit63db82df62805224dcd65b545236dcfe86fe6bb0 (patch)
treea5691d74be1d071a1dc32141ed62cfd9c3b38ae3
parentfcf12d937c55e115e80325f8fbd6069f27a667a3 (diff)
downloadmanaplus-63db82df62805224dcd65b545236dcfe86fe6bb0.tar.gz
manaplus-63db82df62805224dcd65b545236dcfe86fe6bb0.tar.bz2
manaplus-63db82df62805224dcd65b545236dcfe86fe6bb0.tar.xz
manaplus-63db82df62805224dcd65b545236dcfe86fe6bb0.zip
Change version to 1.1.2.6.
-rw-r--r--ChangeLog10
-rw-r--r--README2
-rw-r--r--data/help/header.txt2
-rwxr-xr-xpackwin2
-rw-r--r--src/main.h6
5 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 529b38890..adf26dbdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-06 New release 1.1.2.6.
+ManaPlus:
+fix: crashes.
+fix: close npc dialogs in different actions like change character/server or network error.
+fix: dont show random navigation point with coord 0,0.
+fix: update item amount in sell dialog.
+add: japanese fonts mplus 1p regular and mplus 1p bold.
+add: option to enable/disable players popups.
+
+
2011-01-30 New release 1.1.1.30.
ManaPlus:
fix: stuck on disconnections while opened modal window.
diff --git a/README b/README
index 150579b05..fd3d627b5 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.1.1.30 Date: 2011-01-30
+ Version: 1.1.2.6 Date: 2011-02-06
Development team:
- See AUTHORS file for a list
diff --git a/data/help/header.txt b/data/help/header.txt
index f257f8115..c2f405e3b 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
##1 M A N A P L U S
##1 ================================
- ##2Version:##6 1.1.1.30 ##2Date:##3 30 January 2011
+ ##2Version:##6 1.1.2.6 ##2Date:##3 06 February 2011
##2 Website: http://tmw.cetki.com/
##2 http://mana.cetki.com/
diff --git a/packwin b/packwin
index 2b5996e27..9c681c426 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
- -DPRODUCT_VERSION="1.1.1.30" \
+ -DPRODUCT_VERSION="1.1.2.6" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/src/main.h b/src/main.h
index f24f93bd7..db01c4d04 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,15 +86,15 @@
//define DEBUG_FONT_COUNTERS 1
//define DEBUG_ALPHA_CACHE 1
-#define SMALL_VERSION "1.1.1.30"
-#define CHECK_VERSION "01.01.01.30"
+#define SMALL_VERSION "1.1.2.6"
+#define CHECK_VERSION "01.01.02.06"
#define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
"; %s; 4144 v" SMALL_VERSION ")"
#define PACKAGE_VERSION_4144 "ManaPlus 4144-" SMALL_VERSION ""
-#define FULL_VERSION "ManaPlus 4144 " SMALL_VERSION " " PACKAGE_OS
+#define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS
#ifndef PKG_DATADIR
#define PKG_DATADIR ""