Merge branch 'master' into terencehill/lms_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / credits.qc

diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc
index cc00a0427b2ee39c5283a5dc7c74528abcdc1fef..423974e44b1f32fc36bf44671b49677eb4cd9947 100644 (file)
--- a/qcsrc/menu/xonotic/credits.qc
+++ b/qcsrc/menu/xonotic/credits.qc
@@ -6,43 +6,24 @@
                PERSON(Ant "Antibody" Zucaro) \
                PERSON(Marvin "Mirio" Beck) \
                PERSON(Merlijn Hofstra) \
-               PERSON(Peter "Morphed" Pielak) \
                PERSON(Ruszkai "CuBe0wL" Ákos) \
-               PERSON(Samual "Ares" Lenks) \
-               PERSON(TimePath) \
                PERSON(Tyler "-z-" Mulligan) \
                PERSON(Zac "Mario" Jardine) \
        NL() \
        TITLE(_("Extended Team")) \
-               PERSON(AllieWay) \
                PERSON(Antonio "terencehill" Piu) \
-               PERSON(Archer) \
-               PERSON(BuddyFriendGuy) \
-               PERSON(Debugger) \
-               PERSON(Diomedes) \
+               PERSON(bones_was_here) \
+               PERSON(David "Cloudwalk" Knapp) \
                PERSON(Freddy) \
-               PERSON(GATTS) \
                PERSON(Halogene) \
-               PERSON(IDWMaster) \
                PERSON(Jan "zykure" Behrens) \
-               PERSON(JH0nny) \
-               PERSON(Jubilant) \
-               PERSON(Łukasz "kuniu the frogg" Polek) \
-               PERSON(martin-t) \
-               PERSON(Matthias "matthiaskrgr" Krüger) \
-               PERSON(Mattia "Melanosuchus" Basaglia) \
+               PERSON(Morosophos) \
                PERSON(MrBougo) \
-               PERSON(Nick "bitbomb" Lucca) \
                PERSON(nilyt/nyov) \
                PERSON(Nitroxis) \
                PERSON(packer) \
-               PERSON(Pearce "theShadow" Michal) \
-               PERSON(Rasmus "FruitieX" Eskola) \
-               PERSON(s1lence) \
                PERSON(Severin "sev" Meyer) \
-               PERSON(Soelen) \
-               PERSON(Sydes) \
-               PERSON(unfa) \
+               PERSON(SpiKe) \
        NL() \
        NL() \
        FUNCTION(_("Website")) \
@@ -94,6 +75,7 @@
                PERSON(blkrbt) \
                PERSON(chooksta) \
                PERSON(Independent.nu) \
+               PERSON(Lea "TheAudioMonkey" Edwards) \
                PERSON([master]mind) \
                PERSON(Merlijn Hofstra) \
                PERSON(Mick Rippon) \
@@ -105,10 +87,14 @@
                PERSON(unfa) \
        NL() \
        FUNCTION(_("Game Code")) \
-               PERSON(Samual "Ares" Lenks) \
-               PERSON(Rudolf "divVerent" Polzer) \
+               PERSON(Antonio "terencehill" Piu) \
                PERSON(Jakob "tZork" Markström Gröhn) \
+               PERSON(martin-t) \
+               PERSON(Mattia "Melanosuchus" Basaglia) \
+               PERSON(Matthias "matthiaskrgr" Krüger) \
                PERSON(Rasmus "FruitieX" Eskola) \
+               PERSON(Rudolf "divVerent" Polzer) \
+               PERSON(Samual "Ares" Lenks) \
                PERSON(TimePath) \
                PERSON(Zac "Mario" Jardine) \
        NL() \
@@ -125,9 +111,10 @@
        NL() \
        TITLE(_("Game Engine")) \
                FUNCTION("DarkPlaces") \
-                       PERSON(Forest "LordHavoc" Hale) \
+                       PERSON(Ashley Rose "LadyHavoc" Hale) \
                NL() \
                FUNCTION(_("Engine Additions")) \
+                       PERSON(David "Cloudwalk" Knapp) \
                        PERSON(Rudolf "divVerent" Polzer) \
                        PERSON(Samual "Ares" Lenks) \
                NL() \
@@ -139,9 +126,11 @@
                NL() \
        NL() \
        TITLE(_("Other Active Contributors")) \
-               PERSON(Erik "Ablu" Schilling) \
+               PERSON(Jeff) \
                PERSON(Mircea "Taoki" Kitsune) \
                PERSON(Penguinum) \
+               PERSON(slava) \
+               PERSON(Victor "LegendGuard" Jaume) \
        NL() \
        NL() \
        TITLE(_("Translators")) \
@@ -182,6 +171,7 @@
                NL() \
                FUNCTION(_("Dutch")) \
                        PERSON(Alexander "freefang" van Dam) \
+                       PERSON(Joeke "Mappack" de Graaf) \
                        PERSON(Jonathan "Jonakeys" van der Steege) \
                        PERSON(PinkRobot) \
                        PERSON(vegiburger) \
@@ -225,12 +215,18 @@
                        PERSON(Ruszkai "CuBe0wL" Ákos) \
                        PERSON(xaN1C4n3) \
                NL() \
+               FUNCTION(_("Irish")) \
+                       PERSON(Kevin "kscanne" Scannell) \
+               NL() \
                FUNCTION(_("Italian")) \
                        PERSON(Antonio "terencehill" Piu) \
                        PERSON(Felice "MaidenBeast" Sallustio) \
                        PERSON(stdi) \
                        PERSON(XCostaX) \
                NL() \
+               FUNCTION(_("Japanese")) \
+                       PERSON(Victor "LegendGuard" Jaume) \
+               NL() \
                FUNCTION(_("Kazakh")) \
                        PERSON("Артем "bystrov.arterm" Быстров") \
                NL() \
@@ -244,6 +240,7 @@
                        PERSON(Amadeusz "amade/proraide" Sławiński) \
                        PERSON(Artur "artur9010" Motyka) \
                        PERSON(Jakub "KubeQ11" Pędziszewski) \
+                       PERSON(Kriss7475) \
                NL() \
                FUNCTION(_("Portuguese")) \
                        PERSON(Ivan Paulos "greylica" Tomé) \
@@ -269,8 +266,12 @@
                        PERSON(Nikoli) \
                        PERSON(Sergej "Clearness High" Lutsyk) \
                NL() \
+               FUNCTION(_("Scottish Gaelic")) \
+                       PERSON_("GunChleoc") \
+               NL() \
                FUNCTION(_("Serbian")) \
                        PERSON_("Саша \"salepetronije\" Петровић") \
+                       PERSON(Marko M. Kostić) \
                        PERSON(Pendulla) \
                        PERSON(Rafael "Ristovski") \
                NL() \
@@ -283,6 +284,8 @@
                        PERSON(roader_gentoo) \
                        PERSON(Rodrigo Mouton Laudin) \
                        PERSON(SouL) \
+                       PERSON(Starfire24680) \
+                       PERSON(Victor "LegendGuard" Jaume) \
                NL() \
                FUNCTION(_("Swedish")) \
                        PERSON(Karl-Oskar "machine" Rikås) \
@@ -305,11 +308,13 @@
                PERSON(BigMac) \
                PERSON(Braden "meoblast001" Walters) \
                PERSON(Brain Younds) \
+               PERSON(BuddyFriendGuy) \
                PERSON(Chris "amethyst7" Matz) \
                PERSON(Christian Ice) \
                PERSON(Clinton "Kaziganthe" Freeman) \
                PERSON(Dan "Digger" Korostelev) \
                PERSON(Dan "Wazat" Hale) \
+               PERSON(Diomedes) \
                PERSON(Dokujisan) \
                PERSON(Donkey) \
                PERSON(dstrek) \
@@ -317,17 +322,21 @@
                PERSON(Edgenetwork) \
                PERSON(Edward "Ed" Holness) \
                PERSON(Eric "Munyul Verminard" Sambach) \
+               PERSON(Erik "Ablu" Schilling) \
                PERSON(Fabien "H. Reaper" Tschirhart) \
                PERSON(Florian Paul "lda17h" Schmidt) \
                PERSON(FrikaC) \
                PERSON(Garth "Zombie" Hendy) \
+               PERSON(GATTS) \
                PERSON(Gerd "Elysis" Raudenbusch) \
                PERSON(Gottfried "Toddd" Hofmann) \
                PERSON(Henning "Tymo" Janssen) \
                PERSON(Innovati) \
+               PERSON(JH0nny) \
                PERSON(Jitspoe) \
                PERSON(Jody Gallagher) \
                PERSON(Jope "Sless" Withers) \
+               PERSON(Jubilant) \
                PERSON(Juergen "LowDragon" Timm) \
                PERSON(KadaverJack) \
                PERSON(Kevin "Tyrann" Shanahan) \
@@ -337,6 +346,7 @@
                PERSON(Lee David Ash) \
                PERSON(Lee Vermeulen) \
                PERSON(leileilol) \
+               PERSON(Lyberta) \
                PERSON(magorian) \
                PERSON(Marius "GreEn`mArine" Shekow) \
                PERSON(Marko "Urre" Permanto) \
@@ -364,10 +374,13 @@
                PERSON(Robert "ai" Kuroto) \
                PERSON(Ronan) \
                PERSON(Sajt) \
+               PERSON(Samual "Ares" Lenks) \
                PERSON(Saulo "mand1nga" Gil) \
                PERSON(Shaggy) \
                PERSON(Shank) \
+               PERSON(s1lence) \
                PERSON(Simon O’Callaghan) \
+               PERSON(Soelen) \
                PERSON(SomeGuy) \
                PERSON(SoulKeeper_p) \
                PERSON(Spike) \
@@ -375,6 +388,7 @@
                PERSON(Stephan "esteel" Stahl) \
                PERSON(Steve Vermeulen) \
                PERSON(Supajoe) \
+               PERSON(Sydes) \
                PERSON(Tei) \
                PERSON(The player with the unnecessarily long name) \
                PERSON(Tomaz) \
@@ -384,6 +398,7 @@
                PERSON(William "Willis" Weilep) \
                PERSON(Yves "EviLair" Allaire) \
                PERSON(Zenex) \
+               PERSON(... and a goat) \
                /**/
 
 int credits_get()