Permalink
Browse files

Merge branch '0.6'

  • Loading branch information...
2 parents bbb4c1c + 9015268 commit 31010d6d3ba6600860a9f6dd925ac3d8e3f2c830 @bjorn bjorn committed Apr 2, 2012
View
@@ -47,3 +47,7 @@ docs/SOURCE/html/*
# static libraries
*.a
+
+# Xcode settings
+Xcode/mana.xcodeproj/xcuserdata
+Xcode/mana.xcodeproj/project.xcworkspace/xcuserdata
View
@@ -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})
View
13 NEWS
@@ -1,3 +1,16 @@
+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 problems with using the last emote
+- 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
View
2 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

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
Oops, something went wrong.

0 comments on commit 31010d6

Please sign in to comment.