From 27344eda61e59196f57299415b997ddd96933468 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 30 Aug 2008 12:41:45 +0000 Subject: updated the in game help files --- data/help/about.txt | 49 +++++++++++----- data/help/changes.txt | 67 +--------------------- data/help/commands.txt | 4 ++ data/help/header.txt | 6 +- data/help/index.txt | 2 +- data/help/skills.txt | 2 + data/help/support.txt | 4 +- data/help/team.txt | 148 ++++++++++--------------------------------------- 8 files changed, 78 insertions(+), 204 deletions(-) (limited to 'data/help') diff --git a/data/help/about.txt b/data/help/about.txt index 812aad84..79840ad6 100644 --- a/data/help/about.txt +++ b/data/help/about.txt @@ -1,17 +1,40 @@ <- @@index|Back to Index@@ -##3 === ABOUT THE MANA WORLD === +##3 === ABOUT Aethyra === - ##2The Mana World (TMW)##P is a serious effort to create an innovative free - and open source MMORPG. TMW uses 2D graphics and aims to create a - large and diverse interactive world. It is licensed under the GPL, - making sure this game can't ever run away from you. - - The project includes the development of both a client and a server, - as well as the development of an online world. At the moment we're - making alpha releases of the client, while our server is in early - development. The eAthena free software Ragnarok Online server is used - until our own server has matured enough to replace it. Once ready, - we'll be making releases of our server too so anybody will be free to - set up their own server and start building their own online world. + ##2Aethyra (Ae)##P Aethyra is a 2D MMORPG, using the eAthena server + (an open-source clone of the commercial Ragnarok Online server). It + features expanding lands and community-made graphics, making for a + fun, free, open source community project. + + ##PAethyra started out as "The Mana Experiment," an experimental + test-server for community-developed content designed for The Mana + World which was put into action by Blame, Sanga, and Sertaline. + ##PSoon thereafter, it became evident that it was taking far too + long for the elitist development team at The Mana World to + implement good tested-content. They made excuses and treated the + long-awaited custom server TMWServ as the answer to all the problems, + and left the eAthena server (which The Mana World still runs on) + to rot. Many development team members lost interest in helping, and + the programmers forsook the eAthena server saying that it would + simply delay TMWServ progress for months to fix the simplest of + errors. In response to this, The Mana Experiment became a fork + project, and an official game server. + ##PTime passed, and more and more content was tested and implemented. + Soon, discussion began for a name. Aethyra was chosen, and the Game + you see now was setup. Content development has never been better, and + the staff never more motivated! Stay on the lookout for more exciting + Aethyra developments! + +##3 === Aethyra's Goal === + + ##PAethyra is a community driven experiment that utilizes eAthena at + its core with the end goal of getting its players as involved in the + process as much as possible. It's originally forked from The Mana + World when its developers came up with the idea of "Why should we + have to wait for an MMORPG game in development when we've already got + a great server setup here that does everything we've been promised + and more?" ##P As such, we are trying to implement as many functions + of eAthena as possible while creating our own in the process based + on what our players want to see. diff --git a/data/help/changes.txt b/data/help/changes.txt index 8b47cc9c..eb25c86d 100644 --- a/data/help/changes.txt +++ b/data/help/changes.txt @@ -3,70 +3,5 @@ ##3 === RECENT CHANGES === - 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 - - 0.0.23 (3 June 2007) - - Added a particle engine along with some particle effects - - Added a cursor to indicate targeted enemy - - Added new program icon - - Added a man page for UNIX like systems - - Added the --version command line parameter - - Improved MacOS X release - - Screenshots are now saved in the .tmw directory on UNIX like systems - - Magic pink is no longer used for transparency (fixes issues with that on Mac) - - Fixed difficulties with resizing windows - - Fixed misleading error message when connecting fails - - Fixed wrong error message when account name already exists - - Fixed crash when deleting a character - - Fixed error message when creating a new character fails - - Fixed updating problem when using scrollwheel to change shop selection - - 0.0.22.2 (17 February 2007) - - Updated to work with Guichan 0.6.1 - - Changed to new default server (server.themanaworld.org) - - Changed custom mouse cursor - - Fixed the issue where _M or _F is appended to the username - - Fixed problem with Cancel button in update dialog - - 0.0.22.1 (15 January 2007) - - Updated to work with Guichan 0.6.0 (older versions no longer supported) - - Fixed mouse coordinates in debug window - - Fixed clicking on GUI to cause the player to start walking sometimes +check out www.aethyra.com for our changes in progress diff --git a/data/help/commands.txt b/data/help/commands.txt index 5cd9aee4..8303e995 100644 --- a/data/help/commands.txt +++ b/data/help/commands.txt @@ -50,6 +50,10 @@ /whisper This will send to player , 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" ) + + For further help type /help in the chat console. ##2IGNORING COMMUNICATION diff --git a/data/help/header.txt b/data/help/header.txt index 57e9f141..ea622623 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 AETHYRA ##1 ========================================== - ##2Version:##6 0.0.24.1 ##2Date:##37 April 2008 + ##2Version:##6 Aethyra SVN 0.0.25 ##2Date:##3 August 2008 -##2 Website: http://themanaworld.org +##2 Website: http://www.aethyra.com diff --git a/data/help/index.txt b/data/help/index.txt index 56c5e352..b0568c35 100644 --- a/data/help/index.txt +++ b/data/help/index.txt @@ -1,6 +1,6 @@ ##3 === INDEX === - -> @@about|About The Mana World@@ + -> @@about|About Aethyra@@ -> @@team|Development Team@@ -> @@changes|Recent Changes@@ diff --git a/data/help/skills.txt b/data/help/skills.txt index 84d5bc5a..3a075ee0 100644 --- a/data/help/skills.txt +++ b/data/help/skills.txt @@ -11,5 +11,7 @@ ##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 014e37b7..44fd08f3 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -7,11 +7,11 @@ can't find a solution to your problem, feel free to check our Bugs/Support section of the forum: -##2 http://themanaworld.org/phpBB2/viewforum.php?f=3 +##2 http://forums.aethyra.com or come visit us on our IRC channel: -##2 #themanaworld ##P@##2 irc.freenode.net +##2 #aethyra ##P@##2 irc.freenode.net Otherwise see the @@team|Development Team@@ section to have a list of developers and how to contact them. diff --git a/data/help/team.txt b/data/help/team.txt index e17771d5..bdd0c8c9 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -2,131 +2,41 @@ ##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) + ##9Sanga Head Developer/GM ("Sanga") + + + ##9Scraggy Client Developer + + + ##9Kraant Developer + + + ##9Tametomo Developer/Artist ##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) + ##9Frictor Head Artist + + ##9Angeliex Artist + + ##9GonzoDark Mapper + + ##9Arkyan Mapper ##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) + + ##9MrDan Forum Admin/GM + + ##9Slinker Game Server Host + +##2 Leave of Absence + + ##9Sert Head Artist/GM + + ##9Blame Developer/GM + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 7d5d53e5f81eb0cc255edc188a955c9571cafb81 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 16 Sep 2008 23:44:15 +0000 Subject: changed client gui and added autobuild.sh --- AUTHORS | 3 +-- ChangeLog | 7 +++++- INSTALL | 16 ++++++++---- README | 17 +++++++------ autobuild.sh | 35 ++++++++++++++++++++++++++ data/graphics/gui/bg_quad_dis.png | Bin 5241 -> 5539 bytes data/graphics/gui/button.png | Bin 374 -> 481 bytes data/graphics/gui/button_disabled.png | Bin 313 -> 358 bytes data/graphics/gui/buttonhi.png | Bin 374 -> 480 bytes data/graphics/gui/buttonpress.png | Bin 377 -> 434 bytes data/graphics/gui/checkbox.png | Bin 696 -> 649 bytes data/graphics/gui/close_button.png | Bin 650 -> 646 bytes data/graphics/gui/deepbox.png | Bin 270 -> 307 bytes data/graphics/gui/hscroll_left_default.png | Bin 358 -> 402 bytes data/graphics/gui/hscroll_left_highlight.png | Bin 364 -> 382 bytes data/graphics/gui/hscroll_left_pressed.png | Bin 349 -> 356 bytes data/graphics/gui/hscroll_right_default.png | Bin 340 -> 349 bytes data/graphics/gui/hscroll_right_highlight.png | Bin 359 -> 379 bytes data/graphics/gui/hscroll_right_pressed.png | Bin 350 -> 351 bytes data/graphics/gui/item_shortcut_bgr.png | Bin 1026 -> 1366 bytes data/graphics/gui/menuitemD.png | Bin 1329 -> 1694 bytes data/graphics/gui/menuitemF.png | Bin 1530 -> 1830 bytes data/graphics/gui/menuitemN.png | Bin 1310 -> 1529 bytes data/graphics/gui/menuitemP.png | Bin 1436 -> 1733 bytes data/graphics/gui/radioin.png | Bin 454 -> 438 bytes data/graphics/gui/radioout.png | Bin 380 -> 346 bytes data/graphics/gui/resize.png | Bin 443 -> 518 bytes data/graphics/gui/slider.png | Bin 571 -> 615 bytes data/graphics/gui/thickborder.png | Bin 530 -> 593 bytes data/graphics/gui/vscroll_blue.png | Bin 395 -> 476 bytes data/graphics/gui/vscroll_down_default.png | Bin 367 -> 350 bytes data/graphics/gui/vscroll_down_highlight.png | Bin 382 -> 378 bytes data/graphics/gui/vscroll_down_pressed.png | Bin 376 -> 369 bytes data/graphics/gui/vscroll_grey.png | Bin 371 -> 452 bytes data/graphics/gui/vscroll_red.png | Bin 394 -> 471 bytes data/graphics/gui/vscroll_up_default.png | Bin 377 -> 359 bytes data/graphics/gui/vscroll_up_highlight.png | Bin 376 -> 381 bytes data/graphics/gui/vscroll_up_pressed.png | Bin 364 -> 345 bytes data/help/commands.txt | 4 +-- 39 files changed, 63 insertions(+), 19 deletions(-) create mode 100755 autobuild.sh (limited to 'data/help') diff --git a/AUTHORS b/AUTHORS index 71cab2dd..a672e18f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,7 +7,6 @@ Aethyra Dev Team == Programmers == Sanga - Scraggy Kraant Tametomo @@ -25,7 +24,7 @@ Aethyra Dev Team == Inactive == Sertraline - + Scraggy ----------------------- The Mana World Dev Team ----------------------- diff --git a/ChangeLog b/ChangeLog index bc9580fa..57448eb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Kevin Day ("Blame") + + * Added autobuild.sh complete build script for the client + * Updated the gui graphics for the client for halloween + 2008-09-12 Lloyd Bryant ("Sanga") * Changed default port for Aethyra to 21001 @@ -15,7 +20,7 @@ * Added code to change colours in the chatlog -2008-08-30 kevin Day ("blame") +2008-08-30 Kevin Day ("Blame") * Updated the in game help files "/trunk/data/help" diff --git a/INSTALL b/INSTALL index 5688451b..5e94f0ff 100644 --- a/INSTALL +++ b/INSTALL @@ -40,15 +40,21 @@ you to figure this out. =============================================== 1) Go to the directory you have extracted the source to. -2) If you checked out from SVN, run "./autogen.sh" to generate configure. -3) Run "./configure" -4) Run "make" -5) Run "make install" as root +2) If you checked out from SVN, run "./autobuild.sh" to install the client. It should have installed Aethyra on your system now, and you can run it with "aethyra". By default all files are installed to /usr/local, you can pass a different prefix to configure as usual. + NOTE: if the autobuild.sh fails + 1.) ./autogen.sh + 2.) ./configure + 3.) make + 4.) su -c "make install" + + you can get help from A.) IRC channel irc.freenode.net #aedev or #aethyra + B.) http://forum.aethyra.com + Make sure you record the output from the konsole window NOTE: It is possible to compile Aethyra without support for OpenGL rendering. To do this perform step 3 as follows: @@ -64,4 +70,4 @@ pass a different prefix to configure as usual. If you have any problems, you are welcome to post your questions on our forums, or talk about them in our IRC channel. -- The Mana Experiment Dev Team +- Aethyra Dev Team diff --git a/README b/README index 517b4a9d..012e1683 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ AETHYRA =================== - Version: 0.0.24.1 Date: 7/4/2007 + Version: 0.0.25 Date: 9/16/2008 Development team: - See AUTHORS file for a list @@ -48,16 +48,15 @@ Use arrow keys to move around. Other keys: - F7 toggle chat window - F9 show setup window - F10 toggle debug window -- Alt + 0-9 show emotions -- Alt + S sit down / stand up +- Alt + 0-9 show emotions / usuable at skill level 2. +- Alt + S sit down / stand up / usuable at skill level 3. - Alt + F toggle debug pathfinding feature - Alt + P take screenshot -- Alt + T turns on anti-trade function +- Alt + T turns on anti-trade function / usuable at skill level 1. - A target nearest monster - H hide all non-sticky windows - G or Z pick up item - Enter focus chat window / send message -- Shift hold it when attacking to lock target for auto attack MOUSE: @@ -75,7 +74,7 @@ context menu. Holding [Left Shift] prevents from walking when attacking. - /whisper send a private msg to another player (format: /whisper ) If the has spaces in it, enclose it in double - quotes + quotes e.g. /whisper "char name" - /record Records the Chat output (format: /record starts the record session /record again @@ -122,9 +121,11 @@ level 10: enables not used If you're having troubles, please 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: -- http://209.168.213.109/forums +- http://forums.aethyra.com or come visit us on our IRC channel: -- #themanaexperiment @ irc.freenode.net +- #aethyra @ irc.freenode.net +- ##aethyra @ irc.freenode.net +- #aedev @ irc.freenode.net Otherwise check the AUTHORS file to have a list of developers and how to contact them. diff --git a/autobuild.sh b/autobuild.sh new file mode 100755 index 00000000..0d8f8b27 --- /dev/null +++ b/autobuild.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# auto build script based on fedora but usable for other distros +#author=Blame +#last modified date 2008-09-16 Blame + + +echo "Generating build information using aclocal, autoheader, automake and autoconf." +echo + +# Regerate configuration files +aclocal +autoheader +automake --gnu --add-missing --copy +autoconf + +echo +echo "Now you are ready to run ./configure" + +./configure + +echo +echo "now running make" + +make + +echo +echo "now running make install please input your root password" + +su -c "make install" +su -c "make clean" + +echo "done" + +aethyra & +exit 1; diff --git a/data/graphics/gui/bg_quad_dis.png b/data/graphics/gui/bg_quad_dis.png index 3a0354bb..b79b9ca7 100644 Binary files a/data/graphics/gui/bg_quad_dis.png and b/data/graphics/gui/bg_quad_dis.png differ diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png index 9ebbea63..ff50a908 100644 Binary files a/data/graphics/gui/button.png and b/data/graphics/gui/button.png differ diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png index 0ce3aa6f..cb5a1b01 100644 Binary files a/data/graphics/gui/button_disabled.png and b/data/graphics/gui/button_disabled.png differ diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png index c4772634..da30f283 100644 Binary files a/data/graphics/gui/buttonhi.png and b/data/graphics/gui/buttonhi.png differ diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png index e9cd1765..ed7e5054 100644 Binary files a/data/graphics/gui/buttonpress.png and b/data/graphics/gui/buttonpress.png differ diff --git a/data/graphics/gui/checkbox.png b/data/graphics/gui/checkbox.png index 669ecf03..bf8e9052 100644 Binary files a/data/graphics/gui/checkbox.png and b/data/graphics/gui/checkbox.png differ diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png index f87cc2a9..8b4a451a 100644 Binary files a/data/graphics/gui/close_button.png and b/data/graphics/gui/close_button.png differ diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png index ed3231f3..0980f57e 100644 Binary files a/data/graphics/gui/deepbox.png and b/data/graphics/gui/deepbox.png differ diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png index 2f763d30..6d21e7c0 100644 Binary files a/data/graphics/gui/hscroll_left_default.png and b/data/graphics/gui/hscroll_left_default.png differ diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png index 6be5ae25..e2686c13 100644 Binary files a/data/graphics/gui/hscroll_left_highlight.png and b/data/graphics/gui/hscroll_left_highlight.png differ diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png index b8ebcb46..92478ec8 100644 Binary files a/data/graphics/gui/hscroll_left_pressed.png and b/data/graphics/gui/hscroll_left_pressed.png differ diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png index 33fdddd0..547a86dd 100644 Binary files a/data/graphics/gui/hscroll_right_default.png and b/data/graphics/gui/hscroll_right_default.png differ diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png index e9e633ea..ef56538f 100644 Binary files a/data/graphics/gui/hscroll_right_highlight.png and b/data/graphics/gui/hscroll_right_highlight.png differ diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png index 53972f2b..36cff58a 100644 Binary files a/data/graphics/gui/hscroll_right_pressed.png and b/data/graphics/gui/hscroll_right_pressed.png differ diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png index e878fc7a..01f1643a 100644 Binary files a/data/graphics/gui/item_shortcut_bgr.png and b/data/graphics/gui/item_shortcut_bgr.png differ diff --git a/data/graphics/gui/menuitemD.png b/data/graphics/gui/menuitemD.png index a9fe2222..e6654e97 100644 Binary files a/data/graphics/gui/menuitemD.png and b/data/graphics/gui/menuitemD.png differ diff --git a/data/graphics/gui/menuitemF.png b/data/graphics/gui/menuitemF.png index 84142a16..f18a82eb 100644 Binary files a/data/graphics/gui/menuitemF.png and b/data/graphics/gui/menuitemF.png differ diff --git a/data/graphics/gui/menuitemN.png b/data/graphics/gui/menuitemN.png index bf25dd61..f813d4c5 100644 Binary files a/data/graphics/gui/menuitemN.png and b/data/graphics/gui/menuitemN.png differ diff --git a/data/graphics/gui/menuitemP.png b/data/graphics/gui/menuitemP.png index 060d5a34..ba6e1543 100644 Binary files a/data/graphics/gui/menuitemP.png and b/data/graphics/gui/menuitemP.png differ diff --git a/data/graphics/gui/radioin.png b/data/graphics/gui/radioin.png index 12e027fe..9034f469 100644 Binary files a/data/graphics/gui/radioin.png and b/data/graphics/gui/radioin.png differ diff --git a/data/graphics/gui/radioout.png b/data/graphics/gui/radioout.png index 5eb67bd8..4e088943 100644 Binary files a/data/graphics/gui/radioout.png and b/data/graphics/gui/radioout.png differ diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png index 6b31ac64..9890f83f 100644 Binary files a/data/graphics/gui/resize.png and b/data/graphics/gui/resize.png differ diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png index 1f6e6b35..32adf4f7 100644 Binary files a/data/graphics/gui/slider.png and b/data/graphics/gui/slider.png differ diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png index da72c92f..d3844b71 100644 Binary files a/data/graphics/gui/thickborder.png and b/data/graphics/gui/thickborder.png differ diff --git a/data/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png index 397501ce..295ca1a5 100644 Binary files a/data/graphics/gui/vscroll_blue.png and b/data/graphics/gui/vscroll_blue.png differ diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png index c4292489..4bf696b0 100644 Binary files a/data/graphics/gui/vscroll_down_default.png and b/data/graphics/gui/vscroll_down_default.png differ diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png index ac88f7c7..a7459745 100644 Binary files a/data/graphics/gui/vscroll_down_highlight.png and b/data/graphics/gui/vscroll_down_highlight.png differ diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png index 9dcc89f6..e6238024 100644 Binary files a/data/graphics/gui/vscroll_down_pressed.png and b/data/graphics/gui/vscroll_down_pressed.png differ diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png index 87ba8758..4d950a32 100644 Binary files a/data/graphics/gui/vscroll_grey.png and b/data/graphics/gui/vscroll_grey.png differ diff --git a/data/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png index d7ad4a90..0e50513c 100644 Binary files a/data/graphics/gui/vscroll_red.png and b/data/graphics/gui/vscroll_red.png differ diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png index 1cecc351..c08a2b2a 100644 Binary files a/data/graphics/gui/vscroll_up_default.png and b/data/graphics/gui/vscroll_up_default.png differ diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png index 7b5009f3..2f5ffade 100644 Binary files a/data/graphics/gui/vscroll_up_highlight.png and b/data/graphics/gui/vscroll_up_highlight.png differ diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png index 2320ec42..102bac86 100644 Binary files a/data/graphics/gui/vscroll_up_pressed.png and b/data/graphics/gui/vscroll_up_pressed.png differ diff --git a/data/help/commands.txt b/data/help/commands.txt index 8303e995..3019ebfc 100644 --- a/data/help/commands.txt +++ b/data/help/commands.txt @@ -28,9 +28,7 @@ ##2H##P hide all non-sticky windows ##2G or Z##P pick up item ##2Enter##P focus chat window / send message - ##2Shift##P hold it when attacking to lock target for auto - attack - + ##2MOUSE: -- cgit v1.2.3-70-g09d2 From 5345796e2e8263c50a5b29d539a55f34467d61d2 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 30 Nov 2008 16:13:59 -0700 Subject: Fixed up a few help files, as well as updated their contents to be more current. This has been neglected for a bit longer than it should have been. Signed-off-by: Ira Rice --- data/help/changes.txt | 3 ++- data/help/commands.txt | 2 +- data/help/team.txt | 58 +++++++++++++++++++++++++++++++++++--------------- 3 files changed, 44 insertions(+), 19 deletions(-) (limited to 'data/help') diff --git a/data/help/changes.txt b/data/help/changes.txt index eb25c86d..869a29ff 100644 --- a/data/help/changes.txt +++ b/data/help/changes.txt @@ -3,5 +3,6 @@ ##3 === RECENT CHANGES === -check out www.aethyra.com for our changes in progress +Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed +list of changes. diff --git a/data/help/commands.txt b/data/help/commands.txt index 3019ebfc..eaacdf02 100644 --- a/data/help/commands.txt +++ b/data/help/commands.txt @@ -26,7 +26,7 @@ ##2Alt + T##P toggle ignore of incoming trades ##2A##P target nearest monster ##2H##P hide all non-sticky windows - ##2G or Z##P pick up item + ##2Z##P pick up item ##2Enter##P focus chat window / send message diff --git a/data/help/team.txt b/data/help/team.txt index bdd0c8c9..dfd00d4b 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -3,40 +3,64 @@ ##3 === DEVELOPMENT TEAM === -##2 Programmers: - - ##9Sanga Head Developer/GM ("Sanga") - +##2 Administration: - ##9Scraggy Client Developer - + ##9Blua Server Administrator/Content Development + + ##9MrDan Forum Administrator/GM + + ##9Slinker Game Server Host + + ##9Tametomo Project Head/Artist/Client Developer/Ubuntu Package Maintainer/Misc. + +##2 Programmers: ##9Kraant Developer - - ##9Tametomo Developer/Artist - ##2 Artists: + + ##9Angeliex Artist + ##9Bawabawa/Kyron/Pyrestriker Artist/SuSe Package Contributor + ##9Frictor Head Artist - ##9Angeliex Artist +##2 Mappers: + + ##9Arkyan Mapper ##9GonzoDark Mapper - ##9Arkyan Mapper - +##2 Content Development: + + ##9Moose + +##2 GMs + + ##9Grimmjow + + ##9SoftLace1 + + ##9Srauls ##2 Misc. thanks: - ##9MrDan Forum Admin/GM + ##9doorsman Testing - ##9Slinker Game Server Host + ##9Snoopy Testing -##2 Leave of Absence + ##9Tarax Testing - ##9Sert Head Artist/GM +##2 Leave of Absence ##9Blame Developer/GM - \ No newline at end of file + + + ##9Sanga Head Developer/GM ("Sanga") + + + ##9Scraggy Client Developer + + + ##9Sert Head Artist/GM -- cgit v1.2.3-70-g09d2 From f55d562d294fe531123fb062003464a479b97e52 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 6 Dec 2008 13:45:45 -0700 Subject: Removed the automate cash, as reccommended by Bjorn. Signed-off-by: Ira Rice --- autom4te.cache/traces.0 | 698 ------------------------------------------------ data/help/header.txt | 4 +- 2 files changed, 2 insertions(+), 700 deletions(-) delete mode 100644 autom4te.cache/traces.0 (limited to 'data/help') diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 deleted file mode 100644 index ac0ed47f..00000000 --- a/autom4te.cache/traces.0 +++ /dev/null @@ -1,698 +0,0 @@ -m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) -m4trace:/usr/share/aclocal-1.10/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) -m4trace:/usr/share/aclocal-1.10/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) -m4trace:/usr/share/aclocal-1.10/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) -m4trace:/usr/share/aclocal-1.10/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) -m4trace:/usr/share/aclocal-1.10/depend.m4:139: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) -m4trace:/usr/share/aclocal-1.10/depend.m4:147: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) -m4trace:/usr/share/aclocal-1.10/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -]) -m4trace:/usr/share/aclocal-1.10/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) -m4trace:/usr/share/aclocal-1.10/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) -m4trace:/usr/share/aclocal-1.10/init.m4:113: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -m4trace:/usr/share/aclocal-1.10/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) -m4trace:/usr/share/aclocal-1.10/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) -m4trace:/usr/share/aclocal-1.10/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) -m4trace:/usr/share/aclocal-1.10/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) -m4trace:/usr/share/aclocal-1.10/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) -m4trace:/usr/share/aclocal-1.10/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) -m4trace:/usr/share/aclocal-1.10/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -m4trace:/usr/share/aclocal-1.10/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -m4trace:/usr/share/aclocal-1.10/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -m4trace:/usr/share/aclocal-1.10/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -m4trace:/usr/share/aclocal-1.10/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) -m4trace:/usr/share/aclocal-1.10/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) -m4trace:/usr/share/aclocal-1.10/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) -m4trace:/usr/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE]) -m4trace:/usr/share/aclocal-1.10/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) -m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) -m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_]) -m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) -m4trace:configure.ac:2: -1- m4_pattern_allow([^AS_FLAGS$]) -m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?m4_]) -m4trace:configure.ac:2: -1- m4_pattern_forbid([^dnl$]) -m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?AS_]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^SHELL$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PATH_SEPARATOR$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^exec_prefix$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^prefix$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^program_transform_name$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^bindir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^sbindir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^libexecdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^datarootdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^datadir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^sysconfdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^sharedstatedir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^localstatedir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^includedir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^oldincludedir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^docdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^infodir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^htmldir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^dvidir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^pdfdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^psdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^libdir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^localedir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^mandir$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^DEFS$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_C$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_N$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_T$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^build_alias$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$]) -m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$]) -m4trace:configure.ac:4: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete. -You should run autoupdate.], [../../lib/autoconf/c.m4:105: AC_LANG_CPLUSPLUS is expanded from... -configure.ac:4: the top level]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CXX$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CXXFLAGS$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^LDFLAGS$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CPPFLAGS$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^CXX$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^ac_ct_CXX$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^EXEEXT$]) -m4trace:configure.ac:7: -1- m4_pattern_allow([^OBJEXT$]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) -m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_DATA$]) -m4trace:configure.ac:9: -1- m4_pattern_allow([^SET_MAKE$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXCPP$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^CPPFLAGS$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXCPP$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^GREP$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^GREP$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^EGREP$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^EGREP$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^STDC_HEADERS$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE__BOOL$]) -m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE_STDBOOL_H$]) -m4trace:configure.ac:13: -1- m4_pattern_allow([^const$]) -m4trace:configure.ac:14: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$]) -m4trace:configure.ac:15: -1- m4_pattern_allow([^volatile$]) -m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:19: -1- m4_pattern_allow([^HAVE_MALLOC$]) -m4trace:configure.ac:19: -1- m4_pattern_allow([^HAVE_MALLOC$]) -m4trace:configure.ac:19: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:19: -1- m4_pattern_allow([^malloc$]) -m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REALLOC$]) -m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REALLOC$]) -m4trace:configure.ac:20: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:20: -1- m4_pattern_allow([^realloc$]) -m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$]) -m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$]) -m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$]) -m4trace:configure.ac:22: -1- m4_pattern_allow([^HAVE_DOPRNT$]) -m4trace:configure.ac:26: -1- m4_pattern_allow([^HAVE_LIBPTHREAD$]) -m4trace:configure.ac:29: -1- m4_pattern_allow([^HAVE_LIBGUICHAN$]) -m4trace:configure.ac:35: -1- m4_pattern_allow([^HAVE_LIBZ$]) -m4trace:configure.ac:38: -1- m4_pattern_allow([^HAVE_LIBPHYSFS$]) -m4trace:configure.ac:41: -1- m4_pattern_allow([^HAVE_LIBCURL$]) -m4trace:configure.ac:45: -1- m4_pattern_allow([^CURL_LIBS$]) -m4trace:configure.ac:46: -1- m4_pattern_allow([^CURL_CFLAGS$]) -m4trace:configure.ac:48: -1- m4_pattern_allow([^HAVE_LIBXML2$]) -m4trace:configure.ac:51: -1- m4_pattern_allow([^HAVE_LIBPNG$]) -m4trace:configure.ac:54: -1- m4_pattern_allow([^HAVE_LIBSDL_IMAGE$]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^HAVE_LIBSDL_MIXER$]) -m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_LIBSDL_NET$]) -m4trace:configure.ac:65: -1- m4_pattern_allow([^STDC_HEADERS$]) -m4trace:configure.ac:72: -1- AM_INIT_AUTOMAKE -m4trace:configure.ac:72: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) -m4trace:configure.ac:72: -1- AM_SET_CURRENT_AUTOMAKE_VERSION -m4trace:configure.ac:72: -1- AM_AUTOMAKE_VERSION([1.10.1]) -m4trace:configure.ac:72: -1- _AM_AUTOCONF_VERSION([2.61]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__isrc$]) -m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__isrc]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^CYGPATH_W$]) -m4trace:configure.ac:72: -1- _AM_SET_OPTIONS([]) -m4trace:configure.ac:72: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete. -You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from... -/usr/share/aclocal-1.10/options.m4:25: _AM_SET_OPTIONS is expanded from... -/usr/share/aclocal-1.10/init.m4:26: AM_INIT_AUTOMAKE is expanded from... -configure.ac:72: the top level]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^PACKAGE$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^VERSION$]) -m4trace:configure.ac:72: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) -m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([no-define]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^PACKAGE$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^VERSION$]) -m4trace:configure.ac:72: -1- AM_SANITY_CHECK -m4trace:configure.ac:72: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -m4trace:configure.ac:72: -1- AM_MISSING_HAS_RUN -m4trace:configure.ac:72: -1- AM_AUX_DIR_EXPAND -m4trace:configure.ac:72: -1- m4_pattern_allow([^ACLOCAL$]) -m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOCONF], [autoconf]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOCONF$]) -m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOMAKE$]) -m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOHEADER$]) -m4trace:configure.ac:72: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^MAKEINFO$]) -m4trace:configure.ac:72: -1- AM_PROG_INSTALL_SH -m4trace:configure.ac:72: -1- m4_pattern_allow([^install_sh$]) -m4trace:configure.ac:72: -1- AM_PROG_INSTALL_STRIP -m4trace:configure.ac:72: -1- m4_pattern_allow([^STRIP$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$]) -m4trace:configure.ac:72: -1- AM_PROG_MKDIR_P -m4trace:configure.ac:72: -1- m4_pattern_allow([^mkdir_p$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AWK$]) -m4trace:configure.ac:72: -1- AM_SET_LEADING_DOT -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__leading_dot$]) -m4trace:configure.ac:72: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([tar-ustar]) -m4trace:configure.ac:72: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])]) -m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([tar-pax]) -m4trace:configure.ac:72: -1- _AM_PROG_TAR([v7]) -m4trace:configure.ac:72: -1- AM_MISSING_PROG([AMTAR], [tar]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AMTAR$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__tar$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__untar$]) -m4trace:configure.ac:72: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([no-dependencies]) -m4trace:configure.ac:72: -1- _AM_DEPENDENCIES([CXX]) -m4trace:configure.ac:72: -1- AM_SET_DEPDIR -m4trace:configure.ac:72: -1- m4_pattern_allow([^DEPDIR$]) -m4trace:configure.ac:72: -1- AM_OUTPUT_DEPENDENCY_COMMANDS -m4trace:configure.ac:72: -1- AM_MAKE_INCLUDE -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__include$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__quote$]) -m4trace:configure.ac:72: -1- AM_DEP_TRACK -m4trace:configure.ac:72: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEP_TRUE$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEP_FALSE$]) -m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE]) -m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEPBACKSLASH$]) -m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^CXXDEPMODE$]) -m4trace:configure.ac:72: -1- AM_CONDITIONAL([am__fastdepCXX], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$]) -m4trace:configure.ac:72: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$]) -m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE]) -m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE]) -m4trace:configure.ac:80: -1- m4_pattern_allow([^HAVE_LIBGL$]) -m4trace:configure.ac:82: -1- m4_pattern_allow([^USE_OPENGL$]) -m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBSDL_CONFIG$]) -m4trace:configure.ac:91: -1- m4_pattern_allow([^LIBSDL_LIBS$]) -m4trace:configure.ac:92: -1- m4_pattern_allow([^LIBSDL_CFLAGS$]) -m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_LIBSDL$]) -m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_LIBSDL$]) -m4trace:configure.ac:114: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:114: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:114: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file]) -m4trace:configure.ac:114: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS diff --git a/data/help/header.txt b/data/help/header.txt index ea622623..789e3d93 100644 --- a/data/help/header.txt +++ b/data/help/header.txt @@ -2,8 +2,8 @@ ##1 AETHYRA ##1 ========================================== - ##2Version:##6 Aethyra SVN 0.0.25 ##2Date:##3 August 2008 + ##2Version:##6 Aethyra GIT 0.0.27 ##2Date:##5 December 2008 -##2 Website: http://www.aethyra.com +##2 Website: http://www.aethyra.org -- cgit v1.2.3-70-g09d2 From 16d8375be2074e21ec3681c5d9b4f984e1db5687 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 7 Dec 2008 20:27:00 -0700 Subject: Fixed a few help files that got messed up a few commits ago. Signed-off-by: Ira Rice --- data/help/changes.txt | 72 ++------------------------------------------------ data/help/commands.txt | 7 ----- data/help/header.txt | 8 ++---- data/help/support.txt | 4 --- 4 files changed, 4 insertions(+), 87 deletions(-) (limited to 'data/help') diff --git a/data/help/changes.txt b/data/help/changes.txt index e679e928..60e78419 100644 --- a/data/help/changes.txt +++ b/data/help/changes.txt @@ -2,75 +2,7 @@ ##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 e80c537e..2785869c 100644 --- a/data/help/commands.txt +++ b/data/help/commands.txt @@ -48,18 +48,11 @@ /whisper -<<<<<<< HEAD:data/help/commands.txt This will send to player , 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" ) For further help type /help in the chat console. -======= - This will send to player , if that player is logged in. If the - name has a space in it, put double quotes around it like this: - - /whisper "" ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/commands.txt ##2IGNORING COMMUNICATION diff --git a/data/help/header.txt b/data/help/header.txt index a560895c..f70426fe 100644 --- a/data/help/header.txt +++ b/data/help/header.txt @@ -1,12 +1,8 @@ ##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 + + ##2Version:##6 Aethyra GIT 0.0.27 ##2Date:##7 December 2008 ##2 Website: http://www.aethyra.org diff --git a/data/help/support.txt b/data/help/support.txt index 819516de..44fd08f3 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -7,11 +7,7 @@ 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: -- cgit v1.2.3-70-g09d2 From 4d1ec02eb1179769c218b956bb88681efaa2cff6 Mon Sep 17 00:00:00 2001 From: Victor Fury Date: Tue, 9 Dec 2008 21:35:42 -0500 Subject: Changed a few references to the SVN so that it uses www.aethyra.org instead of 209.168.213.109 Changed a few references to aethyra.com to the appropriate aethyra.org values. There's a few other minor changes that mostly just replace references to TMW that are not essential with Aethyra references. --- AUTHORS | 2 +- INSTALL | 4 ++-- README | 3 +-- WinReadMe.txt | 2 +- data/help/support.txt | 2 +- docs/FAQ.txt | 4 ++-- docs/INSTALL/debian.txt | 6 +++--- docs/INSTALL/win32.txt | 4 ++-- docs/items.txt | 2 +- docs/packages.txt | 2 +- docs/progression.txt | 4 ++-- docs/win32-release.txt | 4 ++-- 12 files changed, 19 insertions(+), 20 deletions(-) (limited to 'data/help') diff --git a/AUTHORS b/AUTHORS index 34618b84..4f30129b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,7 +12,7 @@ Aethyra Dev Team == Artists == - Frictor + Frictor Angeliex == Map Designers == diff --git a/INSTALL b/INSTALL index 4124002d..24669094 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ How to compile and run Aethyra on your GNU/Linux Box ================================================ -Homepage: http://www.aethyra.com/ +Homepage: http://www.aethyra.org/ IRC: irc.freenode.net / #aethyra 1) Requirements @@ -69,7 +69,7 @@ pass a different prefix to configure as usual. 4.) su -c "make install" you can get help from A.) IRC channel irc.freenode.net #aedev or #aethyra - B.) http://forum.aethyra.com + B.) http://www.aethyra.org/forums/ Make sure you record the output from the konsole window NOTE: It is possible to compile Aethyra without support for OpenGL rendering. diff --git a/README b/README index 6e31ab6e..0e5eb955 100644 --- a/README +++ b/README @@ -122,10 +122,9 @@ level 10: enables not used If you're having troubles, please 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: -- http://forums.aethyra.com +- http://www.aethyra.org/forums or come visit us on our IRC channel: - #aethyra @ irc.freenode.net -- ##aethyra @ irc.freenode.net - #aedev @ irc.freenode.net Otherwise check the AUTHORS file to have a list of developers and how to diff --git a/WinReadMe.txt b/WinReadMe.txt index 17870e03..a77ce944 100644 --- a/WinReadMe.txt +++ b/WinReadMe.txt @@ -12,7 +12,7 @@ from where it left off. To install the client, just copy this folder to your Program Files folder and add a shortcut to aethyra.exe to your Start Menu. -For any further questions pop onto the forums at http://forums.aethyra.com/ +For any further questions pop onto the forums at http://www.aethyra.org/forums/ especially the Windows Way forum, or pop onto the IRC channel #aethyra on the FreeNode network diff --git a/data/help/support.txt b/data/help/support.txt index 44fd08f3..5d7d019f 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -7,7 +7,7 @@ can't find a solution to your problem, feel free to check our Bugs/Support section of the forum: -##2 http://forums.aethyra.com +##2 http://www.aethyra.org/forums/ or come visit us on our IRC channel: diff --git a/docs/FAQ.txt b/docs/FAQ.txt index b52c0f17..6adfb2b3 100644 --- a/docs/FAQ.txt +++ b/docs/FAQ.txt @@ -9,7 +9,7 @@ A: The fastest way is to come on our IRC channel. There you can find a lot of nice people that will help you until you solve your problem. Server: irc.freenode.net Channel: #aethyra. If you don't like IRC just come to our forums: - http://forums.aethyra.com/ . Ok, do you think forums are evil? + http://www.aethyra.org/ . Ok, do you think forums are evil? Don't worry, send me an e-mail at blame582@gmail.com and you're done. That's not enough? No, I won't give you my phone number! ;P @@ -60,7 +60,7 @@ DEVELOPMENT Q: When will the next version be released? A: We have scheduled releases. Usually a new release is available every month. - Check http://www.aethyra.com/ for further info. + Check http://www.aethyra.org/ for further info. Q: How can I contribute? diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt index e9cf3183..4e643a55 100644 --- a/docs/INSTALL/debian.txt +++ b/docs/INSTALL/debian.txt @@ -9,11 +9,11 @@ to for Aethyra... WARNING! These instructions are probably outdated! -Check the forums (http://forums.aethyra.com/) where better help can be found. +Check the forums (http://www.aethyra.org/forums/) where better help can be found. Aethyra project ====================== -Homepage: http://www.aethyra.com/ +Homepage: http://www.aethyra.org/ IRC: irc.freenode.net / #aethyra 1) Installing Aethyra and dependencies @@ -53,7 +53,7 @@ And the debhelper tools: Download tmw from Subversion using the command (You'll need Subversion installed on your system): - svn co svn://209.168.213.109/client/trunk aethyra + svn co svn://www.aethyra.org/client/trunk aethyra Rename the aethyra folder into aethyra-XXX and open a console in it. You can now type: diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt index 3ffd506e..2fd12f8c 100644 --- a/docs/INSTALL/win32.txt +++ b/docs/INSTALL/win32.txt @@ -5,7 +5,7 @@ How setup Dev-C++ to compile Aethyra on a Win32 Box Aethyra project =========================== -Homepage: http://www.aethyra.com +Homepage: http://www.aethyra.org IRC: irc.freenode.net / #aethyra @@ -119,7 +119,7 @@ Check out The Mana Experiment from Subversion using either the command line svn tool or TortoiseSVN, pick what you like to use most and install that. Next, check out the following directory from our repository: - svn://209.168.213.109/client/trunk + svn://www.aethyra.org/client/trunk Open "Aethyra.dev" in Dev-C++. From there on you should be able to start compilition with Excute -> Compile. A file called aethyra.exe should appear diff --git a/docs/items.txt b/docs/items.txt index 19c6b10c..efba35ac 100644 --- a/docs/items.txt +++ b/docs/items.txt @@ -1,5 +1,5 @@ ------------------------------- -THE MANA WORLD INVENTORY SYSTEM + AETHYRA INVENTORY SYSTEM ------------------------------- 1. INTRODUCTION diff --git a/docs/packages.txt b/docs/packages.txt index d5735e28..f29fbe8c 100644 --- a/docs/packages.txt +++ b/docs/packages.txt @@ -15,7 +15,7 @@ AETHYRA PACKAGE SYSTEM 1. INTRODUCTION -Aethyra (Was The Mana Experiment, original;y The Mana World) is expected to grow continuously with updates to the game +Aethyra (Was The Mana Experiment, originally part of The Mana World) is expected to grow continuously with updates to the game world occurring relatively frequently. More often so than for example new releases of the game client. To make sure players don't have to update their data manually all the time, by for example downloading the latest from the diff --git a/docs/progression.txt b/docs/progression.txt index a25cf11f..cbec77e2 100644 --- a/docs/progression.txt +++ b/docs/progression.txt @@ -1,5 +1,5 @@ ----------------------------------- -THE MANA WORLD PLAYER'S PROGRESSION + AETHYRA PLAYER'S PROGRESSION ----------------------------------- 1. PLAYER'S STATS @@ -126,4 +126,4 @@ Peon 17 Double Hit, Hard Hit(JL:5) Beginner Lvl:10 Every of these notes have to be discussed, if you have any feedback, suggestions, updates, commit or tell them at: -address: irc://irc.freenode.net channel: #themanaworld +address: irc://irc.freenode.net channel: #aethyra diff --git a/docs/win32-release.txt b/docs/win32-release.txt index 64590139..5bd837d0 100644 --- a/docs/win32-release.txt +++ b/docs/win32-release.txt @@ -22,9 +22,9 @@ Every Win32 releaser should follow this checklist when creating a new package.