From 1a63eed36e483946ef9644a42882123f4ba29853 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Mon, 29 Nov 2010 20:45:37 +0200 Subject: [PATCH] luminos_xhair hud config, plus bunch of code changes to make it possible --- _hud_descriptions.cfg | 8 +- defaultXonotic.cfg | 2 + gfx/hud/luminos_xhair/ammo_bullets.tga | Bin 0 -> 8374 bytes gfx/hud/luminos_xhair/ammo_cells.tga | Bin 0 -> 10440 bytes gfx/hud/luminos_xhair/ammo_current_bg.tga | Bin 0 -> 64 bytes gfx/hud/luminos_xhair/ammo_rockets.tga | Bin 0 -> 10393 bytes gfx/hud/luminos_xhair/ammo_shells.tga | Bin 0 -> 11132 bytes gfx/hud/luminos_xhair/border_healtharmor.tga | Bin 0 -> 13299 bytes gfx/hud/luminos_xhair/progressbar_ammo.tga | Bin 0 -> 204 bytes .../progressbar_armor_vertical.tga | Bin 0 -> 7293 bytes .../progressbar_health_vertical.tga | Bin 0 -> 6444 bytes hud_luminos.cfg | 4 + hud_luminos_minimal.cfg | 4 + hud_luminos_xhair_minimal.cfg | 213 ++++++++++++++++++ hud_nexuiz.cfg | 10 + qcsrc/client/hud.qc | 17 +- 16 files changed, 252 insertions(+), 6 deletions(-) create mode 100644 gfx/hud/luminos_xhair/ammo_bullets.tga create mode 100644 gfx/hud/luminos_xhair/ammo_cells.tga create mode 100644 gfx/hud/luminos_xhair/ammo_current_bg.tga create mode 100644 gfx/hud/luminos_xhair/ammo_rockets.tga create mode 100644 gfx/hud/luminos_xhair/ammo_shells.tga create mode 100644 gfx/hud/luminos_xhair/border_healtharmor.tga create mode 100644 gfx/hud/luminos_xhair/progressbar_ammo.tga create mode 100644 gfx/hud/luminos_xhair/progressbar_armor_vertical.tga create mode 100644 gfx/hud/luminos_xhair/progressbar_health_vertical.tga create mode 100644 hud_luminos_xhair_minimal.cfg diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 393f9eacb..932e95bf9 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -59,6 +59,10 @@ seta hud_panel_ammo_bg_color_team "" "override panel color with team color in te seta hud_panel_ammo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" seta hud_panel_ammo_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_panel_ammo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_ammo_progressbar "" "use progressbar behind ammo icons" +seta hud_panel_ammo_progressbar_xoffset "" "percentage of mySize_x to offset progressbar with" +seta hud_panel_ammo_progressbar_name "" "name of progressbar to use behind ammo icons" +seta hud_panel_ammo_text "" "show text/icons in the ammo panel" seta hud_panel_powerups "" "enable/disable this panel" seta hud_panel_powerups_pos "" "position of this panel" @@ -75,7 +79,7 @@ seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = over seta hud_panel_powerups_progressbar "" "enable progressbar in panel" seta hud_panel_powerups_progressbar_strength "" "progressbar image for strength" seta hud_panel_powerups_progressbar_shield "" "progressbar image for shield" -seta hud_panel_powerups_text "1" "show text/icons in the powerups panel" +seta hud_panel_powerups_text "" "show text/icons in the powerups panel" seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display" seta hud_panel_healtharmor_pos "" "position of this panel" @@ -92,7 +96,7 @@ seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = o seta hud_panel_healtharmor_progressbar "" "enable progressbar in panel" seta hud_panel_healtharmor_progressbar_health "" "progressbar image for health" seta hud_panel_healtharmor_progressbar_armor "" "progressbar image for armor" -seta hud_panel_healtharmor_text "1" "show text/icons in the healtharmor panel" +seta hud_panel_healtharmor_text "" "show text/icons in the healtharmor panel" seta hud_panel_notify "" "enable/disable this panel" seta hud_panel_notify_pos "" "position of this base of the panel" diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index ba732aed9..1891e2be2 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1348,6 +1348,8 @@ seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this a seta hud_panel_weapons_timeout "3" "panel disappears if you don't switch weapon for this amount of seconds" seta hud_panel_weapons_timeout_effect "1" "disappearance effect: 0) no effect; 1) panel moves out of screen; 2) panel fades out" +seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full" + seta hud_panel_healtharmor_maxhealth "250" "when you have this much health, the health status bar is full" seta hud_panel_healtharmor_maxarmor "150" "when you have this much armor, the armor status bar is full" diff --git a/gfx/hud/luminos_xhair/ammo_bullets.tga b/gfx/hud/luminos_xhair/ammo_bullets.tga new file mode 100644 index 0000000000000000000000000000000000000000..8e2783ccf587773703766b9df72f35158a9bb092 GIT binary patch literal 8374 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 literal 0 HcmV?d00001 diff --git a/gfx/hud/luminos_xhair/ammo_cells.tga b/gfx/hud/luminos_xhair/ammo_cells.tga new file mode 100644 index 0000000000000000000000000000000000000000..3735acdaa3366e2ecc9de50f67ca370f2b9da2b2 GIT binary patch literal 10440 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 P#PCjj&Vz>y>MZ*Yq-0cx literal 0 HcmV?d00001 diff --git a/gfx/hud/luminos_xhair/ammo_current_bg.tga b/gfx/hud/luminos_xhair/ammo_current_bg.tga new file mode 100644 index 0000000000000000000000000000000000000000..8b41e0fbca5335cd213638499046da4812e892cc GIT binary patch literal 64 rcmZQz;9`IQ76uju1&(GA7ma|a2nh;x4f724^!L+^aP#zW)nfnvjlTyn literal 0 HcmV?d00001 diff --git a/gfx/hud/luminos_xhair/ammo_rockets.tga b/gfx/hud/luminos_xhair/ammo_rockets.tga new file mode 100644 index 0000000000000000000000000000000000000000..de61d5a74911164fbd37e45ad3857f84b496978e GIT binary patch literal 10393 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 literal 0 HcmV?d00001 diff --git a/gfx/hud/luminos_xhair/ammo_shells.tga b/gfx/hud/luminos_xhair/ammo_shells.tga new file mode 100644 index 0000000000000000000000000000000000000000..fd70b436824a7421f6750e97445f66fd9b401f1a GIT binary patch literal 11132 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 phU$X%k#ET&Z9`@rwO4=h|P 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 P^YC8da`T4fq=o(qQ+7jz literal 0 HcmV?d00001 diff --git a/gfx/hud/luminos_xhair/progressbar_ammo.tga b/gfx/hud/luminos_xhair/progressbar_ammo.tga new file mode 100644 index 0000000000000000000000000000000000000000..9db210f73e27d0fc07001faf5ce1b78a2c05de29 GIT binary patch literal 204 zcmZQz;9`IQ76t_d1&(GAmvZ9&|NqaLfy93}@r-gqVJ-#HAwi+8VV=RB{(ia& z`$-!hE$!gBK~Z&VZ};xq6yMGEa`2V0_YuB5gZ8?*x=IEH7*RGWHURZg-pDo!3k#j@ z?(SBKPrG;y;~8sEUQ<(3KH~qyGr*}6Nv0b%;x*V_V`Jk>i0aeId>%3PC~^a(?9H1u zkILObd6Y7rs1ti!Js$p?`uh6Gi2hTviHP*m2Az|en@cscI8$!P>wkzHX3#Ed4?%nr zmz{pMeG^`OY5dd?92IDnX$D2VTq5=N9YXnvsO4JTwQCnqXN6jekZVv*dwct}ToakT z@;9hC^?3PtTF17Ei;JD($B%E)$RmJ88l;y>r6|>7cvKH)*lgHazI^%Zhzi#3or+w` zEml%eLiSc^Eq3ZvvB#7{mXS98jh zm6cS^eOimXXi)B=MT@Qk^<|*mZZ^q^ii+tVyClWV*CoYOlwwXnK>?*$nW;DG=u!&$ z-eUa1&Ck!Lxhxe({cc63xHPWo(*Io0KS;~{gV1P2axN$bg)-JYMJO+XC=;Rvgr|s? z2d751wn%E!Pv$q^<<~Oj%WY|CA<7?P)SFJ=nQTx_M@L7lr1%YpD?*6-B_*0&cfNtw zpp=}WM~^lOLCeKcir`$k)z#IMmky1ZY*MwgwIe{CV2b$jZ{p>r8E)V_w8Ku^6?M<07h2l4BJ+H)|+|tt0;h=W1oo)E?v%n@uq`~mLWZ|GeIGAeg zkSwe>RGKtqWx64EF3Qj&21RlH=w-oyAExi2vFzL3ow$i{=)6c;WVgiVMPLb+&YX~t{Bc2Q)R)bIrSeZdM zZEbCz1tyQtiprsKRaI3{20oYm*ocr{8jtj4%a&0=zmTjR2?7NGRBwDg2;2nVXR)v< z2$TUhB|xPDcw)mm{FpTVbS35#6%|qDp9u8ks}1}F0_;I(m=5G2YQF%aU8Vyg5p`IAH3;SCKp~>e3h*34t^%C$^7107 zq$O`dz1WKQD%OS>RoOxXP;k7My@1dIx_GOIw5H6`#ZnRff;deV?-lV6h_~tD0ug_K zc#AGB74avC*X!c5BDO;;*2R>F-$J}f7q^P|6~ug9d{4wf5c72LV-XKP9IA_lL~MoV z>7u_RI}rBoz{_tH3aSyYPZv(IIYRd6!Wj`-bm6=RAL_z|FhRP>2Rf`~EJFyjLivkK zH!`P@Ws9th$oh+|_1N}`ZRyxP65G3C`(r82#Ypt_2)mQ9%Pn|n*#Ynd9(CQhra%Gm*$aOCRSXWN#+Dk!PatYwH|$~M`$j!chLbr-6ZlzE)IamsIm|T3NZNyd>@~cFRS&(O6CHj&p79J$6)5FN$>)`c6+! z$y|?aVs~b87pZ4+x%w{QBraSg6S{#O9~VVB7L9cP0!w)D4f{zJ1LE?-bS Pw_?(x_mw|5yTth)J$yKu literal 0 HcmV?d00001 diff --git a/gfx/hud/luminos_xhair/progressbar_health_vertical.tga b/gfx/hud/luminos_xhair/progressbar_health_vertical.tga new file mode 100644 index 0000000000000000000000000000000000000000..1bfe49b1b668e27919e7aacec328ed33cf0c1736 GIT binary patch literal 6444 zcmcJUZ)nz46vv;(_2^ob+L{nC5?443GeY0A86nvij1|*GATAw*wow=e5e1sHrD>_# zOtX4g*;eTbK}Qh2ut*D}_9_$K$mmr<5`-3(@%TIE^822B56|&kgZ<#SpL@=|zx(Ih zbHBerp{|hsJys|b7u0^KKP#2W`QhwQDP;fUFY>Z`NAj{3lx@>`#SDBe)jrSbmb9*v zKS$-QT7O1X{%7`IA~u0GhhG;kE)VI#Tr|9l!CF|H-Y#`vF$J(u!I)5S)u=%F^-uOc zo8cB%mEVy1pUFe4is-=O44Pqa;Z3Ovi$Q>G3JwbuS2b|e%wQ=jz8R3Zu-F68r{Ghe z;_4Q-x{HCiIyNYEVX+&o)++c!sP;;M49m6bzn0-*SdG6W^7~u0E27{A_@$K?c^{M;RP}tKWBvlMm$~u4>?FjKM;H z^$dCe?qTpP+W6@m@&184qzxOAoeXT{w=vj+$-17|ml&QwJ15_j77ocn+9{!DuQIqF zpoPJ+aCK#mIDxAPfUgw1FI3u?0avduxEo*vgLb@&M2jNBeQ4*@UTFdCTm~3Wa8Rgp zpbqVHFt8m~&tL;w{k%_{z?ChEvH`f?sAUJlLfX9p;9&+!;r{O-sSArcXNE;0FeS00$UM0z9u^zxd-RZ(%SOLo$cKVz|0EB2M6{ z3*a~d>(vehw%B_NpxxzKrVr`qtpK+(XhgfeYF}XS2*61OHhKFQ48dYEgR=k~2GF5q zEz@C=p3VX&F=&97DVpM7+APj&EPmJS{a-JSj6C8fIAgvP>>-h0$kTf z15g6E#Nal7Ul`N_oMvF_`2>SzSR7`s9AJdON`L_dPXWBlpa-Cj!3zNE7`z71#b6ge z8-s%YD;QYpT*kmotOpp_qHbdFBid+Wa2{YjgOo$bB+p~;8!Tos_yeGpf$gXggKMy; zVPJ+g!-)!~He3wh@(CAQxJ1K69d3hgai`pH+;j!J17jy@Gm>Pu1L<3y8^us4Cnn59nN!bmusXn#4%scFv?r2!O>-cWtrBa~GZPYUD3ddZ1x7rJI+QNr#SL#HU@; z1Z)6s7rXE(XfK^EkKuI_z`~8Ypx*Ra8(xNO%G32Zyl?}ASM=~w?_~h!5VqKpZ~(AL z2U4`5Dsn?8Qg~Sdnugo2??N4?tdFF}sj#Up9ZU8TRruhH> literal 0 HcmV?d00001 diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 7fb827be4..8a946578f 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -57,6 +57,10 @@ seta hud_panel_ammo_bg_border "" seta hud_panel_ammo_bg_padding "" seta hud_panel_ammo_onlycurrent "0" seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "0" +seta hud_panel_ammo_progressbar_xoffset "0" +seta hud_panel_ammo_progressbar_name "progressbar" +seta hud_panel_ammo_text "1" seta hud_panel_powerups 1 seta hud_panel_powerups_pos "0.660000 0.940000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 6ccbd2b4b..8ee4ea778 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -57,6 +57,10 @@ seta hud_panel_ammo_bg_border "" seta hud_panel_ammo_bg_padding "" seta hud_panel_ammo_onlycurrent "0" seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "0" +seta hud_panel_ammo_progressbar_xoffset "0" +seta hud_panel_ammo_progressbar_name "progressbar" +seta hud_panel_ammo_text "1" seta hud_panel_powerups 1 seta hud_panel_powerups_pos "0.290000 0.890000" diff --git a/hud_luminos_xhair_minimal.cfg b/hud_luminos_xhair_minimal.cfg new file mode 100644 index 000000000..ba9e01a90 --- /dev/null +++ b/hud_luminos_xhair_minimal.cfg @@ -0,0 +1,213 @@ +seta hud_skin "luminos_xhair" +seta hud_panel_bg "0" +seta hud_panel_bg_color "1 0.4375 0" +seta hud_panel_bg_color_team "0" +seta hud_panel_bg_alpha "1" +seta hud_panel_bg_border "8" +seta hud_panel_bg_padding "2" +seta hud_panel_fg_alpha "1" + +seta hud_dock "0" +seta hud_dock_color "0 0.449576 0.860796" +seta hud_dock_color_team "0.700000" +seta hud_dock_alpha "1" + +seta hud_progressbar_alpha "0.3" +seta hud_progressbar_strength_color "0 0 0.6" +seta hud_progressbar_shield_color "0.6 0 0.6" +seta hud_progressbar_health_color "0.6 0 0" +seta hud_progressbar_armor_color "0 0.6 0" +seta hud_progressbar_fuel_color "0.6 0.6 0" +seta hud_progressbar_nexball_color "0.7 0.1 0" + +seta _hud_panelorder "3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 " + +seta hud_configure_grid "1" +seta hud_configure_grid_xsize "0.010000" +seta hud_configure_grid_ysize "0.010000" + +seta scr_centerpos "0.25" + +seta hud_panel_weapons 1 +seta hud_panel_weapons_pos "0.350000 0.940000" +seta hud_panel_weapons_size "0.300000 0.060000" +seta hud_panel_weapons_bg "" +seta hud_panel_weapons_bg_color "" +seta hud_panel_weapons_bg_color_team "" +seta hud_panel_weapons_bg_alpha "" +seta hud_panel_weapons_bg_border "" +seta hud_panel_weapons_bg_padding "" +seta hud_panel_weapons_complainbubble "1" +seta hud_panel_weapons_complainbubble_padding "-10" +seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0" +seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0" +seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8" +seta hud_panel_weapons_ammo_color "0 1 0" +seta hud_panel_weapons_ammo_alpha "1" +seta hud_panel_weapons_aspect "2" + +seta hud_panel_ammo 1 +seta hud_panel_ammo_pos "0.450000 0.630000" +seta hud_panel_ammo_size "0.080000 0.040000" +seta hud_panel_ammo_bg "" +seta hud_panel_ammo_bg_color "" +seta hud_panel_ammo_bg_color_team "" +seta hud_panel_ammo_bg_alpha "" +seta hud_panel_ammo_bg_border "" +seta hud_panel_ammo_bg_padding "" +seta hud_panel_ammo_onlycurrent "1" +seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "1" +seta hud_panel_ammo_progressbar_name "progressbar_ammo" +seta hud_panel_ammo_text "1" + +seta hud_panel_powerups 1 +seta hud_panel_powerups_pos "0.270000 0.940000" +seta hud_panel_powerups_size "0.080000 0.060000" +seta hud_panel_powerups_bg "0" +seta hud_panel_powerups_bg_color "" +seta hud_panel_powerups_bg_color_team "" +seta hud_panel_powerups_bg_alpha "" +seta hud_panel_powerups_bg_border "" +seta hud_panel_powerups_bg_padding "-3" +seta hud_panel_powerups_flip "1" +seta hud_panel_powerups_iconalign "1" +seta hud_panel_powerups_baralign "1" +seta hud_panel_powerups_progressbar "1" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" + +seta hud_panel_healtharmor 1 +seta hud_panel_healtharmor_pos "0.350000 0.380000" +seta hud_panel_healtharmor_size "0.070000 0.240000" +seta hud_panel_healtharmor_bg "border_healtharmor" +seta hud_panel_healtharmor_bg_color "0.464391 0.464391 0.464391" +seta hud_panel_healtharmor_bg_color_team "" +seta hud_panel_healtharmor_bg_alpha "0.600000" +seta hud_panel_healtharmor_bg_border "-1" +seta hud_panel_healtharmor_bg_padding "0" +seta hud_panel_healtharmor_flip "0" +seta hud_panel_healtharmor_iconalign "1" +seta hud_panel_healtharmor_baralign "1" +seta hud_panel_healtharmor_progressbar "1" +seta hud_panel_healtharmor_progressbar_health "progressbar_health" +seta hud_panel_healtharmor_progressbar_armor "progressbar_armor" +seta hud_panel_healtharmor_text "0" + +seta hud_panel_notify 1 +seta hud_panel_notify_pos "0 0" +seta hud_panel_notify_size "0.210000 0.260000" +seta hud_panel_notify_bg "0" +seta hud_panel_notify_bg_color "" +seta hud_panel_notify_bg_color_team "" +seta hud_panel_notify_bg_alpha "" +seta hud_panel_notify_bg_border "" +seta hud_panel_notify_bg_padding "" +seta hud_panel_notify_flip "1" +seta hud_panel_notify_print "0" + +seta hud_panel_timer 1 +seta hud_panel_timer_pos "0.435000 0" +seta hud_panel_timer_size "0.135000 0.060000" +seta hud_panel_timer_bg "0" +seta hud_panel_timer_bg_color "" +seta hud_panel_timer_bg_color_team "" +seta hud_panel_timer_bg_alpha "" +seta hud_panel_timer_bg_border "" +seta hud_panel_timer_bg_padding "0" + +seta hud_panel_radar 2 +seta hud_panel_radar_pos "0.810000 0" +seta hud_panel_radar_size "0.190000 0.250000" +seta hud_panel_radar_bg "border_radar" +seta hud_panel_radar_bg_color "" +seta hud_panel_radar_bg_color_team "" +seta hud_panel_radar_bg_alpha "0.500000" +seta hud_panel_radar_bg_border "0" +seta hud_panel_radar_bg_padding "0" +seta hud_panel_radar_foreground_alpha "0.500000" + +seta hud_panel_score 1 +seta hud_panel_score_pos "0.465000 0.045000" +seta hud_panel_score_size "0.090000 0.060000" +seta hud_panel_score_bg "" +seta hud_panel_score_bg_color "" +seta hud_panel_score_bg_color_team "" +seta hud_panel_score_bg_alpha "" +seta hud_panel_score_bg_border "" +seta hud_panel_score_bg_padding "" + +seta hud_panel_racetimer 1 +seta hud_panel_racetimer_pos "0.360000 0.090000" +seta hud_panel_racetimer_size "0.280000 0.090000" +seta hud_panel_racetimer_bg "0" +seta hud_panel_racetimer_bg_color "" +seta hud_panel_racetimer_bg_color_team "" +seta hud_panel_racetimer_bg_alpha "" +seta hud_panel_racetimer_bg_border "" +seta hud_panel_racetimer_bg_padding "" + +seta hud_panel_vote 1 +seta hud_panel_vote_pos "0 0.890000" +seta hud_panel_vote_size "0.170000 0.110000" +seta hud_panel_vote_bg "" +seta hud_panel_vote_bg_color "" +seta hud_panel_vote_bg_color_team "" +seta hud_panel_vote_bg_alpha "" +seta hud_panel_vote_bg_border "" +seta hud_panel_vote_bg_padding "" +seta hud_panel_vote_alreadyvoted_alpha "0.800000" + +seta hud_panel_modicons 1 +seta hud_panel_modicons_pos "0.560000 0" +seta hud_panel_modicons_size "0.050000 0.100000" +seta hud_panel_modicons_bg "" +seta hud_panel_modicons_bg_color "" +seta hud_panel_modicons_bg_color_team "" +seta hud_panel_modicons_bg_alpha "" +seta hud_panel_modicons_bg_border "" +seta hud_panel_modicons_bg_padding "" + +seta hud_panel_pressedkeys 1 +seta hud_panel_pressedkeys_pos "0.450000 0.690000" +seta hud_panel_pressedkeys_size "0.100000 0.110000" +seta hud_panel_pressedkeys_bg "0" +seta hud_panel_pressedkeys_bg_color "" +seta hud_panel_pressedkeys_bg_color_team "" +seta hud_panel_pressedkeys_bg_alpha "" +seta hud_panel_pressedkeys_bg_border "" +seta hud_panel_pressedkeys_bg_padding "" +seta hud_panel_pressedkeys_aspect "1.600000" + +seta hud_panel_chat 1 +seta hud_panel_chat_pos "0 0.775000" +seta hud_panel_chat_size "0.460000 0.110000" +seta hud_panel_chat_bg "0" +seta hud_panel_chat_bg_color "" +seta hud_panel_chat_bg_color_team "" +seta hud_panel_chat_bg_alpha "" +seta hud_panel_chat_bg_border "" +seta hud_panel_chat_bg_padding "" + +seta hud_panel_engineinfo 0 +seta hud_panel_engineinfo_pos "0.910000 0.970000" +seta hud_panel_engineinfo_size "0.090000 0.030000" +seta hud_panel_engineinfo_bg "0" +seta hud_panel_engineinfo_bg_color "" +seta hud_panel_engineinfo_bg_color_team "" +seta hud_panel_engineinfo_bg_alpha "" +seta hud_panel_engineinfo_bg_border "" +seta hud_panel_engineinfo_bg_padding "" + +seta hud_panel_infomessages 1 +seta hud_panel_infomessages_pos "0.710000 0" +seta hud_panel_infomessages_size "0.290000 0.100000" +seta hud_panel_infomessages_bg "0" +seta hud_panel_infomessages_bg_color "" +seta hud_panel_infomessages_bg_color_team "" +seta hud_panel_infomessages_bg_alpha "" +seta hud_panel_infomessages_bg_border "" +seta hud_panel_infomessages_bg_padding "0" +seta hud_panel_infomessages_flip "1" + +menu_sync diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index bdd7a97f2..dfecf7400 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -57,6 +57,10 @@ seta hud_panel_ammo_bg_border "" seta hud_panel_ammo_bg_padding "" seta hud_panel_ammo_onlycurrent "0" seta hud_panel_ammo_iconalign "0" +seta hud_panel_ammo_progressbar "0" +seta hud_panel_ammo_progressbar_xoffset "0" +seta hud_panel_ammo_progressbar_name "progressbar" +seta hud_panel_ammo_text "1" seta hud_panel_powerups 1 seta hud_panel_powerups_pos "0.660000 0.910000" @@ -71,6 +75,9 @@ seta hud_panel_powerups_flip "1" seta hud_panel_powerups_iconalign "0" seta hud_panel_powerups_baralign "0" seta hud_panel_powerups_progressbar "0" +seta hud_panel_powerups_progressbar_strength "progressbar" +seta hud_panel_powerups_progressbar_shield "progressbar" +seta hud_panel_powerups_text "1" seta hud_panel_healtharmor 1 seta hud_panel_healtharmor_pos "0.370000 0.930000" @@ -85,6 +92,9 @@ seta hud_panel_healtharmor_flip "0" seta hud_panel_healtharmor_iconalign "0" seta hud_panel_healtharmor_baralign "0" seta hud_panel_healtharmor_progressbar "0" +seta hud_panel_healtharmor_progressbar_health "progressbar" +seta hud_panel_healtharmor_progressbar_armor "progressbar" +seta hud_panel_healtharmor_text "1" seta hud_panel_notify 0 seta hud_panel_notify_pos "0 0.650000" diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 9905ef399..7ad148b0c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -496,6 +496,9 @@ void HUD_Panel_ExportCfg(string cfgname) case HUD_PANEL_AMMO: HUD_Write_PanelCvar_q("_onlycurrent"); HUD_Write_PanelCvar_q("_iconalign"); + HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_name"); + HUD_Write_PanelCvar_q("_text"); break; case HUD_PANEL_POWERUPS: HUD_Write_PanelCvar_q("_flip"); @@ -1912,10 +1915,16 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s if (currently_selected) drawpic_aspect_skin(myPos, "ammo_current_bg", mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - if(a > 0) - drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); - else // "ghost" ammo count - drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); + if(a > 0 && cvar("hud_panel_ammo_progressbar")) + HUD_Panel_DrawProgressBar(myPos + eX * cvar("hud_panel_ammo_progressbar_xoffset") * mySize_x, mySize - eX * cvar("hud_panel_ammo_progressbar_xoffset") * mySize_x, cvar_string("hud_panel_ammo_progressbar_name"), 0, 0, min(1, a/cvar("hud_panel_ammo_maxammo")), color, autocvar_hud_progressbar_alpha * panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + + if(cvar("hud_panel_ammo_text")) + { + if(a > 0) + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, color, panel_fg_alpha * alpha, DRAWFLAG_NORMAL); + else // "ghost" ammo count + drawstring_aspect(numpos, ftos(a), eX * (2/3) * mySize_x + eY * mySize_y, '0 0 0', panel_fg_alpha * alpha * 0.5, DRAWFLAG_NORMAL); + } if(a > 0) drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL); else // "ghost" ammo icon -- 2.39.2