Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

8 files changed, 30 insertions, 1 deletions

diff --git a/data/branding.xml b/data/branding.xml
new file mode 100644
index 00000000..ea3ee467
--- /dev/null
+++ b/data/branding.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<!-- 
+Branding information
+
+All values in here are the default values which are hardcoded into the TMW client.
+So it would make no difference for the official version when this file is missing. It is
+basically an example for developers of tmw forks to help them writing a branding.xml
+for their forks.
+-->
+
+<configuration>
+ <option name="appName" value="The Mana World"/>
+ <option name="appShort" value="tmw"/>
+ <option name="appIcon" value="icons/tmw.png"/>
+ <option name="loginWallpaper" value="graphics/images/login_wallpaper.png"/>
+ <option name="loginMusic" value="The Mana World - Hurnscald.ogg"/>
+ <option name="defaultServer" value="server.themanaworld.org"/>
+ <option name="defaultPort" value="9601"/>
+ <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/>
+ <option name="guiFont" value="fonts/dejavusans.ttf" />
+ <option name="speechFont" value="fonts/dejavusans.ttf" />
+ 
+</configuration>
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index f564253a..347e9f5e 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -6,9 +6,12 @@ SET (FILES
     buttonhi.png
     buttonpress.png
     checkbox.png
+    circle-gray.png
+    circle-green.png
     close_button.png
     deepbox.png
     default.png
+    equip_bg.png
     gui.xml
     hits_blue.png
     hits_red.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index e78018b7..d697ffd7 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -9,6 +9,8 @@ gui_DATA =				\
 	buttonhi.png			\
 	buttonpress.png			\
 	checkbox.png			\
+	circle-gray.png			\
+	circle-green.png		\
 	close_button.png		\
 	deepbox.png			\
 	default.png			\
diff --git a/data/graphics/gui/circle-gray.png b/data/graphics/gui/circle-gray.png
new file mode 100644
index 00000000..719b0b10
--- /dev/null
+++ b/data/graphics/gui/circle-gray.png
diff --git a/data/graphics/gui/circle-green.png b/data/graphics/gui/circle-green.png
new file mode 100644
index 00000000..bab39e05
--- /dev/null
+++ b/data/graphics/gui/circle-green.png
diff --git a/data/graphics/gui/equip_bg.png b/data/graphics/gui/equip_bg.png
new file mode 100644
index 00000000..77ac63d8
--- /dev/null
+++ b/data/graphics/gui/equip_bg.png
diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png
new file mode 100644
index 00000000..3e678099
--- /dev/null
+++ b/data/graphics/gui/speech_bubble.png
diff --git a/data/graphics/gui/speechbubble.xml b/data/graphics/gui/speechbubble.xml
index 8715027d..84b6557b 100644
--- a/data/graphics/gui/speechbubble.xml
+++ b/data/graphics/gui/speechbubble.xml
@@ -15,4 +15,4 @@
 	<part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
 	<part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
 	</widget>
-</skinset>
\ No newline at end of file
+</skinset>