From: terencehill Date: Tue, 4 Aug 2015 16:11:26 +0000 (+0200) Subject: Merge branch 'master' into terencehill/itemstime X-Git-Tag: xonotic-v0.8.1~12^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a4877cd66f71e3d958152d13c51f95c8ad94b18;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/itemstime Conflicts: _hud_descriptions.cfg hud_luma.cfg hud_luminos.cfg hud_luminos_minimal.cfg hud_luminos_minimal_xhair.cfg hud_luminos_old.cfg hud_nexuiz.cfg qcsrc/client/hud.qh qcsrc/common/stats.qh --- 3a4877cd66f71e3d958152d13c51f95c8ad94b18 diff --cc _hud_descriptions.cfg index 163524c95,7657bddc8..17ea14fbb --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@@ -313,20 -315,12 +315,30 @@@ seta hud_panel_buffs_bg_alpha "" "if se 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_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_showspawned "" "show icons of already spawned items" +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_size_dinamic "" "reduce panel size by removing spacing beetwen items" diff --cc hud_luma.cfg index d0614c316,e6312c1ac..c94f3dfb4 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@@ -26,7 -26,7 +26,7 @@@ seta hud_progressbar_acceleration_neg_c seta hud_progressbar_vehicles_ammo1_color "0.77 0.67 0" seta hud_progressbar_vehicles_ammo2_color "0.86 0.35 0" - seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 17 " -seta _hud_panelorder "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 " ++seta _hud_panelorder "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 18" seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.005000" @@@ -311,22 -313,14 +313,32 @@@ 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_showspawned "0" +seta hud_panel_itemstime_text "1" +seta hud_panel_itemstime_ratio "2" +seta hud_panel_itemstime_size_dinamic "1" + menu_sync diff --cc hud_luminos.cfg index 5d2c55672,56f696f3e..80b3ddefc --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@@ -26,7 -26,7 +26,7 @@@ seta hud_progressbar_acceleration_neg_c 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 "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 " ++seta _hud_panelorder "17 15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 18" seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -311,22 -313,14 +313,32 @@@ 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_showspawned "0" +seta hud_panel_itemstime_text "1" +seta hud_panel_itemstime_ratio "2" +seta hud_panel_itemstime_size_dinamic "1" + menu_sync diff --cc hud_luminos_minimal.cfg index 447fda8a2,e5829e035..6c9cf3d2d --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@@ -26,7 -26,7 +26,7 @@@ seta hud_progressbar_acceleration_neg_c 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 "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 " ++seta _hud_panelorder "17 10 3 0 14 6 9 13 4 1 2 11 12 7 5 8 15 16 18" seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -311,22 -313,14 +313,32 @@@ 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_showspawned "0" +seta hud_panel_itemstime_text "1" +seta hud_panel_itemstime_ratio "2" +seta hud_panel_itemstime_size_dinamic "1" + menu_sync diff --cc hud_luminos_minimal_xhair.cfg index 4fe2a1fd9,126d22310..ac7a82866 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@@ -26,7 -26,7 +26,7 @@@ seta hud_progressbar_acceleration_neg_c 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 "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 " ++seta _hud_panelorder "17 15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 16 18" seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -311,22 -313,14 +313,32 @@@ 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_showspawned "0" +seta hud_panel_itemstime_text "1" +seta hud_panel_itemstime_ratio "2" +seta hud_panel_itemstime_size_dinamic "1" + menu_sync diff --cc hud_luminos_old.cfg index c3e759c4f,aed07d9ce..5f949a03c --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@@ -26,7 -26,7 +26,7 @@@ seta hud_progressbar_acceleration_neg_c 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 "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 " ++seta _hud_panelorder "17 15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 18" seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.010000" @@@ -311,22 -313,14 +313,32 @@@ 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_showspawned "0" +seta hud_panel_itemstime_text "1" +seta hud_panel_itemstime_ratio "3.5" +seta hud_panel_itemstime_size_dinamic "1" + menu_sync diff --cc hud_nexuiz.cfg index b08937f62,d950703f9..a04276b2d --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@@ -26,7 -26,7 +26,7 @@@ seta hud_progressbar_acceleration_neg_c 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 "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 " ++seta _hud_panelorder "17 15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 16 18" seta hud_configure_grid "1" seta hud_configure_grid_xsize "0.01" @@@ -311,22 -313,14 +313,32 @@@ 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_showspawned "0" +seta hud_panel_itemstime_text "1" +seta hud_panel_itemstime_ratio "2" +seta hud_panel_itemstime_size_dinamic "1" + menu_sync diff --cc qcsrc/client/hud.qh index 90a17b80b,8e0b96586..0bd85defc --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@@ -156,7 -161,7 +161,8 @@@ int prev_p_health, prev_p_armor HUD_PANEL(PHYSICS , HUD_Physics , physics) \ HUD_PANEL(CENTERPRINT , HUD_CenterPrint , centerprint) \ HUD_PANEL(BUFFS , HUD_Buffs , buffs) \ + HUD_PANEL(MAPVOTE , MapVote_Draw , mapvote) \ + HUD_PANEL(ITEMSTIME , HUD_ItemsTime , itemstime) \ // always add new panels to the end of list #define HUD_PANEL(NAME, draw_func, name) \ diff --cc qcsrc/common/stats.qh index dbe9a1390,fdb9da2a9..7c915696d --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@@ -170,12 -171,10 +170,10 @@@ const int STAT_PL_CROUCH_MAX3 const int STAT_PL_CROUCH_VIEW_OFS1 = 117; const int STAT_PL_CROUCH_VIEW_OFS2 = 118; const int STAT_PL_CROUCH_VIEW_OFS3 = 119; -// 120 empty? -// 121 empty? -// 122 empty? -// 123 empty? +const int STAT_WEAPONSINMAP = 120; +const int STAT_WEAPONSINMAP2 = 121; +const int STAT_WEAPONSINMAP3 = 122; - // 121 empty? - // 122 empty? - // 123 empty? ++const int STAT_CTF_FLAGSTATUS = 123; // 124 empty? // 125 empty? // 126 empty?