seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball"
seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball"
seta crosshair_fireball_size 1 "crosshair size when wielding the fireball"
+seta cl_reticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
fov 90
seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"
seta cl_velocityzoomtime 0.3 "time value for averaging speed values"
alias -zoom -button4
alias +crouch +button5
alias -crouch -button5
- alias weapnext "_weapnext_${_supports_weaponpriority}${sbar_hudselector}${cl_weaponpriority_useforcycling}"
- alias _weapnext_000 "impulse 10"
- alias _weapnext_001 "impulse 10"
- alias _weapnext_010 "impulse 10"
- alias _weapnext_011 "impulse 10"
- alias _weapnext_020 "impulse 10"
- alias _weapnext_021 "impulse 10"
- alias _weapnext_100 "impulse 10"
- alias _weapnext_101 "impulse 15"
- alias _weapnext_110 "impulse 18"
- alias _weapnext_111 "impulse 15"
- alias _weapnext_120 "impulse 18"
- alias _weapnext_121 "impulse 15"
+ alias weapnext "_weapnext_${cl_weaponpriority_useforcycling}"
+ alias _weapnext_0 "impulse 18"
+ alias _weapnext_1 "impulse 15"
+ alias _weapnext_2 "impulse 10"
alias weaplast "impulse 11"
- alias weapprev "_weapprev_${_supports_weaponpriority}${sbar_hudselector}${cl_weaponpriority_useforcycling}"
- alias _weapprev_000 "impulse 12"
- alias _weapprev_001 "impulse 12"
- alias _weapprev_010 "impulse 12"
- alias _weapprev_011 "impulse 12"
- alias _weapprev_020 "impulse 12"
- alias _weapprev_021 "impulse 12"
- alias _weapprev_100 "impulse 12"
- alias _weapprev_101 "impulse 16"
- alias _weapprev_110 "impulse 19"
- alias _weapprev_111 "impulse 16"
- alias _weapprev_120 "impulse 19"
- alias _weapprev_121 "impulse 16"
- set _supports_weaponpriority 0 "set to 1 by csqc if supported, and to 0 on disconnect"
+ alias weapprev "_weapprev_${cl_weaponpriority_useforcycling}"
+ alias _weapprev_0 "impulse 19"
+ alias _weapprev_1 "impulse 16"
+ alias _weapprev_2 "impulse 12"
alias weapbest "impulse 13"
alias reload "impulse 20"
bind F11 disconnect
bind F12 screenshot
bind F4 ready
- bind m radar
bind ALT +showaccuracy
// Gamepad defaults. Tested with Logitech Rumblepad 2, I hope similar ones works as well.
con_notifysize 10
con_notifyalign 0
- sbar_info_pos 50
- seta sbar_alpha_bg 0.8 "alpha value of the HUD background"
- seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"
- seta sbar_border_thickness 1 "scoreboard border thickness"
- seta sbar_accuracy_border_thickness 1 "accuracy stats border thickness"
- seta sbar_accuracy_doublerows 0 "use two rows instead of one"
- seta sbar_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
- seta sbar_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard"
- seta sbar_accuracy_hud 1 "0 = no weapon accuracy bar on the weapon icons"
- seta sbar_color_bg_r 0 "red color component of the HUD background"
- seta sbar_color_bg_g 0.25 "green color component of the HUD background"
- seta sbar_color_bg_b 0.17 "blue color component of the HUD background"
- seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background"
- seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"
- seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"
- seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
- seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self"
- seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
- seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
- seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
- seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"
- seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
- seta sbar_hudselector 1 "0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display"
- seta sbar_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon"
- seta sbar_showweaponicons 1 "1 = show icons of weapons that you have"
- seta sbar_timer_increment 0 "1 = show elapsed time on the timer"
- seta sbar_timer_scale 1 "scale multiplier of the timer"
- seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
+ // hud variables
+ set _hud_configure 0 "1 = configure the HUD"
+ seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
+ seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode"
+ seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
+ seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth"
+ seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight"
+ seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
+
+ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
+
+ exec hud_wickedhud_default.cfg
+
+ // scoreboard
+ seta scoreboard_columns default
+ seta scoreboard_border_thickness 1 "scoreboard border thickness"
+ seta scoreboard_accuracy_border_thickness 1 "accuracy stats border thickness"
+ seta scoreboard_accuracy_doublerows 0 "use two rows instead of one"
+ seta scoreboard_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard"
+ seta scoreboard_color_bg_r 0 "red color component of the HUD background"
+ seta scoreboard_color_bg_g 0.25 "green color component of the HUD background"
+ seta scoreboard_color_bg_b 0.17 "blue color component of the HUD background"
+ seta scoreboard_color_bg_team 0.5 "team color multiplier of the HUD background"
+ seta scoreboard_alpha_bg 0.6 "scoreboard background alpha"
+ seta scoreboard_alpha_fg 1 "scoreboard foreground alpha"
+ seta scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
+ seta scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self"
+ seta scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
+ seta scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
+ seta scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
+ seta scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on hud_scoreboard_highlight 1)"
+ seta scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
// for menu server list (eventually make them have engine support?)
seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
// CTF capture limit placeholder cvar
set capturelimit 0
- // sbar: font size
- seta sbar_fontsize 11
- seta sbar_fontsize_spec 16
+ // hud: font size
+ seta hud_fontsize 11
+ seta hud_fontsize_spec 16
seta scr_centersize 11
- seta sbar_width 560
- // alias sbar_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; sbar_columns_set"
+ seta hud_width 560
+ // alias hud_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big ${2-}; scoreboard_columns_set"
alias sbar_font "set _requested_sbar_font \"${*}\""
- seta sbar_columns default
sbar_font gfx/vera-sans 8 12 16 24 32
- seta sbar_showbinds 1 "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both"
- seta sbar_showbinds_limit 2 "maximum number of bound keys to show for an action. 0 for unlimited"
+ seta hud_showbinds 1 "display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both"
+ seta hud_showbinds_limit 2 "maximum number of bound keys to show for an action. 0 for unlimited"
// these entities are not referenced by anything directly, they just represent
// teams and are found by find() when needed
// note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
- seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list"
+ seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)"
seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives"
seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy"
seta cl_weaponpriority2 "minstanex nex campingrifle" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact"
seta sv_status_privacy 1 "hide IP addresses from \"status\" replies shown to clients"
-
- seta cl_teamradar 1 "show radar in teammatches when available"
- seta cl_teamradar_background_alpha 0 "set to -1 to disable"
- seta cl_teamradar_foreground_alpha 0.8 "alpha of the map"
- seta cl_teamradar_scale 4096 "distance you can see on the team radar"
- seta cl_teamradar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
- seta cl_teamradar_size "128 128" "size of the team radar in pixels"
- seta cl_teamradar_position "1 0" "1 0 would be upper right corner, 0.5 0.5 the center, append a 2 at the end to disable the corner hack, and a 1 to disable half the hack"
- seta cl_teamradar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
- alias cl_teamradar_rotate "toggle cl_teamradar_rotation 0 1 2 3 4"
-
set g_maplist_allow_hidden 0 "allow hidden maps to be, e.g., voted for and in the maplist"
set g_maplist_allow_frustrating 0 "allow impossible maps to be, e.g., voted for and in the maplist (if set to 2, ONLY impossible maps are allowed)"
alias ons_map "cl_cmd radar" // legacy alias
alias radar "cl_cmd radar"
- alias sbar_columns_set "cl_cmd sbar_columns_set $*"
- alias sbar_columns_help "cl_cmd sbar_columns_help $*"
+ alias scoreboard_columns_set "cl_cmd scoreboard_columns_set $*"
+ alias scoreboard_columns_help "cl_cmd scoreboard_columns_help $*"
alias _gl_flashblend_update_00 "gl_flashblend 1"
alias _gl_flashblend_update_10 "gl_flashblend 0"
// must be at the bottom of this file:
// alias for switching the teamselect menu
alias menu_showteamselect "menu_cmd directmenu TeamSelect"
+ alias menu_showhudexit "menu_cmd directmenu HUDExit"
+ alias menu_showhudoptions "menu_cmd directpanelhudmenu $*"
alias menu_sync "menu_cmd sync"
bind f5 menu_showteamselect
void CSQC_common_hud(void);
- void CSQC_kh_hud(void);
- void CSQC_ctf_hud(void);
void PostInit(void);
void CSQC_Demo_Camera();
- float Sbar_WouldDrawScoreboard ();
+ float HUD_WouldDrawScoreboard ();
float view_set;
float camera_mode;
string NextFrameCommand;
float f, i, j;
vector v, vo;
+ vector reticle_pos, reticle_size;
+
WaypointSprite_Load();
if(spectatee_status)
input_angles = warpzone_fixview_cl_viewangles;
view_angles = warpzone_fixview_angles;
- if(cvar("cl_lockview"))
+ if(cvar("cl_lockview") || hud_configure)
{
pmove_org = freeze_pmove_org;
input_angles = view_angles = freeze_input_angles;
}
}
- sbar_alpha_fg = cvar("sbar_alpha_fg" ) * (1 - cvar("_menu_alpha"));
- sbar_currentammo = cvar("sbar_showcurrentammo");
- sbar_hudselector = cvar("sbar_hudselector");
- sbar_accuracy_hud = cvar_or("sbar_accuracy_hud", 1);
+ hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);
ColorTranslateMode = cvar("cl_stripcolorcodes");
activeweapon = getstati(STAT_SWITCHWEAPON);
f = cvar("teamplay");
if(f != teamplay)
{
teamplay = f;
- Sbar_InitScores();
+ HUD_InitScores();
}
if(last_weapon != activeweapon) {
// Draw the Crosshair
float scoreboard_active;
- scoreboard_active = Sbar_WouldDrawScoreboard();
+ scoreboard_active = HUD_WouldDrawScoreboard();
R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
// Draw the Engine Status Bar (the default Quake HUD)
- R_SetView(VF_DRAWENGINESBAR, 0);
+ R_SetView(VF_DRAWENGINEHUD, 0);
// fetch this one only once per frame
- sbar_showbinds = cvar("sbar_showbinds");
- sbar_showbinds_limit = cvar("sbar_showbinds_limit");
+ hud_showbinds = cvar("hud_showbinds");
+ hud_showbinds_limit = cvar("hud_showbinds_limit");
// Update the mouse position
/*
self.draw2d();
self = e;
- // draw radar
- if(
- ons_showmap
- ||
- (
- !scoreboard_active
- &&
- cvar_string("cl_teamradar") != "0"
- &&
- (
- cvar("cl_teamradar") == 2
- ||
- teamplay
- )
- )
- )
- teamradar_view();
-
- // draw sbar
+ // draw hud
if(cvar("r_letterbox") == 0) {
- if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing
- if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2)
- Sbar_DrawPressedKeys();
- }
-
- if (cvar("cl_showspeed"))
- Sbar_ShowSpeed();
- if (cvar("cl_showacceleration"))
- Sbar_ShowAcceleration();
-
- Sbar_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
+ HUD_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
}
float hud;
CSQC_common_hud();
// crosshair goes VERY LAST
- if(!scoreboard_active && !ons_showmap && !camera_active) {
+ if(!scoreboard_active && !camera_active) {
// TrueAim check
float shottype;
float bullets, ring_scale;
bullets = 0;
#define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
- drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+ drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
#define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
do \
cvar_set("vid_conheight", h0);
}
+ if(hud_configure)
+ HUD_Panel_Mouse();
// be safe against triggerbots until everyone has the fixed engine
// this call is meant to overwrite the trace globals by something
// unsuspicious
traceline('0 0 0', '0 0 0', MOVE_WORLDONLY, world);
}
- void Sbar_Draw();
#define spider_h "gfx/vehicles/hud_bg.tga"
#define spider_b "gfx/vehicles/sbot.tga"
#define spider_r "gfx/vehicles/sbot_rpods.tga"
#define spider_g "gfx/vehicles/sbot_mguns.tga"
#define spider_s "gfx/vehicles/shiled.tga"
-
#define spider_a1 "gfx/hud/sb_rocket.tga"
#define spider_a2 "gfx/sb_bullets.tga"
}
*/
- if (sb_showscores)
+ if (scoreboard_showscores)
{
- Sbar_DrawScoreboard();
- Sbar_DrawCenterPrint();
+ HUD_DrawScoreboard();
+ HUD_DrawCenterPrint();
}
}
#define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
#define raptor_s "gfx/vehicles/shiled.tga"
- #define spider_a1 "gfx/hud/sb_rocket.tga"
- #define spider_a2 "gfx/sb_bullets.tga"
-
void CSQC_RAPTOR_HUD()
{
float rockets, reload, heat, hp, shield, energy;
drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' * (1 - reload), 1, DRAWFLAG_NORMAL);
- if (sb_showscores)
+ if (scoreboard_showscores)
{
- Sbar_DrawScoreboard();
- Sbar_DrawCenterPrint();
+ HUD_DrawScoreboard();
+ HUD_DrawCenterPrint();
}
}
- if (sb_showscores)
+ if (scoreboard_showscores)
{
- Sbar_DrawScoreboard();
- Sbar_DrawCenterPrint();
+ HUD_DrawScoreboard();
+ HUD_DrawCenterPrint();
}
}
void CSQC_common_hud(void)
{
- // Sbar_SortFrags(); done in Sbar_Draw
+ // HUD_SortFrags(); done in HUD_Draw
float hud;
hud = getstati(STAT_HUD);
switch(hud)
{
case HUD_NORMAL:
- Sbar_Draw();
+ // hud first
+ HUD_Main();
+
+ // scoreboard/accuracy
+ if (intermission == 2 && !scoreboard_showaccuracy && !scoreboard_showscores) // map voting screen
+ {
+ HUD_FinaleOverlay();
+ HUD_Reset();
+ }
+ else if(scoreboard_showaccuracy && spectatee_status != -1)
+ HUD_DrawAccuracyStats();
+ else
+ HUD_DrawScoreboard();
+
+ if (scoreboard_showscores || scoreboard_showaccuracy || scoreboard_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
+ HUD_Reset();
+
break;
case HUD_SPIDERBOT:
projects / xonotic / xonotic-data.pk3dir.git / commitdiff