Merge branch '0.5' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 48 insertions, 8 deletions

diff --git a/data/help/changes.txt b/data/help/changes.txt
index e330038a..4b92e0af 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -1,8 +1,48 @@
  <- @@index|Back to Index@@
- 
- 
+
+
 ##3                         === RECENT CHANGES ===
- 
+
+ 0.5.0 (October 2010)
+ - The Mana World client is now called the Mana client
+ - Added support for branding the client differently via command line parameter
+ - Added support for ManaServ and eAthena (TMW version) from the same binary
+ - Added support for switching character or server without restart
+ - Added downloading of server list
+ - Added the ability to define multiple outfits to quickly switch between
+ - Added /ignore, /unignore and /createparty commands
+ - Added support for showing particle effects when monsters attack
+ - Added highlights on hovering over buttons, tabs, sliders and scrollbars
+ - Added --screenshot-dir command line parameter to set the screenshot directory
+ - Added handling of player revival after dying
+ - Added handling of damage dealt using skills
+ - Added support for showing map background images
+ - Added nick autocompletion in chat when pressing Tab
+ - Added ability to only change player direction by holding "emote" key
+ - Added option to show the amount of damage dealt to target monster
+ - Added automatic loading of minimap based on file name
+ - Added support for pasting text from the clipboard in text fields
+ - Added rudimentary support for GUI themes
+ - Added additional mouse cursors to indicate attack and talk actions
+ - Added option to show gender next to player names
+ - Added ability to unassign keyboard shortcuts
+ - Combined Party and Guild (ManaServ) support in one Social window
+ - Display the first key binding conflict in keyboard setup
+ - The login wallpaper is now scaled when it doesn't exactly fit the screen
+ - Ambient image layers can now be scaled to fit the screen
+ - Automatically show inventory window when starting a trade
+ - Display the party name of other players on mouseover
+ - The party tab will now only show when you're in a party
+ - Allow displaying warp portals using particle effects
+ - Hide color codes from speech text
+ - Improved keyboard control of the quit dialog
+ - Quickly move items into your store by "emote"-clicking them
+ - Allow redirects when downloading updates
+ - Fixed windows to stay on screen when resolution is lowered
+ - Fixed some slowness due to chat window
+ - Changed the default locations for configuration, updates and screenshots
+ - Many additional fixes and cleanups
+
  0.0.29.1 (9 June 2009)
  - Added the ability to change your password after logging in
  - The leader of a party is now displayed in bold
@@ -66,7 +106,7 @@
  - Many more bug fixes, small improvements and code cleanups
  - Updated German, Finnish, Croatian, French, Spanish, Swedish and Polish
    translations
- 
+
  0.0.28.1 (12 February 2009)
  - Enabled translations on Windows
  - Added command line option to set home directory path
@@ -75,7 +115,7 @@
  - Fixed restoring of punching animation after weapon removal
  - Fixed inability to chat while talking to NPCs
  - Updated Swedish translation
- 
+
  0.0.28 (25 January 2009)
  - Added support for animated map tiles
  - Added support for internationalization, plus many translations
@@ -83,7 +123,7 @@
  - Trade window is now resizable
  - Obscure precise home directory name when making screenshots
  - Fixed follow-parent of nested and being-following particle emitters
- 
+
  0.0.27 (9 December 2008)
  - Added support for showing map name above minimap
  - Added showing how long the ban is when banned
@@ -109,11 +149,11 @@
  - Fixed a crash when equipment window is open
  - Fixed money value on failing to buy (from Aethyra)
  - Fixed crash in right-click menu when used after a being disappeared
- 
+
  0.0.26 (29 August 2008)
  - Added support for a newer version of eAthena server
  - Added support for showing custom being effects
  - Added new features to the particle engine
  - Position names and chat such that there is no overlap, when possible
  - Fixed a crash when loading a corrupt map that has too much layer data
- 
+