From ea02e878227f13bc2fc13a82532a979896bb992c Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 3 Nov 2010 07:45:03 +0100 Subject: [PATCH] mark "pure" servers as such in the menu --- defaultXonotic.cfg | 3 ++ gfx/menu/default/icon_aeslevel0.tga | Bin 0 -> 204 bytes gfx/menu/default/icon_aeslevel1.tga | Bin 0 -> 1828 bytes gfx/menu/default/icon_aeslevel2.tga | Bin 0 -> 1828 bytes gfx/menu/default/icon_aeslevel3.tga | Bin 0 -> 1828 bytes gfx/menu/default/icon_aeslevel4.tga | Bin 0 -> 1828 bytes gfx/menu/default/icon_aeslevel5.tga | Bin 0 -> 1918 bytes gfx/menu/default/icon_pure0.tga | Bin 0 -> 204 bytes gfx/menu/default/icon_pure1.tga | Bin 0 -> 4114 bytes gfx/menu/luminos/icon_aeslevel0.tga | Bin 0 -> 204 bytes gfx/menu/luminos/icon_aeslevel1.tga | Bin 0 -> 1828 bytes gfx/menu/luminos/icon_aeslevel2.tga | Bin 0 -> 1828 bytes gfx/menu/luminos/icon_aeslevel3.tga | Bin 0 -> 1828 bytes gfx/menu/luminos/icon_aeslevel4.tga | Bin 0 -> 1828 bytes gfx/menu/luminos/icon_aeslevel5.tga | Bin 0 -> 1918 bytes gfx/menu/luminos/icon_pure0.tga | Bin 0 -> 204 bytes gfx/menu/luminos/icon_pure1.tga | Bin 0 -> 4114 bytes gfx/menu/xaw/icon_aeslevel0.tga | Bin 0 -> 204 bytes gfx/menu/xaw/icon_aeslevel1.tga | Bin 0 -> 1828 bytes gfx/menu/xaw/icon_aeslevel2.tga | Bin 0 -> 1828 bytes gfx/menu/xaw/icon_aeslevel3.tga | Bin 0 -> 1828 bytes gfx/menu/xaw/icon_aeslevel4.tga | Bin 0 -> 1828 bytes gfx/menu/xaw/icon_aeslevel5.tga | Bin 0 -> 1918 bytes gfx/menu/xaw/icon_pure0.tga | Bin 0 -> 204 bytes gfx/menu/xaw/icon_pure1.tga | Bin 0 -> 4114 bytes .../dialog_multiplayer_join_serverinfo.c | 35 ++++++++++--- qcsrc/menu/xonotic/serverlist.c | 47 ++++++++++++++++-- qcsrc/server/g_world.qc | 6 +++ qcsrc/server/scores.qc | 3 +- 29 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 gfx/menu/default/icon_aeslevel0.tga create mode 100644 gfx/menu/default/icon_aeslevel1.tga create mode 100644 gfx/menu/default/icon_aeslevel2.tga create mode 100644 gfx/menu/default/icon_aeslevel3.tga create mode 100644 gfx/menu/default/icon_aeslevel4.tga create mode 100644 gfx/menu/default/icon_aeslevel5.tga create mode 100644 gfx/menu/default/icon_pure0.tga create mode 100644 gfx/menu/default/icon_pure1.tga create mode 100644 gfx/menu/luminos/icon_aeslevel0.tga create mode 100644 gfx/menu/luminos/icon_aeslevel1.tga create mode 100644 gfx/menu/luminos/icon_aeslevel2.tga create mode 100644 gfx/menu/luminos/icon_aeslevel3.tga create mode 100644 gfx/menu/luminos/icon_aeslevel4.tga create mode 100644 gfx/menu/luminos/icon_aeslevel5.tga create mode 100644 gfx/menu/luminos/icon_pure0.tga create mode 100644 gfx/menu/luminos/icon_pure1.tga create mode 100644 gfx/menu/xaw/icon_aeslevel0.tga create mode 100644 gfx/menu/xaw/icon_aeslevel1.tga create mode 100644 gfx/menu/xaw/icon_aeslevel2.tga create mode 100644 gfx/menu/xaw/icon_aeslevel3.tga create mode 100644 gfx/menu/xaw/icon_aeslevel4.tga create mode 100644 gfx/menu/xaw/icon_aeslevel5.tga create mode 100644 gfx/menu/xaw/icon_pure0.tga create mode 100644 gfx/menu/xaw/icon_pure1.tga diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 9513dfcc4..25cf9fa29 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1341,6 +1341,9 @@ alias _userbind_call "${$1}" alias +userbind "_userbind_call userbind${1}_press" alias -userbind "_userbind_call userbind${1}_release" +// we must change its default from 1.0 to 1 to be consistent with menuqc +seta slowmo 1 + seta menu_skin "luminos" set menu_slowmo 1 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds" diff --git a/gfx/menu/default/icon_aeslevel0.tga b/gfx/menu/default/icon_aeslevel0.tga new file mode 100644 index 0000000000000000000000000000000000000000..5c9e66ac67365efd20214940b9607defc03acc51 GIT binary patch literal 204 tcmZQz;9`IQ1qLAGn1ANX8HPbjz+4*=6zUr08SLrrryJqs>Eo)$007GcWxfCa literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_aeslevel1.tga b/gfx/menu/default/icon_aeslevel1.tga new file mode 100644 index 0000000000000000000000000000000000000000..f1e92735a1a3ccbf89702b8dc97b3877890324b7 GIT binary patch literal 1828 zcmeH|&u-d45XNmVVD}gadIXdhxU_dTz$ulGqE_lZwUu({10)I$fV!e7N-IE0sVZ^G z6}Z4lzyWxu&Tnd);9BVew4hz@%zpFj?(8?VWj(UOU&)fcdx!a%?x!^Sno*C=mgY!1 z`r$ZE0qY2lLKTq0mCNNml*{Fd@6~GcGA*M^JOS8NoOWq(TI`yR`x1(m7^K!;QOcz+ z2iE6xQFw?{;So~K5Y>5n`4};&uhnV?@E`@gESdpsL!6PM_{>0v`TssAT?e50J+Q4>KURVj_ry0T7J)1;T@(kn=DExlJY$gDt7*T$3-C z5gukhK#onMkaBsyiIqJorX%gd_x%p#u-R;)-S;_pHr!p9f*@HZMC#RQmk~33KYxM< z{c@;2aal%q5MI0p4oS2Kc+s;?y>RjOPbLT? x7smlY1>G0Jx}l3cTv++&!}XOp{n}}V#qagYH>Ypgui7u3KY918eRlfP`UQ6N=1%|s literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_aeslevel2.tga b/gfx/menu/default/icon_aeslevel2.tga new file mode 100644 index 0000000000000000000000000000000000000000..7153820cd52c84b153d486e868b239f2508e678f GIT binary patch literal 1828 zcmeHI%}$d+6g{>5zW%st(z2k7HbN*SDs3WffZD`B;tx?17CZnA-Ql7-0sMllfRJw4 z!a{+<9uO2Y%FAO=1KcoII{ONx+bg@M)S5|*Pd6ct2PX_?CP`NTrRoaSJ~?cEbvxMk z=8{@0{&5OF1-GSd_oN52_xbj|=qX({dLe*k=1|J^K|nl#oWjSmuu^-}7YY(@$t z?WH(PDIPoQojDx-B+a@1?VPzS#b&_X@QjIXVr+!gmk6YCcG+G4j+H@b|2~FVQ+Wc z6!>IKDAKOh46~*8nMLvX_${_cB>D4Dk%}qw386>A(+eIu<{*hL0uf2(wTEqGB~n~y z`H@F6`YVY2Qw);mNRnxR?H0o9lHgW7fd$H=8ILeQM;u^FM%pt1jS3nW;5|Fo?-_OU XdG_S_++yQtV`2WziwBLzb9Zq8YKDf{ literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_aeslevel3.tga b/gfx/menu/default/icon_aeslevel3.tga new file mode 100644 index 0000000000000000000000000000000000000000..c31bfe802e988d94d72b84ceeae36a4fb5ef9d3c GIT binary patch literal 1828 zcmeH|&u$V?6vk(O!i+BggukKIJuF~VDv8>}fAM*+PO1TtiZNm37T7@4RhK5P0A9eh ziZT+?0#83n5#&rksR{N(Jw%B3#{*5`Gx|5tc`lrvm~&m@sSg>Mm)`eLydycR+!Xvm^2a2sM* zlF}eKAa*HYLri{ch|_Yn-EP-RCKJ85N~N-LUH1o6GJntn$hm~v5`x@%y`I6B120cFwS&b7Gax|X6Dg$GfLPh%;zE9u%jK4o!)!JScJFcW zxW79;1#7)LCQ`3fyFGEWC`97FAVR+!$|Ek0#R!+QT?BVYvl_j_}RgmdgICABkMN-Nmcv+ literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_aeslevel4.tga b/gfx/menu/default/icon_aeslevel4.tga new file mode 100644 index 0000000000000000000000000000000000000000..88963f8d840f66bb06b9fcb7a7c378e124a4e238 GIT binary patch literal 1828 zcmeHI%We}v5G-SM{ooVggDqPk*~DO5f#6Bec39uzHRP}n}M=anDYfXEmr@N=8r)mbsBl(KpFT1bdrbL@9wWZ#MM2aoL zR@no*C5#-8AMFI@G)$8mG+8M4GAqh4~Y--a71jal6?4 z>e6T(IdkF?w7BF@s&!~$Po|6mvw|F=7CTfSMaH$7wECE72eFUz1LL;eVJ*H3YKePHg&quq75 z)f}K$JBz@R%At7kY^FtF{?zCcGi{6uIR;nOWwyKKKIDY4p;+qy=_cnEpHT!#<#$#i z8XMW;a*RP}nqmrS%Lht7q2sib#j?vm>+8B${G<7}W%sWGllY~^WFBz|LN1z99w`N8 z(b6HS-m^?+AYzoU>dTB7SZDk6gTt%u@xe910sL#9EEK#duQG3m)?U>#nvsQ$SRV2m zL&s==WTO@M`C~NJ`sO0oZGLnN(MPe~+tR(3RnIhc{T{M@n3jXj<@N~0O&9Md8bv4d@i3eYR;qs&Ke%M^EK3)m$EZ@K{^vm{l literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_aeslevel5.tga b/gfx/menu/default/icon_aeslevel5.tga new file mode 100644 index 0000000000000000000000000000000000000000..0ed332d8ac546d2880554d9915076650c6b55d84 GIT binary patch literal 1918 zcmds2OKuZE5G^yz*kg_mFUGPZl1U7 zpk>j@yCUuaM`dc%R1L0RSdy%ND24Fkr4(x&M`q^Q&>RhoGis;8fhv^3?1?nr8QK19 zc4X&^ain=*6oe&UaRE@QwrMPT0|53606=jm#&iiFCV-2ZXa5HD|KH&z4}v9T^l<*< zH2*gAlNQ|?1Af8s)819~v>>OJAnAf4pZhA!eIvVVBX7RLjj{i&w%H;!C+JPiC@sLF zi*=oYQ_w7bAT!rb<@Rb{;f$lzF>6D5XMa=vnVmRj6K7DWG^*4KP^{6l2 zwU6pb+zRd~cLCOJMKzqE1&^2rB2(2dS|HhIS-kwQ)K_{6VcD&JFmTb6pw`{sjhSOl zHJqUZofARiurk!K3J)qeUq)4QWgB#O`{O+Nm^=5*qf1g?leI#m9<2%&LraP$`vY~v z^2erd1q|Rs69Nqjk8eY2o8wL_3CJ#%d2PAJti;55njdO7!$*d%(r`=TPLg5|F})<7 ze@t^_kE=jxIK!ANEwV8>vPF?Ri6xFgj>wzra|qFQR0T);9^8Al_$ay`HC8K+m!dn1 GH{>VUU?6t@ literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_pure0.tga b/gfx/menu/default/icon_pure0.tga new file mode 100644 index 0000000000000000000000000000000000000000..5c9e66ac67365efd20214940b9607defc03acc51 GIT binary patch literal 204 tcmZQz;9`IQ1qLAGn1ANX8HPbjz+4*=6zUr08SLrrryJqs>Eo)$007GcWxfCa literal 0 HcmV?d00001 diff --git a/gfx/menu/default/icon_pure1.tga b/gfx/menu/default/icon_pure1.tga new file mode 100644 index 0000000000000000000000000000000000000000..183ec93ebcf0bcf14befdfb789e63a81692ba6b2 GIT binary patch literal 4114 zcmcJSdr(u^9mfxWkOv_WAP)iojB8 z>g-aiGZm>$DvuP$t*cdQ-BnkeYHN3$+_pA z-{*7gx#ym9FCiS__zNcNpYJ%D?YF(1aIA&^LBGl0r*DH_kj*63*-B(f`b_d71j?wx zIkZ7rTnKi z&=xt!1!FF*nQgi%@&+#epR#3c4hCnVMAsV^%8KV#s1C9?W*YfF$Bsp z&m#x9V1NZC*st=U9_MWZYR@xfMc!vSlJ4#=PqC}Kxl|!`ofcWqGFoFXJ>`fa?Ff`n zH?tjb!2k8!!=2&4Sq)#G_9El*FfTreCwu;GAf>T_|PJtzGZHqUpY4yOe3 zX;Ki6W-suh{Vh4;k?EU8+$3?7aQ(hhxOpegsEo}cV1NZC*l@rFr(@3bmB~Y{)<@lJ zUKv6&Liu#H){9(zoY3oKfy88V@Tcahqccdh~d0yDEJaJE-aNNjbBFm2CYTqSx+_)$*7gIzn(Y_pJrMb!1Drn10%-A3aeLWRWCpTIsX= zr(eofoE+w-?*3Y!?-&(po2ZAnlDTzGgPkAe=<4>6_x;J2y8R38nP8)Og zo8+smx1~Kp-QA9~$5x~AjflmiK15TOC(1l<-*?fG2}#BQyR6_e6@-;hB1~`^9Is63 zm3{Q@BxYMSNquH9wR((fJP1r||7-bv~rPN&2p#c7D5>+GIchi|ZFCX?MeugUrAxB+ZTz=i`Z zIN?6a)`8#eNqf|`DhPYT*Qd;i;1?bH8;8K18MH@VUAZ0^RhWOONcb}c1dpc zS1fNE8;fY7X^{}pKKU*LHXLxl33uN{|A1R<`un>K3+VmM+Z=tiPW+pv+CYgYbJpOgimC6S_eXtmyC3qB+Zsr6l^9I0;eZQHxPMlx^!?@A5yw8< zx|rTNWEdVa$#blRh3+rLV6wpaAGyVc^<$kP@7SLu+GacPTuhxs_{MWozU-q3`O>4$ zlm$JHJoFuVF$Q3Q4F_Cs!hNnPjMrDHSaI`+<;jJEw3TU$!vtCP|9Eq*Bq@4TQ`Xl?*wnbOjvl94<_Z0NOoy66Kxg|DipZ{jhH_UDKOaCEN z7oVYC3u`D5FQ@Y&x6iB0bs=F@Jfdq-5?yr$KlR;?h~nP+9{Sc^)#|P*foqQaMwr^x&W+oo*|T1)IbWw8 z0vnD#=5k!S1Bdlt$l@D!ZFlykk1ia3YOCTluj;ci7QQzISPpW* z01Hff53%+y?F~~IxG$J{Hj^yoAQud< zz?^x{r+R0W+p~z9)htyEnq+G(HfXz_zc;`BJL)#B-K0qRq)yw7Trj|z$)C&dEo)$007GcWxfCa literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_aeslevel1.tga b/gfx/menu/luminos/icon_aeslevel1.tga new file mode 100644 index 0000000000000000000000000000000000000000..f1e92735a1a3ccbf89702b8dc97b3877890324b7 GIT binary patch literal 1828 zcmeH|&u-d45XNmVVD}gadIXdhxU_dTz$ulGqE_lZwUu({10)I$fV!e7N-IE0sVZ^G z6}Z4lzyWxu&Tnd);9BVew4hz@%zpFj?(8?VWj(UOU&)fcdx!a%?x!^Sno*C=mgY!1 z`r$ZE0qY2lLKTq0mCNNml*{Fd@6~GcGA*M^JOS8NoOWq(TI`yR`x1(m7^K!;QOcz+ z2iE6xQFw?{;So~K5Y>5n`4};&uhnV?@E`@gESdpsL!6PM_{>0v`TssAT?e50J+Q4>KURVj_ry0T7J)1;T@(kn=DExlJY$gDt7*T$3-C z5gukhK#onMkaBsyiIqJorX%gd_x%p#u-R;)-S;_pHr!p9f*@HZMC#RQmk~33KYxM< z{c@;2aal%q5MI0p4oS2Kc+s;?y>RjOPbLT? x7smlY1>G0Jx}l3cTv++&!}XOp{n}}V#qagYH>Ypgui7u3KY918eRlfP`UQ6N=1%|s literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_aeslevel2.tga b/gfx/menu/luminos/icon_aeslevel2.tga new file mode 100644 index 0000000000000000000000000000000000000000..7153820cd52c84b153d486e868b239f2508e678f GIT binary patch literal 1828 zcmeHI%}$d+6g{>5zW%st(z2k7HbN*SDs3WffZD`B;tx?17CZnA-Ql7-0sMllfRJw4 z!a{+<9uO2Y%FAO=1KcoII{ONx+bg@M)S5|*Pd6ct2PX_?CP`NTrRoaSJ~?cEbvxMk z=8{@0{&5OF1-GSd_oN52_xbj|=qX({dLe*k=1|J^K|nl#oWjSmuu^-}7YY(@$t z?WH(PDIPoQojDx-B+a@1?VPzS#b&_X@QjIXVr+!gmk6YCcG+G4j+H@b|2~FVQ+Wc z6!>IKDAKOh46~*8nMLvX_${_cB>D4Dk%}qw386>A(+eIu<{*hL0uf2(wTEqGB~n~y z`H@F6`YVY2Qw);mNRnxR?H0o9lHgW7fd$H=8ILeQM;u^FM%pt1jS3nW;5|Fo?-_OU XdG_S_++yQtV`2WziwBLzb9Zq8YKDf{ literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_aeslevel3.tga b/gfx/menu/luminos/icon_aeslevel3.tga new file mode 100644 index 0000000000000000000000000000000000000000..c31bfe802e988d94d72b84ceeae36a4fb5ef9d3c GIT binary patch literal 1828 zcmeH|&u$V?6vk(O!i+BggukKIJuF~VDv8>}fAM*+PO1TtiZNm37T7@4RhK5P0A9eh ziZT+?0#83n5#&rksR{N(Jw%B3#{*5`Gx|5tc`lrvm~&m@sSg>Mm)`eLydycR+!Xvm^2a2sM* zlF}eKAa*HYLri{ch|_Yn-EP-RCKJ85N~N-LUH1o6GJntn$hm~v5`x@%y`I6B120cFwS&b7Gax|X6Dg$GfLPh%;zE9u%jK4o!)!JScJFcW zxW79;1#7)LCQ`3fyFGEWC`97FAVR+!$|Ek0#R!+QT?BVYvl_j_}RgmdgICABkMN-Nmcv+ literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_aeslevel4.tga b/gfx/menu/luminos/icon_aeslevel4.tga new file mode 100644 index 0000000000000000000000000000000000000000..88963f8d840f66bb06b9fcb7a7c378e124a4e238 GIT binary patch literal 1828 zcmeHI%We}v5G-SM{ooVggDqPk*~DO5f#6Bec39uzHRP}n}M=anDYfXEmr@N=8r)mbsBl(KpFT1bdrbL@9wWZ#MM2aoL zR@no*C5#-8AMFI@G)$8mG+8M4GAqh4~Y--a71jal6?4 z>e6T(IdkF?w7BF@s&!~$Po|6mvw|F=7CTfSMaH$7wECE72eFUz1LL;eVJ*H3YKePHg&quq75 z)f}K$JBz@R%At7kY^FtF{?zCcGi{6uIR;nOWwyKKKIDY4p;+qy=_cnEpHT!#<#$#i z8XMW;a*RP}nqmrS%Lht7q2sib#j?vm>+8B${G<7}W%sWGllY~^WFBz|LN1z99w`N8 z(b6HS-m^?+AYzoU>dTB7SZDk6gTt%u@xe910sL#9EEK#duQG3m)?U>#nvsQ$SRV2m zL&s==WTO@M`C~NJ`sO0oZGLnN(MPe~+tR(3RnIhc{T{M@n3jXj<@N~0O&9Md8bv4d@i3eYR;qs&Ke%M^EK3)m$EZ@K{^vm{l literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_aeslevel5.tga b/gfx/menu/luminos/icon_aeslevel5.tga new file mode 100644 index 0000000000000000000000000000000000000000..0ed332d8ac546d2880554d9915076650c6b55d84 GIT binary patch literal 1918 zcmds2OKuZE5G^yz*kg_mFUGPZl1U7 zpk>j@yCUuaM`dc%R1L0RSdy%ND24Fkr4(x&M`q^Q&>RhoGis;8fhv^3?1?nr8QK19 zc4X&^ain=*6oe&UaRE@QwrMPT0|53606=jm#&iiFCV-2ZXa5HD|KH&z4}v9T^l<*< zH2*gAlNQ|?1Af8s)819~v>>OJAnAf4pZhA!eIvVVBX7RLjj{i&w%H;!C+JPiC@sLF zi*=oYQ_w7bAT!rb<@Rb{;f$lzF>6D5XMa=vnVmRj6K7DWG^*4KP^{6l2 zwU6pb+zRd~cLCOJMKzqE1&^2rB2(2dS|HhIS-kwQ)K_{6VcD&JFmTb6pw`{sjhSOl zHJqUZofARiurk!K3J)qeUq)4QWgB#O`{O+Nm^=5*qf1g?leI#m9<2%&LraP$`vY~v z^2erd1q|Rs69Nqjk8eY2o8wL_3CJ#%d2PAJti;55njdO7!$*d%(r`=TPLg5|F})<7 ze@t^_kE=jxIK!ANEwV8>vPF?Ri6xFgj>wzra|qFQR0T);9^8Al_$ay`HC8K+m!dn1 GH{>VUU?6t@ literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_pure0.tga b/gfx/menu/luminos/icon_pure0.tga new file mode 100644 index 0000000000000000000000000000000000000000..5c9e66ac67365efd20214940b9607defc03acc51 GIT binary patch literal 204 tcmZQz;9`IQ1qLAGn1ANX8HPbjz+4*=6zUr08SLrrryJqs>Eo)$007GcWxfCa literal 0 HcmV?d00001 diff --git a/gfx/menu/luminos/icon_pure1.tga b/gfx/menu/luminos/icon_pure1.tga new file mode 100644 index 0000000000000000000000000000000000000000..183ec93ebcf0bcf14befdfb789e63a81692ba6b2 GIT binary patch literal 4114 zcmcJSdr(u^9mfxWkOv_WAP)iojB8 z>g-aiGZm>$DvuP$t*cdQ-BnkeYHN3$+_pA z-{*7gx#ym9FCiS__zNcNpYJ%D?YF(1aIA&^LBGl0r*DH_kj*63*-B(f`b_d71j?wx zIkZ7rTnKi z&=xt!1!FF*nQgi%@&+#epR#3c4hCnVMAsV^%8KV#s1C9?W*YfF$Bsp z&m#x9V1NZC*st=U9_MWZYR@xfMc!vSlJ4#=PqC}Kxl|!`ofcWqGFoFXJ>`fa?Ff`n zH?tjb!2k8!!=2&4Sq)#G_9El*FfTreCwu;GAf>T_|PJtzGZHqUpY4yOe3 zX;Ki6W-suh{Vh4;k?EU8+$3?7aQ(hhxOpegsEo}cV1NZC*l@rFr(@3bmB~Y{)<@lJ zUKv6&Liu#H){9(zoY3oKfy88V@Tcahqccdh~d0yDEJaJE-aNNjbBFm2CYTqSx+_)$*7gIzn(Y_pJrMb!1Drn10%-A3aeLWRWCpTIsX= zr(eofoE+w-?*3Y!?-&(po2ZAnlDTzGgPkAe=<4>6_x;J2y8R38nP8)Og zo8+smx1~Kp-QA9~$5x~AjflmiK15TOC(1l<-*?fG2}#BQyR6_e6@-;hB1~`^9Is63 zm3{Q@BxYMSNquH9wR((fJP1r||7-bv~rPN&2p#c7D5>+GIchi|ZFCX?MeugUrAxB+ZTz=i`Z zIN?6a)`8#eNqf|`DhPYT*Qd;i;1?bH8;8K18MH@VUAZ0^RhWOONcb}c1dpc zS1fNE8;fY7X^{}pKKU*LHXLxl33uN{|A1R<`un>K3+VmM+Z=tiPW+pv+CYgYbJpOgimC6S_eXtmyC3qB+Zsr6l^9I0;eZQHxPMlx^!?@A5yw8< zx|rTNWEdVa$#blRh3+rLV6wpaAGyVc^<$kP@7SLu+GacPTuhxs_{MWozU-q3`O>4$ zlm$JHJoFuVF$Q3Q4F_Cs!hNnPjMrDHSaI`+<;jJEw3TU$!vtCP|9Eq*Bq@4TQ`Xl?*wnbOjvl94<_Z0NOoy66Kxg|DipZ{jhH_UDKOaCEN z7oVYC3u`D5FQ@Y&x6iB0bs=F@Jfdq-5?yr$KlR;?h~nP+9{Sc^)#|P*foqQaMwr^x&W+oo*|T1)IbWw8 z0vnD#=5k!S1Bdlt$l@D!ZFlykk1ia3YOCTluj;ci7QQzISPpW* z01Hff53%+y?F~~IxG$J{Hj^yoAQud< zz?^x{r+R0W+p~z9)htyEnq+G(HfXz_zc;`BJL)#B-K0qRq)yw7Trj|z$)C&dEo)$007GcWxfCa literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_aeslevel1.tga b/gfx/menu/xaw/icon_aeslevel1.tga new file mode 100644 index 0000000000000000000000000000000000000000..f1e92735a1a3ccbf89702b8dc97b3877890324b7 GIT binary patch literal 1828 zcmeH|&u-d45XNmVVD}gadIXdhxU_dTz$ulGqE_lZwUu({10)I$fV!e7N-IE0sVZ^G z6}Z4lzyWxu&Tnd);9BVew4hz@%zpFj?(8?VWj(UOU&)fcdx!a%?x!^Sno*C=mgY!1 z`r$ZE0qY2lLKTq0mCNNml*{Fd@6~GcGA*M^JOS8NoOWq(TI`yR`x1(m7^K!;QOcz+ z2iE6xQFw?{;So~K5Y>5n`4};&uhnV?@E`@gESdpsL!6PM_{>0v`TssAT?e50J+Q4>KURVj_ry0T7J)1;T@(kn=DExlJY$gDt7*T$3-C z5gukhK#onMkaBsyiIqJorX%gd_x%p#u-R;)-S;_pHr!p9f*@HZMC#RQmk~33KYxM< z{c@;2aal%q5MI0p4oS2Kc+s;?y>RjOPbLT? x7smlY1>G0Jx}l3cTv++&!}XOp{n}}V#qagYH>Ypgui7u3KY918eRlfP`UQ6N=1%|s literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_aeslevel2.tga b/gfx/menu/xaw/icon_aeslevel2.tga new file mode 100644 index 0000000000000000000000000000000000000000..7153820cd52c84b153d486e868b239f2508e678f GIT binary patch literal 1828 zcmeHI%}$d+6g{>5zW%st(z2k7HbN*SDs3WffZD`B;tx?17CZnA-Ql7-0sMllfRJw4 z!a{+<9uO2Y%FAO=1KcoII{ONx+bg@M)S5|*Pd6ct2PX_?CP`NTrRoaSJ~?cEbvxMk z=8{@0{&5OF1-GSd_oN52_xbj|=qX({dLe*k=1|J^K|nl#oWjSmuu^-}7YY(@$t z?WH(PDIPoQojDx-B+a@1?VPzS#b&_X@QjIXVr+!gmk6YCcG+G4j+H@b|2~FVQ+Wc z6!>IKDAKOh46~*8nMLvX_${_cB>D4Dk%}qw386>A(+eIu<{*hL0uf2(wTEqGB~n~y z`H@F6`YVY2Qw);mNRnxR?H0o9lHgW7fd$H=8ILeQM;u^FM%pt1jS3nW;5|Fo?-_OU XdG_S_++yQtV`2WziwBLzb9Zq8YKDf{ literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_aeslevel3.tga b/gfx/menu/xaw/icon_aeslevel3.tga new file mode 100644 index 0000000000000000000000000000000000000000..c31bfe802e988d94d72b84ceeae36a4fb5ef9d3c GIT binary patch literal 1828 zcmeH|&u$V?6vk(O!i+BggukKIJuF~VDv8>}fAM*+PO1TtiZNm37T7@4RhK5P0A9eh ziZT+?0#83n5#&rksR{N(Jw%B3#{*5`Gx|5tc`lrvm~&m@sSg>Mm)`eLydycR+!Xvm^2a2sM* zlF}eKAa*HYLri{ch|_Yn-EP-RCKJ85N~N-LUH1o6GJntn$hm~v5`x@%y`I6B120cFwS&b7Gax|X6Dg$GfLPh%;zE9u%jK4o!)!JScJFcW zxW79;1#7)LCQ`3fyFGEWC`97FAVR+!$|Ek0#R!+QT?BVYvl_j_}RgmdgICABkMN-Nmcv+ literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_aeslevel4.tga b/gfx/menu/xaw/icon_aeslevel4.tga new file mode 100644 index 0000000000000000000000000000000000000000..88963f8d840f66bb06b9fcb7a7c378e124a4e238 GIT binary patch literal 1828 zcmeHI%We}v5G-SM{ooVggDqPk*~DO5f#6Bec39uzHRP}n}M=anDYfXEmr@N=8r)mbsBl(KpFT1bdrbL@9wWZ#MM2aoL zR@no*C5#-8AMFI@G)$8mG+8M4GAqh4~Y--a71jal6?4 z>e6T(IdkF?w7BF@s&!~$Po|6mvw|F=7CTfSMaH$7wECE72eFUz1LL;eVJ*H3YKePHg&quq75 z)f}K$JBz@R%At7kY^FtF{?zCcGi{6uIR;nOWwyKKKIDY4p;+qy=_cnEpHT!#<#$#i z8XMW;a*RP}nqmrS%Lht7q2sib#j?vm>+8B${G<7}W%sWGllY~^WFBz|LN1z99w`N8 z(b6HS-m^?+AYzoU>dTB7SZDk6gTt%u@xe910sL#9EEK#duQG3m)?U>#nvsQ$SRV2m zL&s==WTO@M`C~NJ`sO0oZGLnN(MPe~+tR(3RnIhc{T{M@n3jXj<@N~0O&9Md8bv4d@i3eYR;qs&Ke%M^EK3)m$EZ@K{^vm{l literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_aeslevel5.tga b/gfx/menu/xaw/icon_aeslevel5.tga new file mode 100644 index 0000000000000000000000000000000000000000..0ed332d8ac546d2880554d9915076650c6b55d84 GIT binary patch literal 1918 zcmds2OKuZE5G^yz*kg_mFUGPZl1U7 zpk>j@yCUuaM`dc%R1L0RSdy%ND24Fkr4(x&M`q^Q&>RhoGis;8fhv^3?1?nr8QK19 zc4X&^ain=*6oe&UaRE@QwrMPT0|53606=jm#&iiFCV-2ZXa5HD|KH&z4}v9T^l<*< zH2*gAlNQ|?1Af8s)819~v>>OJAnAf4pZhA!eIvVVBX7RLjj{i&w%H;!C+JPiC@sLF zi*=oYQ_w7bAT!rb<@Rb{;f$lzF>6D5XMa=vnVmRj6K7DWG^*4KP^{6l2 zwU6pb+zRd~cLCOJMKzqE1&^2rB2(2dS|HhIS-kwQ)K_{6VcD&JFmTb6pw`{sjhSOl zHJqUZofARiurk!K3J)qeUq)4QWgB#O`{O+Nm^=5*qf1g?leI#m9<2%&LraP$`vY~v z^2erd1q|Rs69Nqjk8eY2o8wL_3CJ#%d2PAJti;55njdO7!$*d%(r`=TPLg5|F})<7 ze@t^_kE=jxIK!ANEwV8>vPF?Ri6xFgj>wzra|qFQR0T);9^8Al_$ay`HC8K+m!dn1 GH{>VUU?6t@ literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_pure0.tga b/gfx/menu/xaw/icon_pure0.tga new file mode 100644 index 0000000000000000000000000000000000000000..5c9e66ac67365efd20214940b9607defc03acc51 GIT binary patch literal 204 tcmZQz;9`IQ1qLAGn1ANX8HPbjz+4*=6zUr08SLrrryJqs>Eo)$007GcWxfCa literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/icon_pure1.tga b/gfx/menu/xaw/icon_pure1.tga new file mode 100644 index 0000000000000000000000000000000000000000..183ec93ebcf0bcf14befdfb789e63a81692ba6b2 GIT binary patch literal 4114 zcmcJSdr(u^9mfxWkOv_WAP)iojB8 z>g-aiGZm>$DvuP$t*cdQ-BnkeYHN3$+_pA z-{*7gx#ym9FCiS__zNcNpYJ%D?YF(1aIA&^LBGl0r*DH_kj*63*-B(f`b_d71j?wx zIkZ7rTnKi z&=xt!1!FF*nQgi%@&+#epR#3c4hCnVMAsV^%8KV#s1C9?W*YfF$Bsp z&m#x9V1NZC*st=U9_MWZYR@xfMc!vSlJ4#=PqC}Kxl|!`ofcWqGFoFXJ>`fa?Ff`n zH?tjb!2k8!!=2&4Sq)#G_9El*FfTreCwu;GAf>T_|PJtzGZHqUpY4yOe3 zX;Ki6W-suh{Vh4;k?EU8+$3?7aQ(hhxOpegsEo}cV1NZC*l@rFr(@3bmB~Y{)<@lJ zUKv6&Liu#H){9(zoY3oKfy88V@Tcahqccdh~d0yDEJaJE-aNNjbBFm2CYTqSx+_)$*7gIzn(Y_pJrMb!1Drn10%-A3aeLWRWCpTIsX= zr(eofoE+w-?*3Y!?-&(po2ZAnlDTzGgPkAe=<4>6_x;J2y8R38nP8)Og zo8+smx1~Kp-QA9~$5x~AjflmiK15TOC(1l<-*?fG2}#BQyR6_e6@-;hB1~`^9Is63 zm3{Q@BxYMSNquH9wR((fJP1r||7-bv~rPN&2p#c7D5>+GIchi|ZFCX?MeugUrAxB+ZTz=i`Z zIN?6a)`8#eNqf|`DhPYT*Qd;i;1?bH8;8K18MH@VUAZ0^RhWOONcb}c1dpc zS1fNE8;fY7X^{}pKKU*LHXLxl33uN{|A1R<`un>K3+VmM+Z=tiPW+pv+CYgYbJpOgimC6S_eXtmyC3qB+Zsr6l^9I0;eZQHxPMlx^!?@A5yw8< zx|rTNWEdVa$#blRh3+rLV6wpaAGyVc^<$kP@7SLu+GacPTuhxs_{MWozU-q3`O>4$ zlm$JHJoFuVF$Q3Q4F_Cs!hNnPjMrDHSaI`+<;jJEw3TU$!vtCP|9Eq*Bq@4TQ`Xl?*wnbOjvl94<_Z0NOoy66Kxg|DipZ{jhH_UDKOaCEN z7oVYC3u`D5FQ@Y&x6iB0bs=F@Jfdq-5?yr$KlR;?h~nP+9{Sc^)#|P*foqQaMwr^x&W+oo*|T1)IbWw8 z0vnD#=5k!S1Bdlt$l@D!ZFlykk1ia3YOCTluj;ci7QQzISPpW* z01Hff53%+y?F~~IxG$J{Hj^yoAQud< zz?^x{r+R0W+p~z9)htyEnq+G(HfXz_zc;`BJL)#B-K0qRq)yw7Trj|z$)C&d 1) + if(m >= 2) { - typestr = argv (0); + typestr = argv(0); versionstr = argv(1); } - else + for(j = 2; j < m; ++j) { - typestr = "N/A"; - versionstr = "N/A"; + if(argv(j) == "") + break; + k = substring(argv(j), 0, 1); + v = substring(argv(j), 1, -1); + if(k == "P") + pure = stof(v); } + me.currentServerType = strzone(typestr); me.typeLabel.setText(me.typeLabel, me.currentServerType); @@ -109,6 +120,9 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i) me.currentServerVersion = strzone(versionstr); me.versionLabel.setText(me.versionLabel, me.currentServerVersion); + me.currentServerPure = ((pure < 0) ? "N/A" : (pure == 0) ? "Official settings" : sprintf("%d modified settings", pure)); + me.pureLabel.setText(me.pureLabel, me.currentServerPure); + SLIST_FIELD_PING = gethostcacheindexforkey("ping"); s = ftos(gethostcachenumber(SLIST_FIELD_PING, i)); me.currentServerPing = strzone(s); @@ -192,6 +206,11 @@ void XonoticServerInfoDialog_fill(entity me) me.TD(me, 1, 4.0, e = makeXonoticTextLabel(0, "")); e.allowCut = 1; me.mapLabel = e; + me.TR(me); + me.TD(me, 1, 1.75, e = makeXonoticTextLabel(0, "Gameplay:")); + me.TD(me, 1, 4.0, e = makeXonoticTextLabel(0, "")); + e.allowCut = 1; + me.pureLabel = e; me.TR(me); me.TD(me, 1, 1.75, e = makeXonoticTextLabel(0, "Players:")); me.TD(me, 1, 4.0, e = makeXonoticTextLabel(0, "")); diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c index 95e1f80b8..610350c02 100644 --- a/qcsrc/menu/xonotic/serverlist.c +++ b/qcsrc/menu/xonotic/serverlist.c @@ -10,6 +10,8 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox) ATTRIB(XonoticServerList, realFontSize, vector, '0 0 0') ATTRIB(XonoticServerList, realUpperMargin, float, 0) + ATTRIB(XonoticServerList, columnIconsOrigin, float, 0) + ATTRIB(XonoticServerList, columnIconsSize, float, 0) ATTRIB(XonoticServerList, columnPingOrigin, float, 0) ATTRIB(XonoticServerList, columnPingSize, float, 0) ATTRIB(XonoticServerList, columnNameOrigin, float, 0) @@ -490,12 +492,14 @@ void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize, me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth)); me.realUpperMargin = 0.5 * (1 - me.realFontSize_y); - me.columnPingOrigin = 0; + me.columnIconsOrigin = 0; + me.columnIconsSize = me.realFontSize_x * 2; me.columnPingSize = me.realFontSize_x * 4; me.columnMapSize = me.realFontSize_x * 12; me.columnTypeSize = me.realFontSize_x * 4; me.columnPlayersSize = me.realFontSize_x * 6; - me.columnNameSize = 1 - me.columnPlayersSize - me.columnMapSize - me.columnPingSize - me.columnTypeSize - 4 * me.realFontSize_x; + me.columnNameSize = 1 - me.columnPlayersSize - me.columnMapSize - me.columnPingSize - me.columnIconsSize - me.columnTypeSize - 5 * me.realFontSize_x; + me.columnPingOrigin = me.columnIconsOrigin + me.columnIconsSize + me.realFontSize_x; me.columnNameOrigin = me.columnPingOrigin + me.columnPingSize + me.realFontSize_x; me.columnMapOrigin = me.columnNameOrigin + me.columnNameSize + me.realFontSize_x; me.columnTypeOrigin = me.columnMapOrigin + me.columnMapSize + me.realFontSize_x; @@ -598,7 +602,44 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float theColor = SKINCOLOR_SERVERLIST_IMPOSSIBLE; theAlpha = SKINALPHA_SERVERLIST_IMPOSSIBLE; } - // TODO show an icon for encryption status + + if(q == 1) + { + if(cvar("crypto_aeslevel") >= 2) + q |= 4; + } + if(q == 2) + { + if(cvar("crypto_aeslevel") >= 1) + q |= 4; + } + if(q == 3) + q = 5; + if(q >= 3) + q -= 2; + // possible status: + // 0: crypto off + // 1: AES possible + // 2: AES recommended but not available + // 3: AES possible and will be used + // 4: AES recommended and will be used + // 5: AES required + + s = gethostcachestring(SLIST_FIELD_QCSTATUS, i); + { + vector iconSize; + iconSize_y = 1; + iconSize_x = iconSize_y * (absSize_y / absSize_x); + + vector iconPos; + iconPos_x = (me.columnIconsSize - 2 * iconSize_x) * 0.5; + iconPos_y = (1 - iconSize_y) * 0.5; + + draw_Picture(iconPos, strcat("icon_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1); + + iconPos_x += iconSize_x; + draw_Picture(iconPos, strcat("icon_aeslevel", ftos(q)), iconSize, '1 1 1', 1); + } s = ftos(p); draw_Text(me.realUpperMargin * eY + (me.columnPingSize - draw_TextWidth(s, 0, me.realFontSize)) * eX, s, me.realFontSize, theColor, theAlpha, 0); diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index cd99ef476..b4bb3100a 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -259,12 +259,17 @@ void cvar_changes_init() BADPREFIX("r_"); BADPREFIX("sbar_"); BADPREFIX("scr_"); + BADPREFIX("snd_"); BADPREFIX("userbind"); BADPREFIX("v_"); BADPREFIX("vid_"); BADPREFIX("crosshair"); BADCVAR("mod_q3bsp_lightmapmergepower"); BADCVAR("mod_q3bsp_nolightmaps"); + BADCVAR("fov"); + BADCVAR("mastervolume"); + BADCVAR("volume"); + BADCVAR("bgmvolume"); // private BADCVAR("serverconfig"); @@ -340,6 +345,7 @@ void cvar_changes_init() // does nothing visible BADPREFIX("prvm_"); + BADPREFIX("crypto_"); // allowed changes to server admins (please sync this to server.cfg) // vi commands: diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 59480ab65..fbddca71d 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -369,7 +369,8 @@ void WinningConditionHelper() s = GetGametype(); s = strcat(s, ":", cvar_string("g_xonoticversion")); - s = strcat(s, "::", GetPlayerScoreString(world, 2)); // make this 1 once we can + s = strcat(s, ":P", ftos(cvar_purechanges_count)); + s = strcat(s, "::", GetPlayerScoreString(world, 1)); // make this 1 once we can, note: this doesn't contain any : fullstatus = cvar("g_full_getstatus_responses"); -- 2.39.2