From: FruitieX Date: Thu, 17 Jun 2010 12:53:18 +0000 (+0300) Subject: update the old hud to look even more like the old hud ;), also draw radar before... X-Git-Tag: xonotic-v0.1.0preview~541^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=075fe4cf93c2a3eb838de675915f37454b564860;p=xonotic%2Fxonotic-data.pk3dir.git update the old hud to look even more like the old hud ;), also draw radar before all other panels as it makes sense to put it under other panels --- diff --git a/gfx/hud/old/border_radar.tga b/gfx/hud/old/border_radar.tga new file mode 100644 index 000000000..669685bb7 Binary files /dev/null and b/gfx/hud/old/border_radar.tga differ diff --git a/gfx/hud/old/voteprogress_back.tga b/gfx/hud/old/voteprogress_back.tga index 10ffa1374..fc031ce0b 100644 Binary files a/gfx/hud/old/voteprogress_back.tga and b/gfx/hud/old/voteprogress_back.tga differ diff --git a/hud_old_nexuiz.cfg b/hud_old_nexuiz.cfg index 2872634b3..c17510653 100644 --- a/hud_old_nexuiz.cfg +++ b/hud_old_nexuiz.cfg @@ -1,16 +1,18 @@ seta hud_skin "old" seta hud_bg "0" -seta hud_bg_color "0 0.6 0.9" -seta hud_bg_alpha "0.8" +seta hud_bg_color "1 1 1" +seta hud_bg_color_team "0" +seta hud_bg_alpha "0.500000" seta hud_bg_border "10" seta hud_bg_padding "0" seta hud_fg_alpha "1" seta hud_dock "dock" -seta hud_dock_color "0 0.6 0.9" -seta hud_dock_alpha "0.800000" +seta hud_dock_color "0 0.5 0.35" +seta hud_dock_color_team "0.700000" +seta hud_dock_alpha "1" -seta hud_progressbar_alpha 0.500000 +seta hud_progressbar_alpha 0 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" @@ -19,31 +21,33 @@ seta hud_progressbar_fuel_color "0.6 0.6 0" seta hud_progressbar_nexball_color "0.7 0.1 0" seta hud_weaponicons 1 -seta hud_weaponicons_pos "-0.635417 -0.133333" -seta hud_weaponicons_size "0.354167 0.066667" +seta hud_weaponicons_pos "0.370000 0.870000" +seta hud_weaponicons_size "0.330000 0.050000" seta hud_weaponicons_bg "" seta hud_weaponicons_bg_color "" +seta hud_weaponicons_bg_color_team "" seta hud_weaponicons_bg_alpha "" seta hud_weaponicons_bg_border "" -seta hud_weaponicons_bg_padding "" -seta hud_weaponicons_accuracy_height 0 +seta hud_weaponicons_bg_padding "-5" seta hud_weaponicons_accuracy_yellow 40 seta hud_inventory 1 -seta hud_inventory_pos "0.171875 -0.091667" -seta hud_inventory_size "0.177083 0.091667" +seta hud_inventory_pos "0.160000 0.910000" +seta hud_inventory_size "0.190000 0.090000" seta hud_inventory_bg "" seta hud_inventory_bg_color "" +seta hud_inventory_bg_color_team "" seta hud_inventory_bg_alpha "" seta hud_inventory_bg_border "" seta hud_inventory_bg_padding "" seta hud_inventory_onlycurrent 0 seta hud_powerups 1 -seta hud_powerups_pos "-0.307292 -0.091667" -seta hud_powerups_size "0.093750 0.083333" +seta hud_powerups_pos "0.670000 0.910000" +seta hud_powerups_size "0.100000 0.080000" seta hud_powerups_bg "" seta hud_powerups_bg_color "" +seta hud_powerups_bg_color_team "" seta hud_powerups_bg_alpha "" seta hud_powerups_bg_border "" seta hud_powerups_bg_padding "" @@ -51,86 +55,119 @@ seta hud_powerups_flip 1 seta hud_powerups_mirror 0 seta hud_healtharmor 1 -seta hud_healtharmor_pos "-0.625000 -0.066667" -seta hud_healtharmor_size "0.287496 0.066667" +seta hud_healtharmor_pos "0.370000 0.930000" +seta hud_healtharmor_size "0.300000 0.070000" seta hud_healtharmor_bg "" seta hud_healtharmor_bg_color "" +seta hud_healtharmor_bg_color_team "" seta hud_healtharmor_bg_alpha "" seta hud_healtharmor_bg_border "" seta hud_healtharmor_bg_padding "" -seta hud_healtharmor_flip 1 +seta hud_healtharmor_flip 0 seta hud_healtharmor_mirror 0 -seta hud_notify 0 -seta hud_notify_pos "0.1 0" -seta hud_notify_size "0.1 0.1" +seta hud_notify 1 +seta hud_notify_pos "0.690000 0.660000" +seta hud_notify_size "0.300000 0.070000" seta hud_notify_bg "" seta hud_notify_bg_color "" -seta hud_notify_bg_alpha "" +seta hud_notify_bg_color_team "" +seta hud_notify_bg_alpha "0" seta hud_notify_bg_border "" seta hud_notify_bg_padding "" +seta hud_notify_flip 0 +seta hud_notify_info_top 0 seta hud_timer 1 -seta hud_timer_pos "-0.151042 0" -seta hud_timer_size "0.151042 0.058333" +seta hud_timer_pos "0.860000 0" +seta hud_timer_size "0.140000 0.045528" seta hud_timer_bg "border" -seta hud_timer_bg_color "" -seta hud_timer_bg_alpha "" +seta hud_timer_bg_color "0 0.5 0.35" +seta hud_timer_bg_color_team "" +seta hud_timer_bg_alpha "0.800000" seta hud_timer_bg_border "" -seta hud_timer_bg_padding "" +seta hud_timer_bg_padding "0" -seta hud_radar 1 -seta hud_radar_pos "0 0" -seta hud_radar_size "0.182292 0.225000" -seta hud_radar_bg "" +seta hud_radar 2 +seta hud_radar_pos "0.800000 0" +seta hud_radar_size "0.200000 0.260000" +seta hud_radar_bg "border_radar" seta hud_radar_bg_color "" +seta hud_radar_bg_color_team "" seta hud_radar_bg_alpha "" seta hud_radar_bg_border "" -seta hud_radar_bg_padding "" +seta hud_radar_bg_padding "-10" +seta hud_radar_foreground_alpha 0.800000 +seta hud_radar_alreadyvoted_alpha 0 seta hud_score 1 -seta hud_score_pos "-0.203125 -0.091667" -seta hud_score_size "0.203125 0.083333" +seta hud_score_pos "0.760000 0.913333" +seta hud_score_size "0.240000 0.080000" seta hud_score_bg "" seta hud_score_bg_color "" +seta hud_score_bg_color_team "" seta hud_score_bg_alpha "" seta hud_score_bg_border "" seta hud_score_bg_padding "" seta hud_racetimer 1 -seta hud_racetimer_pos "-0.614583 0" -seta hud_racetimer_size "0.229167 0.091667" +seta hud_racetimer_pos "0.360000 0.140000" +seta hud_racetimer_size "0.280000 0.093333" seta hud_racetimer_bg "" seta hud_racetimer_bg_color "" -seta hud_racetimer_bg_alpha "" +seta hud_racetimer_bg_color_team "" +seta hud_racetimer_bg_alpha "0" seta hud_racetimer_bg_border "" seta hud_racetimer_bg_padding "" seta hud_vote 1 -seta hud_vote_pos "-0.312500 -0.300000" -seta hud_vote_size "0.312500 0.133333" +seta hud_vote_pos "0.690000 0.750000" +seta hud_vote_size "0.300000 0.100000" seta hud_vote_bg "" -seta hud_vote_bg_color "" -seta hud_vote_bg_alpha "" +seta hud_vote_bg_color "0 0.5 0.35" +seta hud_vote_bg_color_team "" +seta hud_vote_bg_alpha "0.800000" seta hud_vote_bg_border "" -seta hud_vote_bg_padding "" +seta hud_vote_bg_padding "-3" seta hud_vote_alreadyvoted_alpha 0.750000 seta hud_modicons 1 -seta hud_modicons_pos "0 -0.091667" -seta hud_modicons_size "0.119792 0.091667" +seta hud_modicons_pos "0.010000 0.910000" +seta hud_modicons_size "0.135000 0.090000" seta hud_modicons_bg "" seta hud_modicons_bg_color "" +seta hud_modicons_bg_color_team "" seta hud_modicons_bg_alpha "" seta hud_modicons_bg_border "" seta hud_modicons_bg_padding "" seta hud_pressedkeys 1 -seta hud_pressedkeys_pos "0.437500 -0.266667" -seta hud_pressedkeys_size "0.125000 0.116667" +seta hud_pressedkeys_pos "0.440000 0.740000" +seta hud_pressedkeys_size "0.120000 0.094368" seta hud_pressedkeys_bg "" seta hud_pressedkeys_bg_color "" -seta hud_pressedkeys_bg_alpha "" +seta hud_pressedkeys_bg_color_team "" +seta hud_pressedkeys_bg_alpha "0" seta hud_pressedkeys_bg_border "" seta hud_pressedkeys_bg_padding "" +seta hud_chat 1 +seta hud_chat_pos "0 0.760000" +seta hud_chat_size "0.420000 0.130000" +seta hud_chat_bg "" +seta hud_chat_bg_color "" +seta hud_chat_bg_color_team "" +seta hud_chat_bg_alpha "0" +seta hud_chat_bg_border "" +seta hud_chat_bg_padding "" + +seta hud_engineinfo 1 +seta hud_engineinfo_pos "0.900000 0.870000" +seta hud_engineinfo_size "0.090000 0.030000" +seta hud_engineinfo_bg "" +seta hud_engineinfo_bg_color "" +seta hud_engineinfo_bg_color_team "" +seta hud_engineinfo_bg_alpha "0" +seta hud_engineinfo_bg_border "" +seta hud_engineinfo_bg_padding "" + diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index c5871cc50..3f85934f7 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4407,6 +4407,9 @@ void HUD_Main (void) if(cvar_string("hud_dock") != "") drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); + if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure) + if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay)) + HUD_Radar(); if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure) HUD_WeaponIcons(); if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure) @@ -4419,10 +4422,6 @@ void HUD_Main (void) HUD_Notify(); if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure) HUD_Timer(); - // TODO hud'ify - if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure) - if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay)) - HUD_Radar(); if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure) HUD_Score(); if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure) @@ -4439,7 +4438,7 @@ void HUD_Main (void) if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure) HUD_Chat(); else - cvar_set("con_csqcpositioning", "0"); + cvar_set("con_chatrect", "0"); if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure) HUD_EngineInfo();