Merge remote branch 'origin/master' into terencehill/infinite_ammo

[xonotic/xonotic-data.pk3dir.git] / xonotic-credits.txt

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index d541b7993e721b0f87dd1cc3d8fd3bde32406641..1ffde9fd0e0280a5d6bd2aa2346309d26c1cc7c5 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,31 +1,42 @@
 **Core Team
 
 Rudolf "divVerent" Polzer
--z-
+Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
 mand1nga
-tZork
-
+Jakob "tZork" Markström Gröhn
 
 **Coordinators
 
 *Art
-Diabolik a.k.a Dib
+Sahil "DiaboliK" Singhal
 
 *2D Art / Web
--z- (web / game)
+Tyler "-z-" Mulligan (web / game)
 FruitieX (game / web)
 
 *3D Art
 morphed
 
+*Concept Art
+LJFHutch
+Pearce "theShadow" Michal
+
+*Animation
+Sahil "DiaboliK" Singhal
+nifrek
+
 *Level Design
 FruitieX
+MirceaKitsune
+Jakob "tZork" Markström Gröhn
 
 *Music / Sound FX
 mand1nga
 Merlijn Hofstra
+remaxim
+Stephan
 
 *Engine Code Additions & QA
 Rudolf "divVerent" Polzer
@@ -33,10 +44,10 @@ Rudolf "divVerent" Polzer
 *Game Code
 Rudolf "divVerent" Polzer
 FruitieX
-tZork
+Jakob "tZork" Markström Gröhn
 
 *Marketing / PR
--z-
+Tyler "-z-" Mulligan
 mand1nga
 
 *Legal
@@ -47,14 +58,51 @@ Merlijn Hofstra
 DarkPlaces
 by Forest "LordHavoc" Hale
 
-**Active Contributors
+**Translators
+
+*German
+Rudolf "divVerent" Polzer
+
+*Finnish
+Henry "Exitium" Sanmark
+
+*French
+Calinou
+
+*Italian
+Antonio "terencehill" Piu
+Felice "MaidenBeast" Sallustio
+
+*Portuguese
+Ricardo "Hellgardia" Silva
+
+*Romanian
+MirceaKitsune
+
+*Russian
+Lord Canistra
+Nikoli
+
+**Other Active Contributors
+Ant "Antibody" Zucaro
+Antonio "terencehill" Piu
 Ben "MooKow" Banker
+blkrbt
+Calinou
+chooksta
+Cuinn "Cuinnton" Herrick
+Florian Paul "lda17h" Schmidt
 Kristian "morfar" Johansson
 kojn
 Maik "SavageX" Merten
 MrBougo
+Przemysław "atheros" Grzywacz
+Ruszkai "C.Brutail" Ákos
+Samual Lenks
+Severin "sev" Meyer
 Stephan "esteel" Stahl
 Wolfgang "Blub\0" Bumiller
+SoulKeeper_p
 
 **Past Contributors
 Alexander "motorsep" Zubov
@@ -62,7 +110,6 @@ Amos "torus" Dudley
 Andreas "Black" Kirsch
 Attila "WW3" Houtkooper
 BigMac
-blkrbt
 Braden "meoblast001" Walters
 Brain Younds
 Chris "amethyst7" Matz
@@ -101,7 +148,6 @@ MauveBib
 Mephisto
 michaelb
 Michael "Tenshihan" Quinn
-MirceaKitsune
 Munyul
 Netzwerg
 NoelCower
@@ -114,8 +160,6 @@ Rick "Rat" Kelley
 Robert "ai" Kuroto
 Ronan
 Sajt
-Samual Lenks
-Severin "sev" Meyer
 Shaggy
 Shank
 Simon O'Callaghan
@@ -125,7 +169,6 @@ Spirit
 Steve Vermeulen
 Supajoe
 Tei
-terencehill
 Tomaz
 Ulrich Galbraith
 Vortex