Merge branch 'master' into stable

5 files changed, 58 insertions, 13 deletions

diff --git a/data/help/about-tmw.txt b/data/help/about-tmw.txt
index 3ada32d85..20cf899d6 100644
--- a/data/help/about-tmw.txt
+++ b/data/help/about-tmw.txt
@@ -1,9 +1,9 @@
- <- @@index|Back to Index@@
+ <- @@index|<<Back to Index>>@@
 
 
-##3                      === ABOUT THE MANA WORLD ===
+##3                      === <<ABOUT THE MANA WORLD>> ===
 
- ##2The Mana World##0 is a serious effort to create an innovative free
+ ##2<<The Mana World##0 is a serious effort to create an innovative free
  and open source MMORPG world. The Mana World uses 2D graphics and aims to be
  as much diverse and interactive as possible. All content is licensed
- under the GPL, making sure this game can't ever run away from you.
+ under the GPL, making sure this game can't ever run away from you.>>
diff --git a/data/help/chatcommands.txt b/data/help/chatcommands.txt
index 70968830b..2b94512b9 100644
--- a/data/help/chatcommands.txt
+++ b/data/help/chatcommands.txt
@@ -19,23 +19,34 @@
     <</outfit N - wear outfit number N.>>
     <</outfit next - wear next outfit.>>
     <</outfit prev - wear previous outfit.>>
+    <</talkpet TEXT - talk from your pet.>>
     <</emote N - use emotion number N.>>
+    <</emotepet N - use emotion number N from your pet.>>
     <</away, /away MSG - set away mode.>>
     <</pseudoaway, /pseudoaway MSG - set/unset pseudo away mode.>>
     <</follow NICK - start follow mode.>>
     <</imitation NICK - start imitation mode.>>
     <</heal NICK - heal nick.>>
     <</move X Y - move to X,Y position in short distance.>>
+    <</movetotarget - move to target position.>>
+    <</movetohome - move to home position.>>
+    <</sethome - set home position.>>
     <</navigate x y - move to position x,y in current map in any distance.>>
     <</mail NICK MSG - send offline message to NICK. Working only in tmw server.>>
     <</disconnect - quick disconnect from server.>>
     <</attack - attack target.>>
+    <</atkhuman - select and attack nearest player.>>
+    <</magicattack - attack target with magic.>>
     <</undress NICK - remove all clothes from nick. Local effect only.>>
     <</addattack NAME - add monster to attack list.>>
     <</addpriorityattack NAME - add monster to priority attack list.>>
     <</removeattack NAME - remove monster from attack list.>>
     <</addignoreattack NAME - add monster to ignore attack list.>>
     <</setdrop N - set drop counter to requested value.>>
+    <</drop - drop N items from 0 slot.>>
+    <</dropn - drop N items from any slot.>>
+    <</info - show guild info. Only for native guilds only.>>
+    <</wait NAME - wait for nick or moster with name.>>
 
 ##9<<Trade>>
 ##2
@@ -53,7 +64,7 @@
     <</neutral NICK - add nick to neutral relation list.>>
     <</blacklist NICK - add nick to blacklist relation list.>>
     <</erase NICK - add nick to erased list.>>
-    <</clear - clear current chat tab.>>
+    <</enemy NICK - add nick to enemyes list.>>
     <</createparty NAME - create party with selected name.>>
     <</me text - send text to chat as /me command in irc.>>
     <</serverignoreall - ignore all whispers on server side.>>
@@ -62,12 +73,45 @@
 ##9<<Debug>>
 ##2
     <</who - print online players number to chat.>>
+    <</present - print visible players number to chat.>>
     <</all - show visible beings list in debug tab.>>
     <</where - print current player position to chat.>>
     <</cacheinfo - show text cache info.>>
     <</uptime - show client uptime.>>
+    <</dumpe - dump environment variables into chat.>>
     <</dumpg - dump graphics and some other settings to chat.>>
+    <</dumpgl - dump OpenGL version into chat.>>
+    <</dumpt - dump tests info into chat.>>
+    <</dumpogl - dump all OpenGL variables into log file.>>
+    <</dumpmods - dump all enabled mod names into chat.>>
     <</dirs - show client dirs in debug chat tab.>>
+    <</uploadconfig - upload main config into pastebin service.>>
+    <</uploadserverconfig - upload server config into pastebin service.>>
+    <</uploadlog - upload log into pastebin service.>>
+
+##9<<GM>>
+##2
+    <</announce MESSAGE - show global message.>>
+    <</createitems - open dialog for creating items.>>
+
+##9<<Tabs>>
+##2
+    <</clear - clear current chat tab.>>
+    <</enablehighlight - enable highlight in current tab.>>
+    <</disablehighlight - disable highlight in current tab.>>
+    <</enableaway - enable away messages in current tab.>>
+    <</disableaway - disable away messages in current tab.>>
+
+##9<<Content devs>>
+##2
+    <</cleangraphics - remove all cached graphics. Usefull for content developers.>>
+    <</testparticle FILENAME - set test particle on player.>>
+
+##9<<Other>>
+##2
+    <</cleanfonts - remove all cached render strings.>>
+    <</url URL - insert url into chat.>>
+    <</open URL - open url in browser.>>
 
 
 ##9<<Whispers commands>>
diff --git a/data/help/download.txt b/data/help/download.txt
index c0bcf9585..5438e3803 100644
--- a/data/help/download.txt
+++ b/data/help/download.txt
@@ -6,5 +6,5 @@
  ##2Android:     @@http://download.evolonline.org/manaplus/download/manaplus.apk|apk@@, @@http://www.amazon.com/gp/product/B00FINPCWA|Amazon@@, @@https://play.google.com/store/apps/details?id=org.evolonline.beta.manaplus|Google Play@@
  ##2MacOSX:      @@http://download.evolonline.org/manaplus/macosx/manaplus-lion-1.3.9.15.dmg|Lion@@, @@http://download.evolonline.org/manaplus/macosx/manaplus-snowleopard.dmg|Snow leopard@@
  ##2Windows:     @@http://download.evolonline.org/manaplus/download/manaplus-win32.exe|<<Download>>@@, @@http://manaplus.org/windowsinstaller|<<Instructions>>@@
- ##2Sources:     @@http://download.evolonline.org/manaplus/download/manaplus.tar.xz|<<Download>>@@
- ##2Other linux: @@http://download.evolonline.org/manaplus/download/manaplus-linux.tar.bz2|<<Download>>@@
+ ##2<<Sources:>>     @@http://download.evolonline.org/manaplus/download/manaplus.tar.xz|<<Download>>@@
+ ##2<<Other linux:>> @@http://download.evolonline.org/manaplus/download/manaplus-linux.tar.bz2|<<Download>>@@
diff --git a/data/help/support.txt b/data/help/support.txt
index a2ee332b5..21c76dc08 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,24 +7,24 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:>>
 
-<< For Evol Online support:
+ <<For Evol Online support:>>
 
  <<Visit IRC channel:>>
 ##2     #evolonline ##9@##2 irc.freenode.net
 
-<< For ManaPlus Online support:
+ <<For ManaPlus Online support:>>
 
  <<Visit IRC channel:>>
 ##2     #manaplus #evolonline ##9@##2 irc.freenode.net
 
 
-<< For TMW support:
+ <<For TMW support:>>
 
-<<##2     @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@
- or come visit us on our IRC channel:
+##2     @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@
+ <<or come visit us on our IRC channel:>>
 ##2     #themanaworld ##9@##2 irc.freenode.net
 
-<< Otherwise see the @@team|Development Team@@ section to have a list of
+ <<Otherwise see the @@team|Development Team@@ section to have a list of
  developers and how to contact them.>>
 
  <<For other server look servers pages for support.>>
diff --git a/data/help/team.txt b/data/help/team.txt
index 0b976c7fe..e51da3e89 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -25,6 +25,7 @@
 ##3== <<Translators>> ==
 ##3Czech
 ##9Petr Varkoček (pitriss) <chytrex_fsude centrum cz>
+##9Samuraiii <samurai no dojo+manaplus gmail.com>
 ##9Zirry <zirry centrum cz>
 
 ##3Danish