summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-07 14:46:21 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-07 14:46:21 +0300
commitd4c1d0ebb7a7fdfecacf4e0a06eab4122da0d23d (patch)
tree7b41854e105b0be012142493c786cafa8192af5e
parentedd04bf83e7ac8d593d2053400992a6a545ffc47 (diff)
downloadplus-d4c1d0ebb7a7fdfecacf4e0a06eab4122da0d23d.tar.gz
plus-d4c1d0ebb7a7fdfecacf4e0a06eab4122da0d23d.tar.bz2
plus-d4c1d0ebb7a7fdfecacf4e0a06eab4122da0d23d.tar.xz
plus-d4c1d0ebb7a7fdfecacf4e0a06eab4122da0d23d.zip
Change version to 1.5.11.7.v1.5.11.7
-rw-r--r--ChangeLog10
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--README.txt2
-rwxr-xr-xbuild/packevol2
-rwxr-xr-xbuild/packtmw2
-rwxr-xr-xbuild/packwin2
-rwxr-xr-xconfigure.ac2
-rw-r--r--src/main.h4
9 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 396b623a9..4c1f85c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-11-07 New release 1.5.11.7
+fix: not reduce tiles in conditional layers.
+fix: cart inventory if it empty.
+add: separate flag for enable/disable gui opacity.
+add: npc menu and inventory skins support.
+add: extend npc inventory.
+add: dead trick status effect (hercules).
+add: status effects in player popup.
+add: buy/sell many items at once from npc (hercules).
+
2015-10-24 New release 1.5.10.24
fix: remove useless memory allocations.
fix: status effects (hercules)
diff --git a/README b/README
index ac1b19d5e..b75c3815e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.5.10.24 Date: 2015-10-24
+ Version: 1.5.11.7 Date: 2015-11-07
Development team:
- See AUTHORS file for a list
diff --git a/README.md b/README.md
index 0c49f098a..ad0e12cfc 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
![The Mana World logo](data/icons/manaplus.png)
-Version: 1.5.10.24 Date: 2015-10-24
+Version: 1.5.11.7 Date: 2015-11-07
### Development team:
- See [AUTHORS](AUTHORS) file for a list
diff --git a/README.txt b/README.txt
index fb0618b08..603f237cc 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.5.10.24 Date: 2015-10-24
+ Version: 1.5.11.7 Date: 2015-11-07
Development team:
- See AUTHORS file for a list
diff --git a/build/packevol b/build/packevol
index d2779ee9f..425eebacd 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../libs/dll/ \
- -DPRODUCT_VERSION="1.5.10.24" \
+ -DPRODUCT_VERSION="1.5.11.7" \
-DEXESUFFIX=/src \
-DUPX=true \
evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 46e005c72..c63f0430d 100755
--- a/build/packtmw
+++ b/build/packtmw
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../libs/dll/ \
- -DPRODUCT_VERSION="1.5.10.24" \
+ -DPRODUCT_VERSION="1.5.11.7" \
-DEXESUFFIX=/src \
-DUPX=true \
tmw.nsi
diff --git a/build/packwin b/build/packwin
index 2ab6c10af..2410cbfa7 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../libs/dll/ \
- -DPRODUCT_VERSION="1.5.10.24" \
+ -DPRODUCT_VERSION="1.5.11.7" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/configure.ac b/configure.ac
index 22679629c..76e5cba32 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.5.10.24], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.5.11.7], [akaras@inbox.ru], [manaplus])
AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_LANG_CPLUSPLUS
diff --git a/src/main.h b/src/main.h
index 8d6846514..62eb89783 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,8 +45,8 @@
* different interfaces, which have different implementations for each server.
*/
-#define SMALL_VERSION "1.5.10.24"
-#define CHECK_VERSION "01.05.10.24"
+#define SMALL_VERSION "1.5.11.7"
+#define CHECK_VERSION "01.05.11.07"
#ifdef HAVE_CONFIG_H
#include "../config.h"