summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-01 19:52:30 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-02 20:13:33 +0200
commitbc9a2e2135c7f515b29b7ee2e5cefde99c70d6c8 (patch)
treec2749e462a877b73d4ca59559311d49a5dbf83c0
parent4f8eacb64b5d5b1cf0cbd8071ed75f66f8354dfc (diff)
downloadmana-client-bc9a2e2135c7f515b29b7ee2e5cefde99c70d6c8.tar.gz
mana-client-bc9a2e2135c7f515b29b7ee2e5cefde99c70d6c8.tar.bz2
mana-client-bc9a2e2135c7f515b29b7ee2e5cefde99c70d6c8.tar.xz
mana-client-bc9a2e2135c7f515b29b7ee2e5cefde99c70d6c8.zip
Bumped version and updated news in preparation of 0.6.1 release
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS12
-rw-r--r--README2
-rw-r--r--data/help/changes.txt12
-rw-r--r--data/help/header.txt2
-rw-r--r--packaging/windows/setup.nsi2
-rw-r--r--src/main.h2
-rw-r--r--src/winver.h4
8 files changed, 31 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e06d02d..6996c7dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_POLICY(VERSION 2.6)
PROJECT(MANA)
IF (NOT VERSION)
- SET(VERSION 0.6.0)
+ SET(VERSION 0.6.1)
ENDIF()
STRING(REPLACE "." " " _VERSION ${VERSION})
diff --git a/NEWS b/NEWS
index ea84c258..4f7971c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+0.6.1 (2 April 2012)
+- Made it easier to click beings that are next to other beings
+- Removed NPC trade messages from chat (again)
+- Fixed swapping of ring and necklace equipment slots
+- Fixed drawing order of particles
+- Fixed manaserv-enabled builds
+- Fixed category of mana.desktop file
+- Fixed display of server description
+- Fixed issues with rendering very small maps
+- Fixed compile for Mac OSX and reintroduced Xcode project
+- Updated Finnish, Brazilian Portuguese and Polish translations
+
0.6.0 (12 February 2012)
- Added support for a larger number of character slots
- Added scrolling to tab bars when there isn't enough space
diff --git a/README b/README
index 671c804d..cd99e10a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA CLIENT
===============
- Version: 0.6.0 Date: 2012-02-12
+ Version: 0.6.1 Date: 2012-04-02
Development team:
- See AUTHORS file for a list
diff --git a/data/help/changes.txt b/data/help/changes.txt
index b7ecc8c8..a4a148cd 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,18 @@
##3 === RECENT CHANGES ===
##0
+ 0.6.1 (2 April 2012)
+ - Made it easier to click beings that are next to other beings
+ - Removed NPC trade messages from chat (again)
+ - Fixed swapping of ring and necklace equipment slots
+ - Fixed drawing order of particles
+ - Fixed manaserv-enabled builds
+ - Fixed category of mana.desktop file
+ - Fixed display of server description
+ - Fixed issues with rendering very small maps
+ - Fixed compile for Mac OSX and reintroduced Xcode project
+ - Updated Finnish, Brazilian Portuguese and Polish translations
+
0.6.0 (12 February 2012)
- Added support for a larger number of character slots
- Added scrolling to tab bars when there isn't enough space
diff --git a/data/help/header.txt b/data/help/header.txt
index 1e5b2fb5..2910af85 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
##1 M A N A C L I E N T
##1 =========================================
- ##2Version:##0 0.6.0 ##2Date:##0 12 February 2012
+ ##2Version:##0 0.6.1 ##2Date:##0 2 April 2012
##2 Website:##0 http://manasource.org
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 602d8291..f7d7e069 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -45,7 +45,7 @@ SetCompressor /SOLID lzma
!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\${PRODUCT_NAME_SHORT}.exe"
!ifndef PRODUCT_VERSION
- !define PRODUCT_VERSION "0.5-git"
+ !define PRODUCT_VERSION "0.6-git"
!endif
!define PRODUCT_PUBLISHER "Mana Development Team"
!define PRODUCT_WEB_SITE "http://manasource.org"
diff --git a/src/main.h b/src/main.h
index 1c0ce33a..5a663646 100644
--- a/src/main.h
+++ b/src/main.h
@@ -55,7 +55,7 @@
#elif defined _WIN32
#include "winver.h"
#elif defined __APPLE__
-#define PACKAGE_VERSION "0.6.0"
+#define PACKAGE_VERSION "0.6.1"
#endif
#ifdef PACKAGE_VERSION
diff --git a/src/winver.h b/src/winver.h
index ce6f23ee..4c33fe29 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -21,6 +21,6 @@
/* VERSION DEFINITIONS */
#define VER_MAJOR 0
#define VER_MINOR 6
-#define VER_RELEASE 0
+#define VER_RELEASE 1
#define VER_BUILD 0
-#define PACKAGE_VERSION "0.6.0.0"
+#define PACKAGE_VERSION "0.6.1.0"