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

12 files changed, 137 insertions, 237 deletions

diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 546ad5ea..4a35d081 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -6,6 +6,8 @@
 	<color id="BUTTON" color="#000000" />
 	<color id="BUTTON_DISABLED" color="#333333" />
 	<color id="TAB" color="#000000" />
+	<color id="PARTY_CHAT_TAB" color="#f48055" />
+	<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
 	<color id="BACKGROUND" color="#ffffff" />
 	<color id="HIGHLIGHT" color="#c0c0c0" />
 	<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt
index 82f61d54..c624a597 100644
--- a/data/help/CMakeLists.txt
+++ b/data/help/CMakeLists.txt
@@ -4,9 +4,8 @@ SET(FILES
     commands.txt
     header.txt
     index.txt
-    skills.txt
     support.txt
-    team.txt
+    windows.txt
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help)
diff --git a/data/help/Makefile.am b/data/help/Makefile.am
index 5abd2735..f070fc39 100644
--- a/data/help/Makefile.am
+++ b/data/help/Makefile.am
@@ -7,9 +7,8 @@ help_DATA =				\
 	commands.txt		\
 	header.txt			\
 	index.txt			\
-	skills.txt			\
 	support.txt			\
-	team.txt
+	windows.txt
 
 EXTRA_DIST =			\
 	$(help_DATA) \
diff --git a/data/help/about.txt b/data/help/about.txt
index 93be4632..9b46b3f1 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -11,4 +11,15 @@
  The project includes the development of both a client and a server.
  Others are making worlds using Mana software. The Mana World project
  is the originator of the Mana project. Mana was split off to further
- facilitate development of other worlds.
\ No newline at end of file
+ facilitate development of other worlds.
+ 
+ 
+##3                           === Powered By ===
+
+##2               SDL, SDL_image, SDL_mixer (Media framework)
+##2                     SDL_net (Networking framework)
+##2                        Guichan (GUI framework)
+##2                   libxml2 (XML parsing and writing)
+##2                          PhysFS (Data files)
+##2                        libcurl (HTTP downloads)
+##2                            zlib (Archives)
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
- 
+
diff --git a/data/help/commands.txt b/data/help/commands.txt
index c4795050..edb17c52 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -2,45 +2,67 @@
  
  
 ##3                            === COMMANDS ===
- 
-##2KEYBOARD:
 
- Use arrow keys to move around. Other keys:
+KEYBOARD:
+
+##2 Use arrow keys to move around.
  
- Other keys:
+##3Most useful keys:
  
+     ##2Enter##P              focus chat window / send message
+     ##2A##P                  target nearest monster
      ##2Ctrl##P               attack
+     ##2X##P                  target & attack
+     ##2left shift##P         stop attack
+     ##2Z##P                  pick up item
+     ##2S##P                  sit down / stand up
+     ##2R##P                  toggle ignore of incoming trades
+     ##2Escape##P             quit
+
+##3Advanced keys:
+
+     ##2space##P              select OK
+     ##2Alt + 0-9##P          show emotions
+     ##2Q##P                  target nearest player
+     ##2N##P                  target nearest NPC
+     ##2T##P                  talk to targeted NPC
+     ##2P##P                  take screenshot
+     ##20-9##P                item shortcut
+     ##2right Ctrl##P         wear outfit
+     ##2right Alt##P          copy outfit
+     ##2Page Up##P            scroll chat up
+     ##2Page Down##P          scroll chat down
+     ##2[##P                  previous chat tab
+     ##2]##P                  next chat tab
+     ##2H##P                  hide all non-sticky windows
+     ##2F##P                  toggle debug pathfinding feature
+
+##3Keys to toggle windows:
+
      ##2F1##P                 toggle the online help
-     ##2F2##P                 toggle profile window
+     ##2F2##P                 toggle status window
      ##2F3##P                 toggle inventory window
      ##2F4##P                 toggle equipment window
      ##2F5##P                 toggle skills window
      ##2F6##P                 toggle minimap
      ##2F7##P                 toggle chat window
-     ##2F8##P                 toggle shortcut window
-     ##2F9##P                 show setup window
+     ##2F8##P                 toggle item shortcut window
+     ##2F9##P                 toggle setup window
      ##2F10##P                toggle debug window
-     ##2Alt + 0-9##P          show emotions
-     ##2Alt + S##P            sit down / stand up
-     ##2Alt + F##P            toggle debug pathfinding feature
-     ##2Alt + P##P            take screenshot
-     ##2Alt + T##P            toggle ignore of incoming trades
-     ##2A##P                  target nearest monster
-     ##2H##P                  hide all non-sticky windows
-     ##2Z##P                  pick up item
-     ##2Enter##P              focus chat window / send message
+     ##2F11##P                toggle social window
+     ##2F12##P                toggle emote shortcut window
+     ##2O##P                  toggle outfit window
 
 
-##2MOUSE:
+##3MOUSE:
 
- Left click to execute default action: walk, pick up an item, attack a monster
- and talk to NPCs (be sure to click on their feet). Right click to show up a
- context menu. Holding [Left Shift] prevents from walking when attacking.
+##2 Left click to execute default action: walk, pick up an item, attack a monster
+ and talk to NPCs.  Right click to show up a context menu.
 
 
-##2COMMUNICATION:
+##3COMMUNICATION:
 
- Communication is often essential to success in this game. You can communicate
+##2 Communication is often essential to success in this game. You can communicate
  in several ways:  By chatting and showing emotions (see above), by trading
  (with the right-click context menu), and by whispering.
 
@@ -56,32 +78,28 @@
  For further help type /help in the chat console.
 
 
-##2IGNORING COMMUNICATION
+##3IGNORING COMMUNICATION
 
- You may find that not all communication is to your liking.  While most people
- are nice, some may offend you or try to make your life harder-- since this is
+##2 You may find that not all communication is to your liking.  While most people
+ are nice, some may offend you or try to make your life harder. Since this is
  an open game, there is nothing the developers can do to prevent this.
 
  However, you can protect yourself from such players by ignoring them.  Right-
- click on them to bring up the context menu, then select `Ignore' or
- `Disregard' (see below).  You can fine-tune your player relations in the
- `Setup' menu, which lists all the players you have added to it.  To open this
- menu, select `Setup' in the upper right corner of the screen, then `Players'.
+ click on them to bring up the context menu, then select `Ignore´ or
+ `Disregard´ (see below).  You can fine-tune your player relations in the
+ `Setup´ menu, which lists all the players you have added to it.  To open this
+ menu, select `Setup´ in the upper right corner of the screen, then `Players´.
 
  There you will find a list of all players you are acquainted with, as well as
  several configuration options:
 
- - ##2save player list##P: Should your acquaintance list be saved when you
-   quit the game?  If you enable this option, your list will survive when you
-   quit and re-start.
- - ##2allow trading##P: Do you wish to allow trade requests from arbitrary
-   players?
- - ##2allow whispers##P: Do you wish to allow arbitrary players to send
+ - ##2allow trading##P:  Do you wish to allow trade requests from arbitrary players?
+ ##2- allow whispers##P:  Do you wish to allow arbitrary players to send
    private messages to you in-game?
 
-##2THE PLAYER LIST
+##3THE PLAYER LIST
 
- The player list lists all of your acquaintances.  They are categorised as one
+##2 The player list lists all of your acquaintances.  They are categorised as one
  of the following:
 
  - ##2neutral##P:  As far as the game is concerned, this is the same as not
@@ -90,7 +108,6 @@
  - ##2friend##P:  You consider this player a friend.  The player may chat,
    message your in private, or trade with you at any point.
  - ##2disregarded##P:  You wish to disregard this player, meaning that his or
-   her chat messages are not logged and trade requests and whispers are
-   ignored.
+   her trade requests and whispers are ignored.
  - ##2ignored##P:  You wish to completely ignore this player.  You will not
-   even see floating text for him or her anymore, nor emotions.
+   even see emotions for him or her anymore.
diff --git a/data/help/header.txt b/data/help/header.txt
index 6008f64c..e68089fd 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,9 +1,9 @@
- 
-##1               T  H  E      M  A  N  A      W  O  R  L  D
+
+##1                      M  A  N  A      S O U R C E
 ##1               ==========================================
- 
-           ##2Version:##6 0.0.29.1          ##2Date:##3 9 June 2009
- 
-##2                    Website: http://themanaworld.org
- 
- 
+
+           ##2Version:##6 0.5.0          ##2Date:##6 October 2010
+
+##2                    Website: http://manasource.org
+
+
diff --git a/data/help/index.txt b/data/help/index.txt
index b7262f85..fbe82da5 100644
--- a/data/help/index.txt
+++ b/data/help/index.txt
@@ -1,22 +1,9 @@
 ##3                             === INDEX ===
 
- -> @@about|About The Mana World@@
- -> @@team|Development Team@@
+ -> @@about|About Mana@@
  -> @@changes|Recent Changes@@
 
  -> @@commands|Commands@@
  -> @@windows|Windows@@
- -> @@skills|Skills@@
 
  -> @@support|Support@@
-
-
-##3                           === Powered By ===
-
-##2               SDL, SDL_image, SDL_mixer (Media framework)
-##2                     SDL_net (Networking framework)
-##2                        Guichan (GUI framework)
-##2                   libxml2 (XML parsing and writing)
-##2                          PhysFS (Data files)
-##2                        libcurl (HTTP downloads)
-##2                            zlib (Archives)
diff --git a/data/help/skills.txt b/data/help/skills.txt
deleted file mode 100644
index 3a075ee0..00000000
--- a/data/help/skills.txt
+++ /dev/null
@@ -1,17 +0,0 @@
- <- @@index|Back to Index@@
- 
- 
-##3                             === SKILLS ===
- 
- You can improve your skills by increasing job level. Each job level
- gives you 1 point to spend on basic skills.
- 
-   ##4 Basic skills: 
- 
-     ##2Level 1:##P enables the ability to trade with others
-     ##2Level 2:##P enables the ability to express emotions
-     ##2Level 3:##P enables character to sit
-     ##2Level 5:##P enables a char to join a party.
-     ##2Level 7:##P enables a char to create a party
-     Other levels are still not implemented.
- 
\ No newline at end of file
diff --git a/data/help/support.txt b/data/help/support.txt
index dfbd588d..f9b41239 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -1,17 +1,14 @@
  <- @@index|Back to Index@@
- 
- 
+
+
 ##3                            === SUPPORT ===
- 
+
  If you're having troubles, plase first of all read the FAQ. If you
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
- 
+
 ##2     http://forums.themanaworld.org/viewforum.php?f=3
- 
+
  or come visit us on our IRC channel:
- 
-##2     #themanaworld ##P@##2 irc.freenode.net
- 
- Otherwise see the @@team|Development Team@@ section to have a list of
- developers and how to contact them.
+
+##2     #mana ##P@##2 irc.freenode.net
diff --git a/data/help/team.txt b/data/help/team.txt
deleted file mode 100644
index e17771d5..00000000
--- a/data/help/team.txt
+++ /dev/null
@@ -1,132 +0,0 @@
- <- @@index|Back to Index@@
- 
- 
-##3                        === DEVELOPMENT TEAM ===
- 
-##2 Project Leader:
- 
-     ##9Eugenio Favalli (aka ElvenProgrammer)
-         elvenprogrammer@gmail.com
- 
- 
-##2 Programmers:
- 
-     ##9Bjorn Lindeijer (aka Hammerbear)
-         b_lindeijer@users.sourceforge.net
-             (various parts, GUI, graphics, A* and map rewrites)
- 
-     ##9Björn Steinbrink  (aka Doener)
-         der_doener@users.sourceforge.net
-             (various parts)
- 
-     ##9Eric Scrivner (aka zenogais)
-         bitshift2002@users.sourceforge.net
-             (resource manager)
- 
-     ##9J. Avila (aka Javila)
-         javila@users.sourceforge.net
-             (various parts, GUI)
- 
-     ##9Jan-Fabian Humann (aka Mra)
-         malastare@users.sourceforge.net
-             (some GUI parts)
- 
-     ##9Kiyoshi Kyokai (aka Kiokay)
-         kyokai@users.sourceforge.net
-             (game systems designer)
- 
-     ##9Mateusz Kaduk (aka Usiu)
-         usiu@users.sourceforge.net
-             (several GUI parts)
- 
-     ##9Aaron Marks (aka nym)
-         nymacro@users.sourceforge.net
-             (several GUI parts)
- 
-     ##9Shura
-         kth5@users.sourceforge.net
-             (configuration, sound, misc. ports)
- 
-     ##9Yohann Ferreira (aka Bertram)
-         bertram25@users.sourceforge.net
-             (SDL input, progress bar drawing, Debian package)
- 
- 
-##2 Artists:
- 
-     ##9Clef
-             (tiles, concepts)
- 
-     ##9Frode Lindeijer (aka Modanung)
-         f.lindeijer@xs4all.nl
-             (arts)
- 
-     ##9Gnulia 
-             (conceptual art)
- 
-     ##9Magick
-             (music and sound effects)
- 
-     ##9Neko-mon
-             (player sprites, various things)
-    
-     ##9Neorice
-             (monster sprites, tiles)
- 
-     ##9Pajarico
-         pajarico@users.sourceforge.net
-             (conceptual arts)
- 
-     ##9Romulo Fernandes
-         razor85@users.sourceforge.net
-             (arts)
- 
-     ##9Rotonen
-         rotonen@users.sourceforge.net
-             (backstory, art director, music, sound)
- 
-     ##9Talaroc
-         talaroc@users.sourceforge.net
-             (sprites)
- 
-     ##9Ti Sing Hao
-             (music)
- 
- 
-##2 Misc. thanks:
- 
-     ##9David Smith (aka catfish_man)
-         catfish_man@users.sourceforge.net
-             (Mac package)
- 
-     ##9Igor Morgado (aka imorgado)
-         imorgado@users.sourceforge.net
-             (tester)
- 
-     ##9maci
-         maci321@users.sourceforge.net
-             (technical support)
- 
-     ##9Rodney Dawes (aka dobey)
-         dobey@users.sourceforge.net
-             (Mac package)
- 
-     ##9Ultramichy
-             (hosting test server)
- 
- 
-##2 Inactive/retired:
- 
-     ##9Chetic
-         chetic@users.sourceforge.net
-             (maps)
- 
-     ##9Simon Edwardsson (aka SimEdw)
-         simonedw@users.sourceforge.net
-             (network code, Mac package)
- 
-     ##9Sull 
-             (hosting CVS and related services)
- 
-     ##9Vlady
-             (several items)
diff --git a/data/help/windows.txt b/data/help/windows.txt
index f1d0150a..325f75d7 100644
--- a/data/help/windows.txt
+++ b/data/help/windows.txt
@@ -10,6 +10,3 @@
  the item. To reorder items within the shortcut-window simply click and drag
  them between the boxes. To remove items you simply drag them outside of the
  window and drop them.
-
- Currently only stackable items like food, but not weapons or clothes can be
- used with the shortcut window.