X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcredits.qc;h=f23e58bdba875dc0de645555308881ecf519a4f1;hb=7cac6c7577dcebbec3bf016900a257d04e75eab0;hp=7e0d10144863c73d58d079825f32e51e97ff2bb6;hpb=e25a89138cd668cd0299ede2f6415f03e23763a2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc
index 7e0d10144..f23e58bdb 100644
--- a/qcsrc/menu/xonotic/credits.qc
+++ b/qcsrc/menu/xonotic/credits.qc
@@ -4,14 +4,14 @@
 	TITLE(_("Core Team")) \
 		PERSON(Rudolf "divVerent" Polzer) \
 		PERSON(Ant "Antibody" Zucaro) \
+		PERSON(Antonio "terencehill" Piu) \
 		PERSON(Marvin "Mirio" Beck) \
 		PERSON(Merlijn Hofstra) \
 		PERSON(Ruszkai "CuBe0wL" Ákos) \
 		PERSON(Tyler "-z-" Mulligan) \
-		PERSON(Zac "Mario" Jardine) \
 	NL() \
 	TITLE(_("Extended Team")) \
-		PERSON(Antonio "terencehill" Piu) \
+		PERSON(bones_was_here) \
 		PERSON(David "Cloudwalk" Knapp) \
 		PERSON(Freddy) \
 		PERSON(Halogene) \
@@ -22,11 +22,15 @@
 		PERSON(Nitroxis) \
 		PERSON(packer) \
 		PERSON(Severin "sev" Meyer) \
-		PERSON(SpiKe) \
+		PERSON(Thomas "illwieckz" Debesse) \
+		PERSON(Victor "LegendGuard" Jaume) \
+		PERSON(Yannick "SpiKe" Le Guen) \
+		PERSON(z411) \
 	NL() \
 	NL() \
 	FUNCTION(_("Website")) \
 		PERSON(Ant "Antibody" Zucaro (web)) \
+		PERSON(Freddy) \
 		PERSON(Merlijn Hofstra) \
 		PERSON(Tyler "-z-" Mulligan (web / game)) \
 	NL() \
@@ -46,9 +50,13 @@
 		PERSON(Sahil "DiaboliK" Singhal) \
 		PERSON(nifrek) \
 	NL() \
+	FUNCTION(_("Campaign")) \
+		PERSON(Marvin "Mirio" Beck) \
+	NL() \
 	FUNCTION(_("Level Design")) \
 		PERSON(Amadeusz "amade/proraide" Sławiński) \
 		PERSON(Ben "MooKow" Banker) \
+		PERSON(cityy) \
 		PERSON(Cortez) \
 		PERSON(Cuinn "Cuinnton" Herrick) \
 		PERSON(Debugger) \
@@ -68,6 +76,7 @@
 		PERSON(Severin "sev" Meyer) \
 		PERSON(ShadoW) \
 		PERSON(t0uYK8Ne) \
+		PERSON(Yannick "SpiKe" Le Guen) \
 	NL() \
 	FUNCTION(_("Music / Sound FX")) \
 		PERSON(AquaNova (Archer)) \
@@ -86,6 +95,9 @@
 		PERSON(unfa) \
 	NL() \
 	FUNCTION(_("Game Code")) \
+		PERSON(Antonio "terencehill" Piu) \
+		PERSON(bones_was_here) \
+		PERSON(Dr. Jaska) \
 		PERSON(Jakob "tZork" Markström Gröhn) \
 		PERSON(martin-t) \
 		PERSON(Mattia "Melanosuchus" Basaglia) \
@@ -94,6 +106,8 @@
 		PERSON(Rudolf "divVerent" Polzer) \
 		PERSON(Samual "Ares" Lenks) \
 		PERSON(TimePath) \
+		PERSON(Victor "LegendGuard" Jaume) \
+		PERSON(z411) \
 		PERSON(Zac "Mario" Jardine) \
 	NL() \
 	FUNCTION(_("Marketing / PR")) \
@@ -125,7 +139,6 @@
 	NL() \
 	TITLE(_("Other Active Contributors")) \
 		PERSON(Jeff) \
-		PERSON(Lyberta) \
 		PERSON(Mircea "Taoki" Kitsune) \
 		PERSON(Penguinum) \
 		PERSON(slava) \
@@ -144,108 +157,196 @@
 		FUNCTION(_("Bulgarian")) \
 			PERSON(Alexander "alex4o" Bonin) \
 			PERSON(ifohancroft) \
+			PERSON(Krasimir "kmikov" Mikov) \
 			PERSON(lokster) \
+			PERSON(Nik "cozmo" Dim) \
 			PERSON(set_killer) \
 			PERSON(ubone) \
 		NL() \
 		FUNCTION(_("Chinese (China)")) \
 			PERSON(Antonidas) \
 			PERSON(Armcoon) \
+			PERSON(CodingJellyfish) \
+			PERSON(gee "Largee" Lar) \
+			PERSON(jiegushijia) \
 			PERSON(kalawore) \
+			PERSON(Liang "dxkliu" Liu) \
+			PERSON(Losier "losierb" Blackheath) \
+			PERSON(Matthew "wjjmatthew" Wu) \
+			PERSON(moetale) \
+			PERSON(NaitLee) \
+			PERSON(sapphireliu) \
+		NL() \
+		FUNCTION(_("Chinese (Hong Kong)")) \
+			PERSON(Antonidas) \
+			PERSON(CodingJellyfish) \
+			PERSON(gee "Largee" Lar) \
+			PERSON(jiegushijia) \
+			PERSON(kalawore) \
+			PERSON(Losier "losierb" Blackheath) \
+			PERSON(Matthew "wjjmatthew" Wu) \
+			PERSON(Liang "dxkliu" Liu) \
+			PERSON(moetale) \
+			PERSON(NaitLee) \
 			PERSON(sapphireliu) \
 		NL() \
 		FUNCTION(_("Chinese (Taiwan)")) \
 			PERSON(Alisha) \
 			PERSON(Armcoon) \
 			PERSON(Jeff "s8321414" Huang) \
-		NL() \
-		FUNCTION(_("Cornish")) \
-			PERSON(Nicky "nrowe" Rowe) \
+			PERSON(msn1018927464) \
+			PERSON(NaitLee) \
 		NL() \
 		FUNCTION(_("Czech")) \
+			PERSON(Adam "Admi335" Říha) \
+			PERSON(fasdasd " kitfildom" sdasd) \
+			PERSON(gamingforyou875) \
+			PERSON(Jan "kockahonza" Kocka) \
+			PERSON(Jiří "Havro" Vrána) \
 			PERSON(shogun assassin/woky) \
 			PERSON(Superovoce) \
 			PERSON(Tomáš "CZHeron" Volavka) \
 		NL() \
 		FUNCTION(_("Dutch")) \
 			PERSON(Alexander "freefang" van Dam) \
+			PERSON(Contijn "Sojiro84" Buijs) \
 			PERSON(Joeke "Mappack" de Graaf) \
 			PERSON(Jonathan "Jonakeys" van der Steege) \
 			PERSON(PinkRobot) \
 			PERSON(vegiburger) \
 		NL() \
 		FUNCTION(_("English (Australia)")) \
+			PERSON(Matthew "matthewwu2003" Wu) \
 			PERSON(Laurene "sunflowers" Albrand) \
 			PERSON(Stuart "Cefiar" Young) \
 			PERSON(Zac "Mario" Jardine) \
 		NL() \
 		FUNCTION(_("Finnish")) \
-			PERSON(Jonas "PowaTree" Sahlberg) \
+			PERSON(Dr. Jaska) \
+			PERSON(Heidi Wenger) \
 			PERSON(Henry "Exitium" Sanmark) \
+			PERSON(Jaakko Saarikko) \
+			PERSON(Jonas "PowaTree" Sahlberg) \
+			PERSON(LINUX SAUNA) \
+			PERSON(Oftox) \
+			PERSON(Oi Suomi On!) \
 			PERSON(Rasmus "FruitieX" Eskola) \
 		NL() \
 		FUNCTION(_("French")) \
+			PERSON(Gwlanbzh) \
 			PERSON(Hugo "Calinou" Locurcio) \
 			PERSON(Kim "coughingmouse" Lee) \
 			PERSON(Maxime "Taximus" Paradis) \
+			PERSON(Nicolas "signed" Formichella) \
 			PERSON(RedGuff) \
 			PERSON(Thomas "illwieckz" Debesse) \
 			PERSON(Yannick "SpiKe" Le Guen) \
 		NL() \
 		FUNCTION(_("German")) \
-			PERSON(Brot) \
 			PERSON(cvcxc) \
 			PERSON(Erik "Ablu" Schilling) \
 			PERSON(Jope "Sless" Withers) \
+			PERSON(Larson "skps" März) \
 			PERSON(Marvin "Mirio" Beck) \
 			PERSON(Paul "Snapper") \
+			PERSON(Robert "HbmMods" Katzinsky) \
 			PERSON(Rudolf "divVerent" Polzer) \
+			PERSON(TheTrueBrot) \
 			PERSON(Wuzzy) \
 			PERSON(Yepoleb) \
 		NL() \
 		FUNCTION(_("Greek")) \
-			PERSON_("Γιάννης \"Evropi\" Ανθυμίδης") \
+			PERSON_("Γιώργος Καρδάμης") \
+			PERSON(Hector "The_Smasher_1992" Champipis) \
 			PERSON(Konstantinos "LDinos" Mihalenas) \
+			PERSON(MasterWord) \
+			PERSON(Mensious Mensious) \
 			PERSON(Savoritias) \
 			PERSON(Vindex) \
+			PERSON(Yannis "Evropi" Anthymidis) \
 		NL() \
 		FUNCTION(_("Hungarian")) \
+			PERSON(Ács "acszoltan111" Zoltán) \
+			PERSON(MmAaXx500) \
+			PERSON(Peter "fpeterhu" Ferenczy) \
 			PERSON(Ruszkai "CuBe0wL" Ákos) \
 			PERSON(xaN1C4n3) \
 		NL() \
+		FUNCTION(_("Indonesian")) \
+			PERSON(Angeline Meilia) \
+			PERSON(Ariesandy Hidayat) \
+			PERSON(red koala) \
+		NL() \
 		FUNCTION(_("Irish")) \
 			PERSON(Kevin "kscanne" Scannell) \
 		NL() \
 		FUNCTION(_("Italian")) \
 			PERSON(Antonio "terencehill" Piu) \
 			PERSON(Felice "MaidenBeast" Sallustio) \
+			PERSON(Jessica Amoruso) \
 			PERSON(stdi) \
 			PERSON(XCostaX) \
 		NL() \
+		FUNCTION(_("Japanese")) \
+			PERSON(Antoni Das) \
+			PERSON(Lento) \
+			PERSON(Space Ace) \
+			PERSON(RYU "ryusho2523" N.) \
+			PERSON(Victor "LegendGuard" Jaume) \
+			PERSON(z411) \
+		NL() \
 		FUNCTION(_("Kazakh")) \
-			PERSON("Артем "bystrov.arterm" Быстров") \
+			PERSON(Артем "bystrov.arterm" Быстров) \
 		NL() \
 		FUNCTION(_("Korean")) \
-			PERSON(Jisoo "s6e9x" Lim) \
+			PERSON(BYEONGJIN "ahnkoon" AN) \
+			PERSON(Jisoo "LimJiSoo0719" Lim) \
 			PERSON(Kim "coughingmouse" Lee) \
+			PERSON(Seokho Son) \
+		NL() \
+		FUNCTION(_("Latin")) \
+			PERSON(oblector o) \
 		NL() \
 		FUNCTION(_("Polish")) \
 			PERSON(4m) \
 			PERSON(Alex "tiprogrammierer.alex" Progger) \
 			PERSON(Amadeusz "amade/proraide" Sławiński) \
 			PERSON(Artur "artur9010" Motyka) \
+			PERSON(Cris "Kshyso" Sus) \
+			PERSON(Jakub "_Mpcs" Niklas) \
 			PERSON(Jakub "KubeQ11" Pędziszewski) \
-			PERSON(Kriss7475) \
+			PERSON(John "Myran" Smith) \
+			PERSON(Karol "kRkk" Kosek) \
+			PERSON(Kriss "Kriss7475" Chr) \
+			PERSON(Piotr "vipkoza" Kozica) \
+			PERSON(qqiLMFjv1iBfT3p6TNxjUThsaTVIXhQc) \
+			PERSON(Rafał "Okava" Szymański) \
+			PERSON(Robert "Szkodnix" Wolniak) \
+			PERSON(Saikuru "saikuru0" Zero) \
+			PERSON(Sertomas) \
+			PERSON(SFS Atlas) \
+			PERSON(Wojciech "g_host" Sikora) \
 		NL() \
 		FUNCTION(_("Portuguese")) \
 			PERSON(Ivan Paulos "greylica" Tomé) \
 			PERSON(Jean Trindade "Muleke_Trairao" Pereira) \
-			PERSON(Ricardo Manuel "Hellgardia" da Cruz Coelho da Silva) \
+			PERSON(lecalam) \
+			PERSON(NotThatPrivate) \
+			PERSON(Ricardo Manuel "hellgardia" da Cruz Coelho da Silva) \
+			PERSON(Rui "xendez") \
 			PERSON(xXxCHAOTICxXx) \
 		NL() \
+		FUNCTION(_("Portuguese (Brazil)")) \
+			PERSON(Jean Trindade "Muleke_Trairao" Pereira) \
+			PERSON(Rui "xendez") \
+			PERSON(yy0zz) \
+			PERSON(zerowhy) \
+		NL() \
 		FUNCTION(_("Romanian")) \
 			PERSON(Adrian-Ciprian "adrian.tinjala" Tînjală) \
-			PERSON(BusterDBK) \
+			PERSON(busterdbk) \
+			PERSON(Cuzenco "andonis1616" Andrei Robert) \
+			PERSON(Iulian "ElektroBoom" Oancea) \
 			PERSON(Mircea "Taoki" Kitsune) \
 			PERSON(Sorin "unic_sorin" Botirla) \
 			PERSON(Tudor "TropiKo" Ionel) \
@@ -255,14 +356,16 @@
 			PERSON(Alexandr "zrg") \
 			PERSON(Andrei "adem4ik" Stepanov) \
 			PERSON(Andrey "dekrY" P.) \
+			PERSON(Артём "Temak" Котлубай) \
+			PERSON(Artem Vorotnikov) \
+			PERSON(Blueberryy) \
 			PERSON(gravicappa) \
 			PERSON(Hot Dog) \
 			PERSON(Lord Canistra) \
+			PERSON(Morosophos) \
 			PERSON(Nikoli) \
 			PERSON(Sergej "Clearness High" Lutsyk) \
-		NL() \
-		FUNCTION(_("Scottish Gaelic")) \
-			PERSON_("GunChleoc") \
+			PERSON(Simple88) \
 		NL() \
 		FUNCTION(_("Serbian")) \
 			PERSON_("Саша \"salepetronije\" Петровић") \
@@ -273,20 +376,40 @@
 		FUNCTION(_("Spanish")) \
 			PERSON_("0000simon") \
 			PERSON(Alan "aagp" Garcia) \
+			PERSON(Antonio "Antoniosirc" Sirera) \
 			PERSON(Ari_tent) \
 			PERSON(brunodeleo) \
+			PERSON(Damian "starfire24680" Kurek) \
+			PERSON(Excruciatus "crucesignatus" X) \
 			PERSON(Kammy) \
 			PERSON(roader_gentoo) \
 			PERSON(Rodrigo Mouton Laudin) \
 			PERSON(SouL) \
 			PERSON(Starfire24680) \
+			PERSON(Victor "LegendGuard" Jaume) \
+			PERSON(Vitama Piru Leta) \
+			PERSON(Yllelder) \
+			PERSON(z411) \
 		NL() \
 		FUNCTION(_("Swedish")) \
+			PERSON(Gustaf "Hanicef" Alhäll) \
 			PERSON(Karl-Oskar "machine" Rikås) \
 			PERSON(marcus256) \
 		NL() \
+		FUNCTION(_("Turkish")) \
+			PERSON(Abdurrahman "akkus12345" AKKUŞ) \
+			PERSON(Ahmet "ahmetlii") \
+			PERSON(Çağlar "caglarturali" Turalı) \
+			PERSON(Demiray "tulliana" Muhterem) \
+			PERSON(Gokdeniz.Kucukali) \
+			PERSON(ibra kap) \
+			PERSON(Lucifer "Lucifer25x" Morningstar) \
+			PERSON(yutyocraft) \
+		NL() \
 		FUNCTION(_("Ukrainian")) \
 			PERSON(Dmitro "Gamebot" Sokhin) \
+			PERSON(Ihor "uandreew" Andreev) \
+			PERSON(Illia "imbirWIthSugar" Serediuk) \
 			PERSON(Oleh "BlaXpirit" Prypin) \
 			PERSON(Vasyl "Harmata" Melnyk) \
 			PERSON(Yuriy "herrniemand" Ackermann) \
@@ -340,6 +463,7 @@
 		PERSON(Lee David Ash) \
 		PERSON(Lee Vermeulen) \
 		PERSON(leileilol) \
+		PERSON(Lyberta) \
 		PERSON(magorian) \
 		PERSON(Marius "GreEn`mArine" Shekow) \
 		PERSON(Marko "Urre" Permanto) \
@@ -390,27 +514,59 @@
 		PERSON(William Libert) \
 		PERSON(William "Willis" Weilep) \
 		PERSON(Yves "EviLair" Allaire) \
+		PERSON(Zac "Mario" Jardine) \
 		PERSON(Zenex) \
 		PERSON(... and a goat) \
 		/**/
 
-int credits_get()
+
+int CREDITS_TYPE_TITLE = 2;
+int CREDITS_TYPE_FUNCTION = 1;
+int CREDITS_TYPE_PERSON = 0;
+int CREDITS_TYPE_NL = -1;
+void credits_add_line(int fh, int n, int type, string line)
 {
-	int n = buf_create();
-	#define CREDITS_TITLE(t) bufstr_add(n, strcat("**", t), 0);
-	#define CREDITS_FUNCTION(f) bufstr_add(n, strcat("*", f), 0);
-	#define CREDITS_PERSON(p) bufstr_add(n, p, 0);
+	if (type == CREDITS_TYPE_TITLE)
+		line = strcat("**", line);
+	else if (type == CREDITS_TYPE_FUNCTION)
+		line = strcat("*", line);
+
+	if (fh >= 0)
+		fputs(fh, strcat(line, "\n"));
+	if (n >= 0)
+		bufstr_add(n, line, 0);
+}
+
+void credits_build(int fh, int n)
+{
+	#define CREDITS_TITLE(t) credits_add_line(fh, n, CREDITS_TYPE_TITLE, t);
+	#define CREDITS_FUNCTION(f) credits_add_line(fh, n, CREDITS_TYPE_FUNCTION, f);
+	#define CREDITS_PERSON(p) credits_add_line(fh, n, CREDITS_TYPE_PERSON, p);
 	#define _CREDITS_PERSON(p) CREDITS_PERSON(#p)
-	#define CREDITS_NL() bufstr_add(n, "", 0);
-    CREDITS(CREDITS_TITLE, CREDITS_FUNCTION, _CREDITS_PERSON, CREDITS_PERSON, CREDITS_NL)
+	#define CREDITS_NL() credits_add_line(fh, n, CREDITS_TYPE_NL, "");
+	CREDITS(CREDITS_TITLE, CREDITS_FUNCTION, _CREDITS_PERSON, CREDITS_PERSON, CREDITS_NL)
 	#undef CREDITS_TITLE
 	#undef CREDITS_FUNCTION
 	#undef CREDITS_PERSON
 	#undef _CREDITS_PERSON
 	#undef CREDITS_NL
+}
+
+int credits_get()
+{
+	int n = buf_create();
+	credits_build(-1, n);
 	return n;
 }
 
+void credits_export()
+{
+	int fh = fopen("credits.txt", FILE_WRITE);
+	if(fh < 0)
+		return;
+	credits_build(fh, -1);
+}
+
 #undef CREDITS
 
 entity makeXonoticCreditsList()
@@ -423,8 +579,13 @@ entity makeXonoticCreditsList()
 void XonoticCreditsList_configureXonoticCreditsList(entity me)
 {
 	me.configureXonoticListBox(me);
-    me.bufferIndex = credits_get();
+	me.bufferIndex = credits_get();
 	me.nItems = buf_getsize(me.bufferIndex);
+	if (cvar("_menu_credits_export")) // set by the menu_credits_export alias
+	{
+		credits_export();
+		cvar_set("_menu_credits_export", "0");
+	}
 }
 void XonoticCreditsList_destroy(entity me)
 {