Merge remote branch 'origin/master' into tzork/gm_nexball

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

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index ec46525c90a1ec87dea004ba58f94e62ad837625..2e60c679fc341d4b3cf000f758b1e84ee8b9bad8 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,20 +1,20 @@
 **Core Team
 
 Rudolf "divVerent" Polzer
--z-
+Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
-mand1nga
-tZork
-
+Samual "Ares" Lenks
+Saulo "mand1nga" Gil
+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
@@ -22,16 +22,24 @@ morphed
 
 *Concept Art
 LJFHutch
-theShadow
+Pearce "theShadow" Michal
+
+*Animation
+Sahil "DiaboliK" Singhal
+nifrek
 
 *Level Design
 FruitieX
 MirceaKitsune
+Jakob "tZork" Markström Gröhn
+Ruszkai "C.Brutail" Ákos
 
 *Music / Sound FX
 mand1nga
 Merlijn Hofstra
 remaxim
+Stephan
+Independent.nu
 
 *Engine Code Additions & QA
 Rudolf "divVerent" Polzer
@@ -39,11 +47,12 @@ Rudolf "divVerent" Polzer
 *Game Code
 Rudolf "divVerent" Polzer
 FruitieX
-tZork
+Jakob "tZork" Markström Gröhn
 
 *Marketing / PR
--z-
+Tyler "-z-" Mulligan
 mand1nga
+Ruszkai "C.Brutail" Ákos
 
 *Legal
 Rudolf "divVerent" Polzer
@@ -53,18 +62,81 @@ Merlijn Hofstra
 DarkPlaces
 by Forest "LordHavoc" Hale
 
-**Active Contributors
+**Translators
+
+*Dutch
+Alexander "freefang" van Dam
+PinkRobot
+
+*German
+Rudolf "divVerent" Polzer
+
+*Finnish
+Henry "Exitium" Sanmark
+
+*French
+Calinou
+Maxime "Taximus" Paradis
+
+*Greek
+Γιάννης Α.
+
+*Hungarian
+xaN1C4n3
+Ruszkai "C.Brutail" Ákos
+
+*Italian
 Antonio "terencehill" Piu
+Felice "MaidenBeast" Sallustio
+
+*Portuguese
+Ricardo "Hellgardia" Silva
+
+*Romanian
+MirceaKitsune
+
+*Russian
+Lord Canistra
+Nikoli
+
+*Spanish
+Rodrigo Mouton Laudin
+
+*Swedish
+marcus256
+
+*Ukrainian
+Vasyl "Harmata" Melnyk
+
+**Other Active Contributors
+Akari
+Ant "Antibody" Zucaro
+Antonio "terencehill" Piu
+atheros
 Ben "MooKow" Banker
+blkrbt
 Calinou
 chooksta
+cortez
 Cuinn "Cuinnton" Herrick
-Kristian "morfar" Johansson
+Florian Paul "lda17h" Schmidt
 kojn
+Kristian "morfar" Johansson
+kuniuthefrogg
+magorian
 Maik "SavageX" Merten
+Marvin "Mirio" Beck
+Mick Rippon
 MrBougo
-Samual Lenks
+parasti
+Paul Scott
+PlasmaSheep
+Przemysław "atheros" Grzywacz
+{SC0RP} - Ian "ID" Dorrell
+Severin "sev" Meyer
+SoulKeeper_p
 Stephan "esteel" Stahl
+The player with the unnecessarily long name
 Wolfgang "Blub\0" Bumiller
 
 **Past Contributors
@@ -73,7 +145,6 @@ Amos "torus" Dudley
 Andreas "Black" Kirsch
 Attila "WW3" Houtkooper
 BigMac
-blkrbt
 Braden "meoblast001" Walters
 Brain Younds
 Chris "amethyst7" Matz
@@ -124,7 +195,6 @@ Rick "Rat" Kelley
 Robert "ai" Kuroto
 Ronan
 Sajt
-Severin "sev" Meyer
 Shaggy
 Shank
 Simon O'Callaghan
@@ -134,7 +204,6 @@ Spirit
 Steve Vermeulen
 Supajoe
 Tei
-terencehill
 Tomaz
 Ulrich Galbraith
 Vortex