Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'

Conflicts:
	AUTHORS
	CMakeLists.txt
	ChangeLog
	INSTALL
	README
	aethyra.cbp
	configure.ac
	data/help/changes.txt
	data/help/commands.txt
	data/help/header.txt
	data/help/support.txt
	src/Makefile.am
	src/aethyra.rc
	src/being.cpp
	src/being.h
	src/equipment.cpp
	src/equipment.h
	src/floor_item.h
	src/game.cpp
	src/gui/buddywindow.cpp
	src/gui/char_select.cpp
	src/gui/char_server.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/equipmentwindow.cpp
	src/gui/equipmentwindow.h
	src/gui/gui.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/itemcontainer.h
	src/gui/minimap.cpp
	src/gui/ministatus.cpp
	src/gui/newskill.cpp
	src/gui/npc_text.cpp
	src/gui/npclistdialog.h
	src/gui/ok_dialog.cpp
	src/gui/setup_video.cpp
	src/gui/skill.cpp
	src/gui/skill.h
	src/gui/status.h
	src/gui/table_model.h
	src/gui/updatewindow.cpp
	src/gui/viewport.cpp
	src/inventory.cpp
	src/inventory.h
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/localplayer.h
	src/logindata.h
	src/main.cpp
	src/map.cpp
	src/monster.cpp
	src/monster.h
	src/net/beinghandler.cpp
	src/net/beinghandler.h
	src/net/buysellhandler.cpp
	src/net/equipmenthandler.cpp
	src/net/loginhandler.cpp
	src/net/loginhandler.h
	src/net/network.h
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/net/protocol.h
	src/net/tradehandler.cpp
	src/npc.cpp
	src/npc.h
	src/particleemitter.cpp
	src/particleemitterprop.h
	src/player.cpp
	src/player.h
	src/player_relations.cpp
	src/resources/imageset.cpp
	src/resources/imageset.h
	src/resources/itemdb.cpp
	src/resources/mapreader.cpp
	src/resources/monsterinfo.h
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h
	src/tileset.h
	src/utils/fastsqrt.h
	src/utils/strprintf.cpp
	src/winver.h
	tools/tmxcopy/Makefile
	tools/tmxcopy/base64.cpp
	tools/tmxcopy/base64.h
	tools/tmxcopy/tostring.h

Signed-off-by: Ira Rice <irarice@gmail.com>

6 files changed, 100 insertions, 0 deletions

diff --git a/data/help/changes.txt b/data/help/changes.txt
index 869a29ff..e679e928 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,74 @@
  
 ##3                         === RECENT CHANGES ===
  
+<<<<<<< HEAD:data/help/changes.txt
 Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed
 list of changes.
+=======
+ 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
+ 
+ 0.0.25 (27 July 2008)
+ - Added support for whispering to other players
+ - Added ability to ignore other players
+ - Added command line argument for specifying the update host (-H)
+ - Added support for receiving the update host from the server
+ - Added support for displaying a shield sprite
+ - Added shortcut window, allowing you to quickly access inventory items
+ - Added message when gaining money from trade or quest
+ - Added support for an arbitrary number of map layers
+ - Added support for basing one sprite definition on another
+ - Added the possibility to assign particle effects to NPCs
+ - Added remembering whether windows are visible or not
+ - Updated to work with Guichan 0.8.x
+ - Improved accuracy of monster targeting with the mouse
+ - Page up and page down will now scroll the chat window
+ - Item icons are now loaded on demand and unloaded when no longer used
+ - Fixed display of critical hits
+ - Fixed multi-channel image dyeing
+ - Fixed updating of money display after buying
+ 
+ 0.0.24.1 (7 April 2008)
+ - Added /clear command to clear chat window
+ - Added ability to close quit dialog by pressing ESC
+ - Added key for targetting nearest player
+ - Added the possibility to assign particle effects to monsters
+ - Added possibility to pass through players with key controls
+ - Fixed crash on exit after connection to server was lost
+ - Fixed initialization of some variables
+ - Fixed an error with chat messages without a sender that include a colon
+ - Fixed minimap to not keep reappearing when hidden
+ - Fixed a GCC 4.3 compile error
+ - Fixed music loading from non-default location
+ - Fixed crash on trying to show out of range emoticon
+ - Updated Dev-C++ and Code::Blocks project files
+ 
+ 0.0.24 (24 December 2007)
+ - Added female specific hair styles
+ - Added user-definable key settings
+ - Added XP gaining notification
+ - Added close button to most windows
+ - Added support for dynamic sprite recoloring
+ - Added notification when the connection to the server is lost
+ - Updated to work with Guichan 0.7.x
+ - Mouse cursor now indicates when resize is possible
+ - Changed amount slider in buy and sell dialogs to start at 1
+ - Made weapon sprites and sounds customizable
+ - Made buy and sell dialogs resizable
+ - Merged equipment database with items database
+ - Chat window log no longer goes back forever
+ - Chat messages are trimmed (spaces are removed on both sides)
+ - Fixed segmentation fault with some OpenGL drivers
+ - Fixed updating of defense when increasing vitality
+ - Fixed a bug that prevented being-controlled particles from being deleted
+ - Fixed a crash in the particle engine related to child emitters
+ - Fixed encoding issues with user home directory
+ - Fixed a crash in equipment window on failure to load an item icon
+ - Fixed a crash on filling up your inventory
+ - Fixed item list in shops not to scroll back when selling
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/changes.txt
  
diff --git a/data/help/commands.txt b/data/help/commands.txt
index eaacdf02..e80c537e 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -17,6 +17,7 @@
      ##2F5##P                 toggle skills window
      ##2F6##P                 toggle minimap
      ##2F7##P                 toggle chat window
+     ##2F8##P                 toggle shortcut window
      ##2F9##P                 show setup window
      ##2F10##P                toggle debug window
      ##2Alt + 0-9##P          show emotions
@@ -47,11 +48,18 @@
 
  /whisper <name> <message>
 
+<<<<<<< HEAD:data/help/commands.txt
  This will send <message> to player <name>, if that player is logged in.
  to whisper to users with spaces in there name you must incase the user name in qoutes
 	(e.g. /whisper "user name" <message>)
 
  For further help type /help in the chat console.
+=======
+ This will send <message> to player <name>, if that player is logged in. If the
+ name has a space in it, put double quotes around it like this:
+
+ /whisper "<name>" <message>
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/commands.txt
 
 
 ##2IGNORING COMMUNICATION
diff --git a/data/help/header.txt b/data/help/header.txt
index 789e3d93..a560895c 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,11 @@
 ##1                                 AETHYRA
 ##1               ==========================================
  
+<<<<<<< HEAD:data/help/header.txt
            ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##5 December 2008
+=======
+           ##2Version:##6 0.0.26              ##2Date:##329 August 2008
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/header.txt
  
 ##2                    Website: http://www.aethyra.org
  
diff --git a/data/help/index.txt b/data/help/index.txt
index b0568c35..4dcc2332 100644
--- a/data/help/index.txt
+++ b/data/help/index.txt
@@ -5,6 +5,7 @@
  -> @@changes|Recent Changes@@
 
  -> @@commands|Commands@@
+ -> @@windows|Windows@@
  -> @@skills|Skills@@
 
  -> @@support|Support@@
diff --git a/data/help/support.txt b/data/help/support.txt
index 44fd08f3..819516de 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,7 +7,11 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
  
+<<<<<<< HEAD:data/help/support.txt
 ##2     http://forums.aethyra.com
+=======
+##2     http://forums.themanaworld.org/viewforum.php?f=3
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/support.txt
  
  or come visit us on our IRC channel:
  
diff --git a/data/help/windows.txt b/data/help/windows.txt
new file mode 100644
index 00000000..f1d0150a
--- /dev/null
+++ b/data/help/windows.txt
@@ -0,0 +1,15 @@
+ <- @@index|Back to Index@@
+ 
+ 
+##3                            === WINDOWS ===
+ 
+##2SHORTCUT:
+
+ To add an item to the shortcut bar click on the item in the inventory window,
+ then click on the box in the shortcut-window which should be associated with
+ 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.