From 78af28b2ddf171580234d36f0b18c543cd2eef2e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 8 Oct 2011 04:53:25 +0300 Subject: some fixes in manaplus.cbp --- src/main.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main.h') diff --git a/src/main.h b/src/main.h index 95a1b1698..06b99d2e9 100644 --- a/src/main.h +++ b/src/main.h @@ -45,12 +45,15 @@ * different interfaces, which have different implementations for each server. */ +#define SMALL_VERSION "1.1.10.2" +#define CHECK_VERSION "01.01.10.02" + #ifdef HAVE_CONFIG_H #include "../config.h" #elif defined WIN32 #include "winver.h" -#elif defined __APPLE__ -#define PACKAGE_VERSION "1.0.0" +#else +#define PACKAGE_VERSION SMALL_VERSION #endif #if defined __APPLE__ @@ -85,10 +88,6 @@ //define DEBUG_ALPHA_CACHE 1 //define DEBUG_OPENGL_LEAKS 1 -#define SMALL_VERSION "1.1.10.2" -#define CHECK_VERSION "01.01.10.02" - - #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ "; %s; 4144 v" SMALL_VERSION ")" #define PACKAGE_VERSION_4144 "ManaPlus 4144-" SMALL_VERSION "" -- cgit v1.2.3-60-g2f50 From f5447bdae88228d58dc7e75f542c56dff079e504 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 15 Oct 2011 17:40:33 +0300 Subject: Change version to 1.1.10.16. --- ChangeLog | 14 ++++++++++++++ README | 2 +- README.txt | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 6 files changed, 20 insertions(+), 6 deletions(-) (limited to 'src/main.h') diff --git a/ChangeLog b/ChangeLog index ea6a84ead..463e48933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-10-16 New release 1.1.10.16 +ManaPlus: +fix: particle effects Y position. +fix: resize in some dialogs. +fix: codeblocks project file. +fix: global messages sound highlight. +fix: last character selection with space in login dialog. +fix: fps if network error. +add: move to target mode for archers/mages. +add: blacklist relation. +add: reading real monsters attack range (in evol only). +add: option to show hide MVP messages. +add: update mplus fonts. + 2011-10-02 New release 1.1.10.2 ManaPlus: fix: inactive state. diff --git a/README b/README index 6956d4ef0..ad106569c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.10.2 Date: 2011-10-02 + Version: 1.1.10.16 Date: 2011-10-16 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 758408520..268a7b0c7 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.10.2 Date: 2011-10-02 + Version: 1.1.10.16 Date: 2011-10-16 Development team: - See AUTHORS file for a list diff --git a/build/packwin b/build/packwin index cef5d27fa..81920b9fa 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.1.10.2" \ + -DPRODUCT_VERSION="1.1.10.16" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index c234fcbe5..3c4b8d011 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.10.2], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.10.16], [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 06b99d2e9..548c3283f 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.1.10.2" -#define CHECK_VERSION "01.01.10.02" +#define SMALL_VERSION "1.1.10.16" +#define CHECK_VERSION "01.01.10.16" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-60-g2f50