X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-credits.txt;h=d253bd1594c7e1f0e23dadf0c3dc30098632593c;hb=026b1e9f8a6d485705aaf949b7e16c08f50ba28f;hp=cdf28d72977e9a59810075d176a78b7154e6938b;hpb=715202f719f244160bfc0b004013fa6e1bcc5668;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index cdf28d729..d253bd159 100644
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,205 +1,139 @@
-(THIS FILE IS A HUGE TODO)
-(YES, REALLY, NOTHING HERE IS TRUE)
-(PLEASE FIX THIS FILE)
+**Core Team
 
+Rudolf "divVerent" Polzer
+-z-
+Merlijn Hofstra
+morphed
+mand1nga
+tZork
 
-**Team Leaders:
 
+**Coordinators
 
+*Art
+Diabolik a.k.a Dib
 
-**Project maintainers:
+*2D Art / Web
+-z- (web / game)
+FruitieX (game / web)
 
-Kristian "morfar" Johansson
+*3D Art
+morphed
 
-Maik "SavageX" Merten
+*Level Design
+FruitieX
+MirceaKitsune
 
+*Music / Sound FX
+mand1nga
+Merlijn Hofstra
+remaxim
 
-**Development Team:
+*Engine Code Additions & QA
+Rudolf "divVerent" Polzer
 
-Rudolf "div0" Polzer
-*Programmer
+*Game Code
+Rudolf "divVerent" Polzer
+FruitieX
+tZork
 
-Andreas "Black" Kirsch
-*Programmer
+*Marketing / PR
+-z-
+mand1nga
 
-Paul "Strahlemann" Evers
-*Level Designer
+*Legal
+Rudolf "divVerent" Polzer
+Merlijn Hofstra
 
-Peter "Morphed" Pielak
-*Artist
+**Game Engine
+DarkPlaces
+by Forest "LordHavoc" Hale
 
+**Active Contributors
+Antonio "terencehill" Piu
+Ben "MooKow" Banker
+Calinou
+chooksta
+Kristian "morfar" Johansson
+kojn
+Maik "SavageX" Merten
+MrBougo
 Samual Lenks
-*Programmer
-
-Rasmus "FruitieX" Eskola
-*Artist and Programmer
-
-Saulo "mand1nga" Gil
-*Programmer
-
 Stephan "esteel" Stahl
-*Programmer
-
-Jakob "tZork" Markstrom Grohn
-*Programmer and Artist
-
-Tyler "-z-" Mulligan
-*Web Developer and Interaction Designer
-
 Wolfgang "Blub\0" Bumiller
-*Programmer
-
-Merlijn Hofstra
-*Programmer and server admin
-
-
-
-**Past Team Members
-*In alphabetical order
-*(nickname or surname)
-
-Kurt Dereli
-*Artist
-
-Yves "EviLair" Allaire
-*Artist
-
-Fabien "H. Reaper" Tschirhart
-*Level Designer
-
-"Innovati"
-*Artist
-
-KadaverJack
-*Programmer
-
-William Libert
-* Level Designer
-
-MauveBib
-*Bot Programmer
-
-Rick "Rat" Kelley
-*Lead Animator, Skinner
-
-Michael "Tenshihan" Quinn
-*Sound FX and Player-Voices
-
-Gottfried "Toddd" Hofmann
-*Sound FX
-
-Marko "Urre" Permanto
-*Bot Programmer
-
-Dan "Wazat" Hale
-*Programmer
-
-Garth "Zombie" Hendy
-*Level Designer
-
-
-
-**Special Thanks:
-*In alphabetical order
-*(nickname or surname)
-
-Robert "ai" Kuroto
-*Various models
-
-Chris "amethyst7" Matz
-*Level design
-
-blkrbt
-*Music
-
-Gerd "Elysis" Raudenbusch
-*Music
-
-Marius "GreEn`mArine" Shekow
-*Programmer
-
-Forest "LordHavoc" Hale
-*DarkPlaces Engine Programmer
-
-Braden "meoblast001" Walters
-*Music
 
+**Past Contributors
 Alexander "motorsep" Zubov
-*Weapon animation
-
-Eric "Munyul Verminard" Sambach
-*Level design
-
-Severin "sev" Meyer
-*Artist
-
-Simon O'Callaghan
-*egyptsoc texture set
-
-Michael "Tenshihan" Quinn
-*Sound effects
-
 Amos "torus" Dudley
-*Announcer voices
-
-Mattrew "Tronyn" Rye
-*Level design
-
-Henning "Tymo" Janssen
-*Level design
-
-Kevin "Tyrann" Shanahan
-*Level design
-
-William "Willis" Weilep
-*Master server host
-
-
-**Thanks:
-
+Andreas "Black" Kirsch
 Attila "WW3" Houtkooper
 BigMac
+blkrbt
+Braden "meoblast001" Walters
 Brain Younds
+Chris "amethyst7" Matz
 Christian Ice
 Clinton "Kaziganthe" Freeman
 Dan "Digger" Korostelev
+Dan "Wazat" Hale
 Donkey
+dstrek
 Dustin Geeraert
 Edgenetwork
 Edward "Ed" Holness
+Eric "Munyul Verminard" Sambach
+Fabien "H. Reaper" Tschirhart
 FrikaC
+Garth "Zombie" Hendy
+Gerd "Elysis" Raudenbusch
+Gottfried "Toddd" Hofmann
+Henning "Tymo" Janssen
+"Innovati"
 Jitspoe
 Jody Gallagher
 Juergen "LowDragon" Timm
+KadaverJack
+Kevin "Tyrann" Shanahan
+Kurt Dereli
+lcatlnx
 Lee David Ash
 Lee Vermeulen
+leileilol
+Marius "GreEn`mArine" Shekow
+Marko "Urre" Permanto
 Mathieu "Elric" Olivier
+Mattrew "Tronyn" Rye
+MauveBib
 Mephisto
-MirceaKitsune
-MrBougo
+michaelb
+Michael "Tenshihan" Quinn
 Munyul
 Netzwerg
 NoelCower
 Parapraxis
+Paul "Strahlemann" Evers
 Petithomme
 Q1 Retexturing Project
 Qantourisc
+Rick "Rat" Kelley
+Robert "ai" Kuroto
 Ronan
 Sajt
+Severin "sev" Meyer
 Shaggy
 Shank
+Simon O'Callaghan
 SomeGuy
 Spike
 Spirit
 Steve Vermeulen
 Supajoe
 Tei
+terencehill
 Tomaz
 Ulrich Galbraith
 Vortex
+William Libert
+William "Willis" Weilep
+Yves "EviLair" Allaire
 Zenex
-dstrek
-lcatlnx
-leileilol
-michaelb
-terencehill