diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /data/tmw | |
parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'data/tmw')
-rw-r--r-- | data/tmw/images/loginwallpaper_800x600.png | bin | 0 -> 903998 bytes | |||
-rw-r--r-- | data/tmw/tmw.manaplus | 17 |
2 files changed, 17 insertions, 0 deletions
diff --git a/data/tmw/images/loginwallpaper_800x600.png b/data/tmw/images/loginwallpaper_800x600.png Binary files differnew file mode 100644 index 000000000..e3a6e492d --- /dev/null +++ b/data/tmw/images/loginwallpaper_800x600.png diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus new file mode 100644 index 000000000..47688e1d0 --- /dev/null +++ b/data/tmw/tmw.manaplus @@ -0,0 +1,17 @@ +<?xml version="1.0"?> + +<configuration> + <option name="appName" value="The Mana World"/> + <option name="appShort" value="mana"/> + <option name="appIcon" value="icons/manaplus.png"/> + <option name="loginMusic" value="Magick - Real.ogg"/> + <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/> + <option name="defaultServer" value="server.themanaworld.org"/> + <option name="defaultPort" value="6901"/> + <option name="defaultServerType" value="evol"/> + <option name="font" value="fonts/dejavusans.ttf" /> + <option name="boldFont" value="fonts/dejavusans-bold.ttf" /> + <option name="theme" value="wood" /> + <option name="wallpapersPath" value="tmw/images/" /> + <option name="wallpaperFile" value="loginwallpaper_800x600.png" /> +</configuration> |