summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS74
1 files changed, 74 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 29e56fe6..34618b84 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,76 @@
+<<<<<<< HEAD:AUTHORS
+---------------------------
+Aethyra Dev Team
+---------------------------
+
+ Tametomo <irarice@gmail.com>
+
+== Programmers ==
+
+ Kraant <kraant@gmail.com>
+ Tametomo <irarice@gmail.com>
+
+== Artists ==
+
+ Frictor
+ Angeliex
+
+== Map Designers ==
+
+ Ichigo Black (aka Gonzo Dark)
+ Arkyan
+
+== Inactive/Retired ==
+
+ Blameu aka Kevin Day (blame@aethyra.com.com)
+ Sanga <sanga@aethyra.com>
+ Scraggy <DougABoffey@netscape.net>
+ Sertraline
+
+-----------------------
+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 --
---------------------------------
@@ -58,3 +131,4 @@ Jean-Francois Lampron <sull.kf gmail.com>
Rodney Dawes <dobey novell.com>
Ultramichy
Zuzanna K. Filutowska <platyna users.sourceforge.net>
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:AUTHORS