From b2c1c301b1e39fbbbb5bde3d4d55d14a9873b51f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 9 Jun 2012 15:47:22 +0300 Subject: Change version to 1.2.6.10 --- ChangeLog | 17 +++++++++++++++++ README | 2 +- README.txt | 2 +- build/packevol | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ae35e323..92eaf648d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2012-06-10 New release 1.2.6.10 +fix: incorrect animation (hair bug). +fix: keys conflict in login dialog. +fix: kill stats on levelup. +fix: stay animation in beings without dead animation. +add: player relations to whisper chat context menu. +add: per hair style own palete (evol). +add: sittop animation (evol). +add: ground top collision flag (evol). +add: hide botchecker button by default. +add: improve image loading in OpenGL renderers. +add: improve dye speed. +add: footer to help window. +add: per server news in help window. +add: use actual desktop dir for screenshots in linux. +add: to npc option to disallow select npc. + 2012-05-27 New release 1.2.5.27 fix: tips translations. fix: joystick repeat key presses. diff --git a/README b/README index e436a1a5c..b21b152a1 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.5.27 Date: 2012-05-27 + Version: 1.2.6.10 Date: 2012-06-10 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 302834f35..1097bd936 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.5.27 Date: 2012-05-27 + Version: 1.2.6.10 Date: 2012-06-10 Development team: - See AUTHORS file for a list diff --git a/build/packevol b/build/packevol index 598f272e6..53ee258c2 100755 --- a/build/packevol +++ b/build/packevol @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.5.27" \ + -DPRODUCT_VERSION="1.2.6.10" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packwin b/build/packwin index 98be9bddf..16d92a32c 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.5.27" \ + -DPRODUCT_VERSION="1.2.6.10" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index f92819b6e..e98d5ce9a 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.2.5.27], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.6.10], [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 6cdfd88c8..ffad96d38 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.2.5.27" -#define CHECK_VERSION "01.02.05.27" +#define SMALL_VERSION "1.2.6.10" +#define CHECK_VERSION "01.02.06.10" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-60-g2f50