From: terencehill Date: Wed, 26 Aug 2015 14:46:17 +0000 (+0200) Subject: Merge branch 'master' into terencehill/quickmenu X-Git-Tag: xonotic-v0.8.2~1987^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7bae88d09fbd53cce732e31633aea92671b43699;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/quickmenu Conflicts: _hud_common.cfg _hud_descriptions.cfg hud_luminos.cfg hud_luminos_minimal.cfg hud_luminos_minimal_xhair.cfg hud_luminos_old.cfg hud_nexuiz.cfg qcsrc/client/command/cl_cmd.qc qcsrc/client/hud.qc qcsrc/client/hud.qh qcsrc/client/hud_config.qc qcsrc/client/hud_config.qh qcsrc/client/main.qc qcsrc/client/mapvoting.qh qcsrc/client/scoreboard.qc qcsrc/client/view.qc qcsrc/menu/xonotic/mainwindow.qc --- 7bae88d09fbd53cce732e31633aea92671b43699 diff --cc _hud_common.cfg index c1f580525,f17e7ac60..c486afb4b --- a/_hud_common.cfg +++ b/_hud_common.cfg @@@ -38,13 -38,14 +38,20 @@@ seta hud_panel_engineinfo_framecounter_ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point" seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster" + seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value" + seta hud_panel_phisics_update_interval 0.0666 "how often (in seconds) numeric values get updated on screen" + + seta hud_panel_itemstime_progressbar_maxtime "30" "when left time is at least this amount, the status bar is full" + seta hud_panel_itemstime_hidespawned "1" "if 1 hide an item from the panel when all the occurrences of it are available again; if 2 hide it when at least one occurrence is available again" + seta hud_panel_itemstime_hidelarge "0" "if 1 hide large armor and health from the panel" + +seta hud_panel_quickmenu_file "" "load the quick menu from this file (empty or 0 to disable)" +seta hud_panel_quickmenu_translatecommands 0 "when the game is translated, translate strings inside commands too (useful for chat commands)" +seta hud_panel_quickmenu_time 5 "quickmenu expires after this number of seconds in the same page" + // hud panel aliases +alias quickmenu "cl_cmd hud quickmenu ${* ?}" + alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" alias +hud_panel_radar_maximized "cl_cmd hud radar 1" alias -hud_panel_radar_maximized "cl_cmd hud radar 0" diff --cc _hud_descriptions.cfg index 834e7a007,1de28cb9f..c882738b2 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@@ -301,23 -301,69 +301,80 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "" "minimum factor for the font size from the subsequent fading effects" seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading in/out effects" - seta hud_panel_buffs "" "enable/disable this panel" - seta hud_panel_buffs_pos "" "position of this panel" - seta hud_panel_buffs_size "" "size of this panel" - seta hud_panel_buffs_bg "" "if set to something else than \"\" = override default background" - seta hud_panel_buffs_bg_color "" "if set to something else than \"\" = override default panel background color" - seta hud_panel_buffs_bg_color_team "" "override panel color with team color in team based games" - seta hud_panel_buffs_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" - seta hud_panel_buffs_bg_border "" "if set to something else than \"\" = override default size of border around the background" - seta hud_panel_buffs_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + seta hud_panel_minigameboard "" "enable/disable this panel" + seta hud_panel_minigameboard_pos "" "position of this panel" + seta hud_panel_minigameboard_size "" "size of this panel" + seta hud_panel_minigameboard_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigameboard_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigameboard_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigameboard_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigameboard_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigameboard_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_minigamestatus "" "enable/disable this panel" + seta hud_panel_minigamestatus_pos "" "position of this panel" + seta hud_panel_minigamestatus_size "" "size of this panel" + seta hud_panel_minigamestatus_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigamestatus_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigamestatus_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigamestatus_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigamestatus_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigamestatus_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_minigamehelp "" "enable/disable this panel" + seta hud_panel_minigamehelp_pos "" "position of this panel" + seta hud_panel_minigamehelp_size "" "size of this panel" + seta hud_panel_minigamehelp_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigamehelp_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigamehelp_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigamehelp_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigamehelp_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigamehelp_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_minigamemenu "" "enable/disable this panel" + seta hud_panel_minigamemenu_pos "" "position of this panel" + seta hud_panel_minigamemenu_size "" "size of this panel" + seta hud_panel_minigamemenu_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_minigamemenu_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_minigamemenu_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_minigamemenu_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_minigamemenu_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_minigamemenu_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_mapvote "" "enable/disable this panel" + seta hud_panel_mapvote_pos "" "position of this panel" + seta hud_panel_mapvote_size "" "size of this panel" + seta hud_panel_mapvote_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_mapvote_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_mapvote_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_mapvote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_mapvote_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_mapvote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + + seta hud_panel_itemstime "" "enable/disable this panel, it shows left time until important items (mega health, large armor, powerups, superweapons, etc...) respawn in the map: 1 when spectating, 2 even playing in warmup stage" + seta hud_panel_itemstime_pos "" "position of this base of the panel" + seta hud_panel_itemstime_size "" "size of this panel" + seta hud_panel_itemstime_bg "" "if set to something else than \"\" = override default background" + seta hud_panel_itemstime_bg_color "" "if set to something else than \"\" = override default panel background color" + seta hud_panel_itemstime_bg_color_team "" "override panel color with team color in team based games" + seta hud_panel_itemstime_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" + seta hud_panel_itemstime_bg_border "" "if set to something else than \"\" = override default size of border around the background" + seta hud_panel_itemstime_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" + seta hud_panel_itemstime_iconalign "" "0 = align icons to the left, 1 = align icons to the right" + seta hud_panel_itemstime_progressbar "" "use progressbar behind icons" + seta hud_panel_itemstime_progressbar_name "" "name of progressbar to use behind icons" + seta hud_panel_itemstime_progressbar_reduced "" "progressbar is displayed only in the text field" + seta hud_panel_itemstime_text "" "show text" + seta hud_panel_itemstime_ratio "" "ratio between space reserved for text and icon width of each item entry (min value is 2)" + seta hud_panel_itemstime_dynamicsize "" "allow panel size reduction by removing spacing among items" + +seta hud_panel_quickmenu "" "enable/disable this panel" +seta hud_panel_quickmenu_pos "" "position of this base of the panel" +seta hud_panel_quickmenu_size "" "size of this panel" +seta hud_panel_quickmenu_bg "" "if set to something else than \"\" = override default background" +seta hud_panel_quickmenu_bg_color "" "if set to something else than \"\" = override default panel background color" +seta hud_panel_quickmenu_bg_color_team "" "override panel color with team color in team based games" +seta hud_panel_quickmenu_bg_alpha "" "if set to something else than \"\" = override default panel background alpha" +seta hud_panel_quickmenu_bg_border "" "if set to something else than \"\" = override default size of border around the background" +seta hud_panel_quickmenu_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_panel_quickmenu_align "" "text alignment: 0 left, 0.5 center, 1 right" diff --cc common.it.po index cba47047c,9e2be21b5..f1c6f506f --- a/common.it.po +++ b/common.it.po @@@ -7242,19 -7475,3 +7475,19 @@@ msgstr "Abilita pannello #, c-format msgid "%s (mutator weapon)" msgstr "%s (arma mutatore)" + + +#: command title is translated +msgid "QMCMD^nice one" +msgstr "bella" + +#: missing translation for this command +msgid "QMCMD^:-) / nice one" +msgstr "" + +#: fully translated command (title and command are the same) +msgid "QMCMD^good game" +msgstr "bella partita" + +msgid "QMCMD^Chat" - msgstr "Parla" ++msgstr "Parla" diff --cc hud_luma.cfg index 0ebb88575,70d0764b6..72c89d260 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@@ -299,25 -299,71 +299,82 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" seta hud_panel_centerprint_fade_minfontsize "0" - seta hud_panel_buffs 1 - seta hud_panel_buffs_pos "0.435000 0.840000" - seta hud_panel_buffs_size "0.125000 0.035000" - seta hud_panel_buffs_bg "0" - seta hud_panel_buffs_bg_color "" - seta hud_panel_buffs_bg_color_team "" - seta hud_panel_buffs_bg_alpha "" - seta hud_panel_buffs_bg_border "" - seta hud_panel_buffs_bg_padding "" + seta hud_panel_mapvote 1 + seta hud_panel_mapvote_pos "0 0" + seta hud_panel_mapvote_size "1 1" + seta hud_panel_mapvote_bg "border_default" + seta hud_panel_mapvote_bg_color "" + seta hud_panel_mapvote_bg_color_team "" + seta hud_panel_mapvote_bg_alpha "" + seta hud_panel_mapvote_bg_border "" + seta hud_panel_mapvote_bg_padding "" + + seta hud_panel_itemstime 2 + seta hud_panel_itemstime_pos "0.030000 0.260000" + seta hud_panel_itemstime_size "0.070000 0.230000" + seta hud_panel_itemstime_bg "border_itemstime" + seta hud_panel_itemstime_bg_color "" + seta hud_panel_itemstime_bg_color_team "" + seta hud_panel_itemstime_bg_alpha "" + seta hud_panel_itemstime_bg_border "" + seta hud_panel_itemstime_bg_padding "" + seta hud_panel_itemstime_iconalign "0" + seta hud_panel_itemstime_progressbar "0" + seta hud_panel_itemstime_progressbar_name "progressbar" + seta hud_panel_itemstime_progressbar_reduced "0" + seta hud_panel_itemstime_text "1" + seta hud_panel_itemstime_ratio "2" + seta hud_panel_itemstime_dynamicsize "1" + + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" +seta hud_panel_quickmenu 1 +seta hud_panel_quickmenu_pos "0.055000 0.445000" +seta hud_panel_quickmenu_size "0.210000 0.225000" +seta hud_panel_quickmenu_bg "" +seta hud_panel_quickmenu_bg_color "" +seta hud_panel_quickmenu_bg_color_team "" +seta hud_panel_quickmenu_bg_alpha "" +seta hud_panel_quickmenu_bg_border "" +seta hud_panel_quickmenu_bg_padding "" +seta hud_panel_quickmenu_align "0" + menu_sync diff --cc hud_luminos.cfg index af05997a4,a1509ae7b..9c0b9ccd9 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" + seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" + seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "18 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 17 " -seta _hud_panelorder "17 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 18" ++seta _hud_panelorder "17 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 18 23 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -299,25 -299,71 +299,82 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" seta hud_panel_centerprint_fade_minfontsize "0" - seta hud_panel_buffs 1 - seta hud_panel_buffs_pos "0.450000 0.855000" - seta hud_panel_buffs_size "0.050000 0.070000" - seta hud_panel_buffs_bg "0" - seta hud_panel_buffs_bg_color "" - seta hud_panel_buffs_bg_color_team "" - seta hud_panel_buffs_bg_alpha "" - seta hud_panel_buffs_bg_border "" - seta hud_panel_buffs_bg_padding "" + seta hud_panel_mapvote 1 + seta hud_panel_mapvote_pos "0 0" + seta hud_panel_mapvote_size "1 1" + seta hud_panel_mapvote_bg "0" + seta hud_panel_mapvote_bg_color "" + seta hud_panel_mapvote_bg_color_team "" + seta hud_panel_mapvote_bg_alpha "" + seta hud_panel_mapvote_bg_border "" + seta hud_panel_mapvote_bg_padding "" + + seta hud_panel_itemstime 2 + seta hud_panel_itemstime_pos "0.030000 0.260000" + seta hud_panel_itemstime_size "0.070000 0.230000" + seta hud_panel_itemstime_bg "border_itemstime" + seta hud_panel_itemstime_bg_color "" + seta hud_panel_itemstime_bg_color_team "" + seta hud_panel_itemstime_bg_alpha "" + seta hud_panel_itemstime_bg_border "" + seta hud_panel_itemstime_bg_padding "" + seta hud_panel_itemstime_iconalign "0" + seta hud_panel_itemstime_progressbar "0" + seta hud_panel_itemstime_progressbar_name "progressbar" + seta hud_panel_itemstime_progressbar_reduced "0" + seta hud_panel_itemstime_text "1" + seta hud_panel_itemstime_ratio "2" + seta hud_panel_itemstime_dynamicsize "1" + + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" +seta hud_panel_quickmenu 1 +seta hud_panel_quickmenu_pos "0.010000 0.410000" +seta hud_panel_quickmenu_size "0.210000 0.250000" +seta hud_panel_quickmenu_bg "" +seta hud_panel_quickmenu_bg_color "" +seta hud_panel_quickmenu_bg_color_team "" +seta hud_panel_quickmenu_bg_alpha "" +seta hud_panel_quickmenu_bg_border "" +seta hud_panel_quickmenu_bg_padding "" +seta hud_panel_quickmenu_align "0" + menu_sync diff --cc hud_luminos_minimal.cfg index 6d85c08b0,e5aec2318..de5998268 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" + seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" + seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "18 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 17 " -seta _hud_panelorder "17 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 18" ++seta _hud_panelorder "17 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 18 23 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -299,25 -299,71 +299,82 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" seta hud_panel_centerprint_fade_minfontsize "0" - seta hud_panel_buffs 1 - seta hud_panel_buffs_pos "0.450000 0.855000" - seta hud_panel_buffs_size "0.050000 0.070000" - seta hud_panel_buffs_bg "0" - seta hud_panel_buffs_bg_color "" - seta hud_panel_buffs_bg_color_team "" - seta hud_panel_buffs_bg_alpha "" - seta hud_panel_buffs_bg_border "" - seta hud_panel_buffs_bg_padding "" + seta hud_panel_mapvote 1 + seta hud_panel_mapvote_pos "0 0" + seta hud_panel_mapvote_size "1 1" + seta hud_panel_mapvote_bg "0" + seta hud_panel_mapvote_bg_color "" + seta hud_panel_mapvote_bg_color_team "" + seta hud_panel_mapvote_bg_alpha "" + seta hud_panel_mapvote_bg_border "" + seta hud_panel_mapvote_bg_padding "" + + seta hud_panel_itemstime 2 + seta hud_panel_itemstime_pos "0.000000 0.310000" + seta hud_panel_itemstime_size "0.070000 0.180000" + seta hud_panel_itemstime_bg "" + seta hud_panel_itemstime_bg_color "" + seta hud_panel_itemstime_bg_color_team "" + seta hud_panel_itemstime_bg_alpha "" + seta hud_panel_itemstime_bg_border "" + seta hud_panel_itemstime_bg_padding "" + seta hud_panel_itemstime_iconalign "0" + seta hud_panel_itemstime_progressbar "0" + seta hud_panel_itemstime_progressbar_name "progressbar" + seta hud_panel_itemstime_progressbar_reduced "0" + seta hud_panel_itemstime_text "1" + seta hud_panel_itemstime_ratio "2" + seta hud_panel_itemstime_dynamicsize "1" + + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" +seta hud_panel_quickmenu 1 +seta hud_panel_quickmenu_pos "0.010000 0.410000" +seta hud_panel_quickmenu_size "0.210000 0.250000" +seta hud_panel_quickmenu_bg "" +seta hud_panel_quickmenu_bg_color "" +seta hud_panel_quickmenu_bg_color_team "" +seta hud_panel_quickmenu_bg_alpha "" +seta hud_panel_quickmenu_bg_border "" +seta hud_panel_quickmenu_bg_padding "" +seta hud_panel_quickmenu_align "0" + menu_sync diff --cc hud_luminos_minimal_xhair.cfg index dd8ac3077,f313b4c43..62b78c41e --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" + seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" + seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "18 15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 17 " -seta _hud_panelorder "17 15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 18" ++seta _hud_panelorder "17 15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 18 23 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -299,25 -299,71 +299,82 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" seta hud_panel_centerprint_fade_minfontsize "0" - seta hud_panel_buffs 1 - seta hud_panel_buffs_pos "0.450000 0.855000" - seta hud_panel_buffs_size "0.050000 0.070000" - seta hud_panel_buffs_bg "0" - seta hud_panel_buffs_bg_color "" - seta hud_panel_buffs_bg_color_team "" - seta hud_panel_buffs_bg_alpha "" - seta hud_panel_buffs_bg_border "" - seta hud_panel_buffs_bg_padding "" + seta hud_panel_mapvote 1 + seta hud_panel_mapvote_pos "0 0" + seta hud_panel_mapvote_size "1 1" + seta hud_panel_mapvote_bg "0" + seta hud_panel_mapvote_bg_color "" + seta hud_panel_mapvote_bg_color_team "" + seta hud_panel_mapvote_bg_alpha "" + seta hud_panel_mapvote_bg_border "" + seta hud_panel_mapvote_bg_padding "" + + seta hud_panel_itemstime 2 + seta hud_panel_itemstime_pos "0.000000 0.310000" + seta hud_panel_itemstime_size "0.070000 0.180000" + seta hud_panel_itemstime_bg "" + seta hud_panel_itemstime_bg_color "" + seta hud_panel_itemstime_bg_color_team "" + seta hud_panel_itemstime_bg_alpha "" + seta hud_panel_itemstime_bg_border "" + seta hud_panel_itemstime_bg_padding "" + seta hud_panel_itemstime_iconalign "0" + seta hud_panel_itemstime_progressbar "0" + seta hud_panel_itemstime_progressbar_name "progressbar" + seta hud_panel_itemstime_progressbar_reduced "0" + seta hud_panel_itemstime_text "1" + seta hud_panel_itemstime_ratio "2" + seta hud_panel_itemstime_dynamicsize "1" + + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" +seta hud_panel_quickmenu 1 +seta hud_panel_quickmenu_pos "0.010000 0.410000" +seta hud_panel_quickmenu_size "0.210000 0.250000" +seta hud_panel_quickmenu_bg "" +seta hud_panel_quickmenu_bg_color "" +seta hud_panel_quickmenu_bg_color_team "" +seta hud_panel_quickmenu_bg_alpha "" +seta hud_panel_quickmenu_bg_border "" +seta hud_panel_quickmenu_bg_padding "" +seta hud_panel_quickmenu_align "0" + menu_sync diff --cc hud_luminos_old.cfg index fd5c13b92,4d27482b0..29fa1df66 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" + seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" + seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "18 15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 17 " -seta _hud_panelorder "17 15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 18" ++seta _hud_panelorder "17 15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 18 23 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -299,25 -299,71 +299,82 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" seta hud_panel_centerprint_fade_minfontsize "0" - seta hud_panel_buffs 1 - seta hud_panel_buffs_pos "0.450000 0.855000" - seta hud_panel_buffs_size "0.050000 0.070000" - seta hud_panel_buffs_bg "0" - seta hud_panel_buffs_bg_color "" - seta hud_panel_buffs_bg_color_team "" - seta hud_panel_buffs_bg_alpha "" - seta hud_panel_buffs_bg_border "" - seta hud_panel_buffs_bg_padding "" + seta hud_panel_mapvote 1 + seta hud_panel_mapvote_pos "0 0" + seta hud_panel_mapvote_size "1 1" + seta hud_panel_mapvote_bg "0" + seta hud_panel_mapvote_bg_color "" + seta hud_panel_mapvote_bg_color_team "" + seta hud_panel_mapvote_bg_alpha "" + seta hud_panel_mapvote_bg_border "" + seta hud_panel_mapvote_bg_padding "" + + seta hud_panel_itemstime 2 + seta hud_panel_itemstime_pos "0.020000 0.490000" + seta hud_panel_itemstime_size "0.090000 0.140000" + seta hud_panel_itemstime_bg "0" + seta hud_panel_itemstime_bg_color "" + seta hud_panel_itemstime_bg_color_team "" + seta hud_panel_itemstime_bg_alpha "" + seta hud_panel_itemstime_bg_border "" + seta hud_panel_itemstime_bg_padding "" + seta hud_panel_itemstime_iconalign "0" + seta hud_panel_itemstime_progressbar "1" + seta hud_panel_itemstime_progressbar_name "progressbar" + seta hud_panel_itemstime_progressbar_reduced "1" + seta hud_panel_itemstime_text "1" + seta hud_panel_itemstime_ratio "3.5" + seta hud_panel_itemstime_dynamicsize "1" + + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" +seta hud_panel_quickmenu 1 +seta hud_panel_quickmenu_pos "0.700000 0.460000" +seta hud_panel_quickmenu_size "0.210000 0.250000" +seta hud_panel_quickmenu_bg "" +seta hud_panel_quickmenu_bg_color "" +seta hud_panel_quickmenu_bg_color_team "" +seta hud_panel_quickmenu_bg_alpha "" +seta hud_panel_quickmenu_bg_border "" +seta hud_panel_quickmenu_bg_padding "" +seta hud_panel_quickmenu_align "1" + menu_sync diff --cc hud_nexuiz.cfg index 24959fb8b,5eb75cfde..c706b7a7c --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@@ -23,8 -23,10 +23,10 @@@ seta hud_progressbar_nexball_color "0. seta hud_progressbar_speed_color "1 0.75 0" seta hud_progressbar_acceleration_color "0.5 0.75 1" seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5" + seta hud_progressbar_vehicles_ammo1_color "0.8 0.7 0" + seta hud_progressbar_vehicles_ammo2_color "0.7 0.4 0" - seta _hud_panelorder "18 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 17 " -seta _hud_panelorder "17 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 18" ++seta _hud_panelorder "17 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 18 23 " seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.01" @@@ -299,25 -299,71 +299,82 @@@ seta hud_panel_centerprint_fade_subsequ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" seta hud_panel_centerprint_fade_minfontsize "0" - seta hud_panel_buffs 1 - seta hud_panel_buffs_pos "0.450000 0.855000" - seta hud_panel_buffs_size "0.050000 0.070000" - seta hud_panel_buffs_bg "0" - seta hud_panel_buffs_bg_color "" - seta hud_panel_buffs_bg_color_team "" - seta hud_panel_buffs_bg_alpha "" - seta hud_panel_buffs_bg_border "" - seta hud_panel_buffs_bg_padding "" + seta hud_panel_mapvote 1 + seta hud_panel_mapvote_pos "0 0" + seta hud_panel_mapvote_size "1 1" + seta hud_panel_mapvote_bg "0" + seta hud_panel_mapvote_bg_color "" + seta hud_panel_mapvote_bg_color_team "" + seta hud_panel_mapvote_bg_alpha "" + seta hud_panel_mapvote_bg_border "" + seta hud_panel_mapvote_bg_padding "" + + seta hud_panel_itemstime 2 + seta hud_panel_itemstime_pos "0.000000 0.290000" + seta hud_panel_itemstime_size "0.150000 0.060000" + seta hud_panel_itemstime_bg "0" + seta hud_panel_itemstime_bg_color "" + seta hud_panel_itemstime_bg_color_team "" + seta hud_panel_itemstime_bg_alpha "" + seta hud_panel_itemstime_bg_border "" + seta hud_panel_itemstime_bg_padding "" + seta hud_panel_itemstime_iconalign "0" + seta hud_panel_itemstime_progressbar "0" + seta hud_panel_itemstime_progressbar_name "progressbar" + seta hud_panel_itemstime_progressbar_reduced "0" + seta hud_panel_itemstime_text "1" + seta hud_panel_itemstime_ratio "2" + seta hud_panel_itemstime_dynamicsize "1" + + seta hud_panel_minigameboard "1" + seta hud_panel_minigameboard_pos "0.22 0.15" + seta hud_panel_minigameboard_size "0.50 0.60" + seta hud_panel_minigameboard_bg "border_small" + seta hud_panel_minigameboard_bg_color "" + seta hud_panel_minigameboard_bg_color_team "" + seta hud_panel_minigameboard_bg_alpha "" + seta hud_panel_minigameboard_bg_border "" + seta hud_panel_minigameboard_bg_padding "" + + seta hud_panel_minigamestatus "1" + seta hud_panel_minigamestatus_pos "0.74 0.15" + seta hud_panel_minigamestatus_size "0.2 0.60" + seta hud_panel_minigamestatus_bg "border_small" + seta hud_panel_minigamestatus_bg_color "" + seta hud_panel_minigamestatus_bg_color_team "" + seta hud_panel_minigamestatus_bg_alpha "" + seta hud_panel_minigamestatus_bg_border "" + seta hud_panel_minigamestatus_bg_padding "" + + seta hud_panel_minigamehelp "1" + seta hud_panel_minigamehelp_pos "0.22 0.78" + seta hud_panel_minigamehelp_size "0.50 0.20" + seta hud_panel_minigamehelp_bg "" + seta hud_panel_minigamehelp_bg_color "" + seta hud_panel_minigamehelp_bg_color_team "" + seta hud_panel_minigamehelp_bg_alpha "" + seta hud_panel_minigamehelp_bg_border "" + seta hud_panel_minigamehelp_bg_padding "" + + seta hud_panel_minigamemenu "0" + seta hud_panel_minigamemenu_pos "0 0.26" + seta hud_panel_minigamemenu_size "0.2 0.49" + seta hud_panel_minigamemenu_bg "border_small" + seta hud_panel_minigamemenu_bg_color "" + seta hud_panel_minigamemenu_bg_color_team "" + seta hud_panel_minigamemenu_bg_alpha "" + seta hud_panel_minigamemenu_bg_border "" + seta hud_panel_minigamemenu_bg_padding "" +seta hud_panel_quickmenu 1 +seta hud_panel_quickmenu_pos "0.010000 0.380000" +seta hud_panel_quickmenu_size "0.210000 0.250000" +seta hud_panel_quickmenu_bg "" +seta hud_panel_quickmenu_bg_color "" +seta hud_panel_quickmenu_bg_color_team "" +seta hud_panel_quickmenu_bg_alpha "" +seta hud_panel_quickmenu_bg_border "" +seta hud_panel_quickmenu_bg_padding "" +seta hud_panel_quickmenu_align "0" + menu_sync diff --cc qcsrc/client/command/cl_cmd.qc index 5ea587b9d,9fe33a4fc..a93d66745 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@@ -252,15 -254,15 +254,24 @@@ void LocalCommand_hud(int request, int return; } + case "quickmenu": + { + if(QuickMenu_IsOpened()) + QuickMenu_Close(); + else + QuickMenu_Open(argv(2), argv(3)); // mode, submenu + return; + } + + case "minigame": + { + if(HUD_MinigameMenu_IsOpened()) + HUD_MinigameMenu_Close(); + else + HUD_MinigameMenu_Open(); + return; + } + case "save": { if(argv(2)) @@@ -306,7 -314,7 +323,7 @@@ print(" 'configname' is the name to save to for \"save\" action,\n"); print(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n"); print(" and 'layout' is how to organize the scoreboard columns for the set action.\n"); - print(" Full list of commands here: \"configure, quickmenu, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); - print(" Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); ++ print(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); return; } } diff --cc qcsrc/client/hud.qc index 90c9979aa,7125739cf..74eeff1ac --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@@ -4493,71 -4813,11 +4813,17 @@@ void HUD_CenterPrint (void } } - // Buffs (#17) - // - void HUD_Buffs(void) - { - int buffs = getstati(STAT_BUFFS, 0, 24); - if(!autocvar__hud_configure) - { - if(!autocvar_hud_panel_buffs) return; - if(spectatee_status == -1) return; - if(getstati(STAT_HEALTH) <= 0) return; - if(!buffs) return; - } - else - { - buffs = Buff_Type_first.items; // force first buff - } - - int b = 0; // counter to tell other functions that we have buffs - entity e; - string s = ""; - for(e = Buff_Type_first; e; e = e.enemy) if(buffs & e.items) - { - ++b; - string o = strcat(rgb_to_hexcolor(Buff_Color(e.items)), Buff_PrettyName(e.items)); - if(s == "") - s = o; - else - s = strcat(s, " ", o); - } - - HUD_Panel_UpdateCvars(); - - draw_beginBoldFont(); - - vector pos, mySize; - pos = panel_pos; - mySize = panel_size; - - HUD_Panel_DrawBg(bound(0, b, 1)); - if(panel_bg_padding) - { - pos += '1 1 0' * panel_bg_padding; - mySize -= '2 2 0' * panel_bg_padding; - } - //float panel_ar = mySize_x/mySize_y; - //bool is_vertical = (panel_ar < 1); - //float buff_iconalign = autocvar_hud_panel_buffs_iconalign; - vector buff_offset = '0 0 0'; + // Minigame + // + #include "../common/minigames/cl_minigames_hud.qc" - for(e = Buff_Type_first; e; e = e.enemy) if(buffs & e.items) - { - //DrawNumIcon(pos + buff_offset, mySize, shield, "shield", is_vertical, buff_iconalign, '1 1 1', 1); - drawcolorcodedstring_aspect(pos + buff_offset, s, mySize, panel_fg_alpha * 0.5, DRAWFLAG_NORMAL); - } + - draw_endBoldFont(); - } - - // QuickMenu (#18) ++// QuickMenu (#23) +// +#include "quickmenu.qc" + + - /* ================== Main HUD system @@@ -4703,11 -4977,9 +4983,11 @@@ void HUD_Main (void hud_draw_maximized = 1; // panels that may be maximized must check this var // draw maximized panels on top if(hud_panel_radar_maximized) - (panel = HUD_PANEL(RADAR)).panel_draw(); + HUD_Panel_Draw(HUD_PANEL(RADAR)); if(autocvar__con_chat_maximized) - (panel = HUD_PANEL(CHAT)).panel_draw(); + HUD_Panel_Draw(HUD_PANEL(CHAT)); + if(hud_panel_quickmenu) - (panel = HUD_PANEL(QUICKMENU)).panel_draw(); ++ HUD_Panel_Draw(HUD_PANEL(QUICKMENU)); HUD_Configure_PostDraw(); diff --cc qcsrc/client/hud.qh index 79d025976,9850b78d2..d30eea145 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@@ -25,12 -35,6 +35,8 @@@ int vote_prev; // previous state of vot float vote_alpha; float vote_change; // "time" when vote_active changed - float hud_draw_maximized; - float hud_panel_radar_maximized; +float hud_panel_quickmenu; - float chat_panel_modified; - float radar_panel_modified; + vector mousepos; vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) vector panel_click_resizeorigin; // coordinates for opposite point when resizing @@@ -114,17 -118,28 +120,27 @@@ string panel_bg_padding_str class(HUDPanel) .void() panel_draw; - float current_player; + // chat panel can be reduced / moved while the mapvote is active + // let know the mapvote panel about chat pos and size + float chat_posy; + float chat_sizey; - float mv_active; + float current_player; -float GetPlayerColorForce(int i); - float stringwidth_colors(string s, vector theSize); +float stringwidth_nocolors(string s, vector theSize); +float GetPlayerColorForce(int i); int GetPlayerColor(int i); string GetPlayerName(int i); -float stringwidth_nocolors(string s, vector theSize); void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag); + .int panel_showflags; + const int PANEL_SHOW_NEVER = 0x00; + const int PANEL_SHOW_MAINGAME = 0x01; + const int PANEL_SHOW_MINIGAME = 0x02; + const int PANEL_SHOW_ALWAYS = 0xff; + bool HUD_Panel_CheckFlags(int showflags); + // prev_* vars contain the health/armor at the previous FRAME // set to -1 when player is dead or was not playing @@@ -138,30 -153,34 +154,37 @@@ float old_p_healthtime, old_p_armortime // set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h) int prev_p_health, prev_p_armor; - - #define HUD_PANELS(HUD_PANEL) \ - HUD_PANEL(WEAPONS , HUD_Weapons , weapons) \ - HUD_PANEL(AMMO , HUD_Ammo , ammo) \ - HUD_PANEL(POWERUPS , HUD_Powerups , powerups) \ - HUD_PANEL(HEALTHARMOR , HUD_HealthArmor , healtharmor) \ - HUD_PANEL(NOTIFY , HUD_Notify , notify) \ - HUD_PANEL(TIMER , HUD_Timer , timer) \ - HUD_PANEL(RADAR , HUD_Radar , radar) \ - HUD_PANEL(SCORE , HUD_Score , score) \ - HUD_PANEL(RACETIMER , HUD_RaceTimer , racetimer) \ - HUD_PANEL(VOTE , HUD_Vote , vote) \ - HUD_PANEL(MODICONS , HUD_ModIcons , modicons) \ - HUD_PANEL(PRESSEDKEYS , HUD_PressedKeys , pressedkeys) \ - HUD_PANEL(CHAT , HUD_Chat , chat) \ - HUD_PANEL(ENGINEINFO , HUD_EngineInfo , engineinfo) \ - HUD_PANEL(INFOMESSAGES , HUD_InfoMessages , infomessages) \ - HUD_PANEL(PHYSICS , HUD_Physics , physics) \ - HUD_PANEL(CENTERPRINT , HUD_CenterPrint , centerprint) \ - HUD_PANEL(BUFFS , HUD_Buffs , buffs) \ - HUD_PANEL(QUICKMENU , HUD_QuickMenu , quickmenu) \ + void HUD_ItemsTime(); + + #define HUD_PANELS(HUD_PANEL) \ + HUD_PANEL(WEAPONS , HUD_Weapons , weapons, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(AMMO , HUD_Ammo , ammo, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(POWERUPS , HUD_Powerups , powerups, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(HEALTHARMOR , HUD_HealthArmor , healtharmor, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(NOTIFY , HUD_Notify , notify, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(TIMER , HUD_Timer , timer, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(RADAR , HUD_Radar , radar, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(SCORE , HUD_Score , score, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(RACETIMER , HUD_RaceTimer , racetimer, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(VOTE , HUD_Vote , vote, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(MODICONS , HUD_ModIcons , modicons, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(PRESSEDKEYS , HUD_PressedKeys , pressedkeys, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(CHAT , HUD_Chat , chat, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(ENGINEINFO , HUD_EngineInfo , engineinfo, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(INFOMESSAGES , HUD_InfoMessages , infomessages, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(PHYSICS , HUD_Physics , physics, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(CENTERPRINT , HUD_CenterPrint , centerprint, PANEL_SHOW_MAINGAME ) \ + HUD_PANEL(MINIGAME_BOARD, HUD_MinigameBoard ,minigameboard, PANEL_SHOW_MINIGAME ) \ + HUD_PANEL(MINIGAME_STATUS,HUD_MinigameStatus,minigamestatus,PANEL_SHOW_MINIGAME ) \ + HUD_PANEL(MINIGAME_HELP, HUD_MinigameHelp ,minigamehelp, PANEL_SHOW_MINIGAME ) \ + HUD_PANEL(MINIGAME_MENU, HUD_MinigameMenu ,minigamemenu, PANEL_SHOW_ALWAYS ) \ + HUD_PANEL(MAPVOTE , MapVote_Draw ,mapvote, PANEL_SHOW_ALWAYS ) \ - HUD_PANEL(ITEMSTIME , HUD_ItemsTime ,itemstime, PANEL_SHOW_MAINGAME ) ++ HUD_PANEL(ITEMSTIME , HUD_ItemsTime ,itemstime, PANEL_SHOW_MAINGAME ) \ ++ HUD_PANEL(QUICKMENU , HUD_QuickMenu , quickmenu, PANEL_SHOW_MAINGAME ) \ + // always add new panels to the end of list + - #define HUD_PANEL(NAME, draw_func, name) \ + + #define HUD_PANEL(NAME, draw_func, name, showflags) \ int HUD_PANEL_##NAME; \ void draw_func(void); \ void RegisterHUD_Panel_##NAME() { \ diff --cc qcsrc/client/hud_config.qc index 05084e00c,ca7fde9e0..72e3fdcc0 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@@ -202,8 -201,14 +201,16 @@@ void HUD_Panel_ExportCfg(string cfgname HUD_Write_PanelCvar_q("_fade_subsequent_minfontsize"); HUD_Write_PanelCvar_q("_fade_minfontsize"); break; + case HUD_PANEL_ITEMSTIME: + HUD_Write_PanelCvar_q("_iconalign"); + HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_progressbar_name"); + HUD_Write_PanelCvar_q("_progressbar_reduced"); + HUD_Write_PanelCvar_q("_text"); + HUD_Write_PanelCvar_q("_ratio"); + HUD_Write_PanelCvar_q("_dynamicsize"); + case HUD_PANEL_QUICKMENU: + HUD_Write_PanelCvar_q("_align"); break; } HUD_Write("\n"); diff --cc qcsrc/client/main.qc index 0568e2a60,da485708e..f5d93a6de --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@@ -360,9 -373,9 +373,12 @@@ float CSQC_InputEvent(float bInputType if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary)) return true; + if (QuickMenu_InputEvent(bInputType, nPrimary, nSecondary)) + return true; + + if ( HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary) ) + return true; + if (MapVote_InputEvent(bInputType, nPrimary, nSecondary)) return true; diff --cc qcsrc/client/scoreboard.qc index 615945187,a24b94379..59dd4b50d --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@@ -964,8 -961,8 +961,10 @@@ vector HUD_Scoreboard_MakeTable(vector float HUD_WouldDrawScoreboard() { if (autocvar__hud_configure) return 0; + else if (QuickMenu_IsOpened()) + return 0; + else if (HUD_Radar_Clickable()) + return 0; else if (scoreboard_showscores) return 1; else if (intermission == 1) diff --cc qcsrc/client/view.qc index 33b04938f,9b4eddd48..273c87e3f --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@@ -1780,22 -1837,16 +1837,18 @@@ void CSQC_UpdateView(float w, float h if(autocvar__hud_configure) HUD_Panel_Mouse(); + else if ( HUD_MinigameMenu_IsOpened() || minigame_isactive() ) + HUD_Minigame_Mouse(); + else if(QuickMenu_IsOpened()) + QuickMenu_Mouse(); + else + HUD_Radar_Mouse(); - if(hud && !intermission) - { - if(hud == HUD_SPIDERBOT) - CSQC_SPIDER_HUD(); - else if(hud == HUD_WAKIZASHI) - CSQC_WAKIZASHI_HUD(); - else if(hud == HUD_RAPTOR) - CSQC_RAPTOR_HUD(); - else if(hud == HUD_BUMBLEBEE) - CSQC_BUMBLE_HUD(); - else if(hud == HUD_BUMBLEBEE_GUN) - CSQC_BUMBLE_GUN_HUD(); - } + if(hud && !intermission) + if(hud == HUD_BUMBLEBEE_GUN) + CSQC_BUMBLE_GUN_HUD(); + else + VEH_ACTION(hud, VR_HUD); cl_notice_run(); diff --cc qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc index 32aa6f7d5,000000000..4d468452d mode 100644,000000..100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qc @@@ -1,31 -1,0 +1,31 @@@ +#ifndef DIALOG_HUDPANEL_QUICKMENU_H +#define DIALOG_HUDPANEL_QUICKMENU_H +#include "rootdialog.qc" +CLASS(XonoticHUDQuickMenuDialog, XonoticRootDialog) - METHOD(XonoticHUDQuickMenuDialog, fill, void(entity)) ++ METHOD(XonoticHUDQuickMenuDialog, fill, void(entity)); + ATTRIB(XonoticHUDQuickMenuDialog, title, string, _("Quick Menu Panel")) + ATTRIB(XonoticHUDQuickMenuDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) + ATTRIB(XonoticHUDQuickMenuDialog, intendedWidth, float, 0.4) + ATTRIB(XonoticHUDQuickMenuDialog, rows, float, 15) + ATTRIB(XonoticHUDQuickMenuDialog, columns, float, 4) + ATTRIB(XonoticHUDQuickMenuDialog, name, string, "HUDquickmenu") +ENDCLASS(XonoticHUDQuickMenuDialog) +#endif + +#ifdef IMPLEMENTATION +void XonoticHUDQuickMenuDialog_fill(entity me) +{ + entity e; + string panelname = "quickmenu"; + + DIALOG_HUDPANEL_COMMON_NOTOGGLE(); + + me.TR(me); + me.TD(me, 1, 4, e = makeXonoticTextLabel(0, _("Text alignment:"))); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3.8/3, e = makeXonoticRadioButton(3, "hud_panel_quickmenu_align", "0", _("Left"))); + me.TD(me, 1, 3.8/3, e = makeXonoticRadioButton(3, "hud_panel_quickmenu_align", "0.5", _("Center"))); + me.TD(me, 1, 3.8/3, e = makeXonoticRadioButton(3, "hud_panel_quickmenu_align", "1", _("Right"))); +} +#endif diff --cc qcsrc/menu/xonotic/mainwindow.qc index 34fb7d10b,eafa1842f..244d6b2b2 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@@ -136,10 -132,6 +132,10 @@@ void MainWindow_configureMainWindow(ent i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + i = NEW(XonoticHUDQuickMenuDialog); + i.configureDialog(i); - me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); ++ me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + // dialogs used by settings me.userbindEditDialog = i = NEW(XonoticUserbindEditDialog); i.configureDialog(i);