diff options
| -rw-r--r-- | AUTHORS | 46 | ||||
| -rw-r--r-- | INSTALL | 14 |
2 files changed, 1 insertions, 59 deletions
@@ -1,4 +1,3 @@ -<<<<<<< HEAD:AUTHORS --------------------------- Aethyra Dev Team --------------------------- @@ -31,50 +30,6 @@ Aethyra Dev Team The Mana World Dev Team ----------------------- - ElvenProgrammer aka Eugenio Favalli (elvenprogrammer@gmail.com) - Project leader, programmer - -== Programmers == - - Bertram (SDL input, progress bar drawing, Debian package) - Bj�rn Lindeijer (various parts, GUI, graphics, A* and map rewrites) - Bj�rn Steinbrink (various parts) - Javila (various parts, GUI) - nym (several GUI parts) - Shura (configuration, sound, misc. ports) - zenogais (resource manager) - Usiu (several GUI parts) - Mra (some GUI parts) - -== Artists == - - Clef (tiles, concepts) - Gnulia (conceptual art) - Irukard (item icons) - Magick (music and sound effects) - Neko-mon (player sprites, various things) - Neorice (monster sprites, tiles) - Modanung (pixel art, concept art) - Pajarico (concepts) - Rotonen (backstory, art director, music, sound) - Talaroc (sprites) - Ti Sing Hao (music) - -== Misc thanks == - - Ultramichy (hosting test server) - -== Inactive/retired == - - Chetic (maps) - SimEdw (network code) - Sull (hosting CVS and related services) - Vlady (several items) -======= ---------------------------------- --- The Mana World Contributors -- ---------------------------------- - This file lists all contributors up to the current release. Check the wiki for the currently active development team. @@ -131,4 +86,3 @@ Jean-Francois Lampron <sull.kf gmail.com> Rodney Dawes <dobey novell.com> Ultramichy Zuzanna K. Filutowska <platyna users.sourceforge.net> ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:AUTHORS @@ -5,11 +5,7 @@ Homepage: http://www.aethyra.org/ IRC: irc.freenode.net / #aethyra 1) Requirements -<<<<<<< HEAD:INSTALL 2) Compiling Aethyra -======= -2) Compiling And Installing The Mana World ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL 3) Notes @@ -30,12 +26,8 @@ a source release. To get Aethyra to compile, you need a compiler * zlib 1.2.x http://www.gzip.org/zlib/ * libcurl http://curl.haxx.se/libcurl/ -<<<<<<< HEAD:INSTALL -If you checked Aethyra out from Subversion you will also need these tools to +If you cloned Aethyra from the Git repository, you will also need these tools to compile: -======= -If you've cloned the Git repository, you will also need these tools to compile: ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL * GNU automake 1.9 http://www.gnu.org/software/automake/ * GNU autoconf http://www.gnu.org/software/autoconf/ @@ -48,15 +40,11 @@ you to figure this out. =============================================== 1) Go to the directory you have extracted the source to. -<<<<<<< HEAD:INSTALL -2) If you checked out from SVN, run "./autobuild.sh" to install the client. -======= 2) If you've cloned the Git repository, run "autoreconf -i" to generate configure and install any missing auxiliary files. 3) Run "./configure" 4) Run "make" 5) Run "make install" as root ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL 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 |