Merge branch 'master' into terencehill/infomessages_panel_update

[xonotic/xonotic-data.pk3dir.git] / _hud_common.cfg

diff --git a/_hud_common.cfg b/_hud_common.cfg
index e58a449a26ba99ae38d513857947cf2af3b557da..65046cafbbdc4f7028a798c5d13b9d6b74db7acf 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -20,6 +20,49 @@ seta hud_colorset_kill_3 "4" "'good' or 'beneficial' text (you fragging someone,
 seta hud_colorset_background "7" "neutral/unimportant text"
 
 // general hud panel cvars (i.e. shouldn't be adjusted by a skin config)
+seta hud_panel_weapons          1 "enable this panel"
+seta hud_panel_ammo             1 "enable this panel"
+seta hud_panel_powerups         1 "enable this panel"
+seta hud_panel_healtharmor      1 "enable this panel"
+seta hud_panel_notify           1 "enable this panel"
+seta hud_panel_timer            1 "enable this panel"
+seta hud_panel_radar            1 "enable this panel, 2 = also enable in non-teambased gamemodes"
+seta hud_panel_score            1 "enable this panel"
+seta hud_panel_racetimer        1 "enable this panel"
+seta hud_panel_vote             1 "enable this panel"
+seta hud_panel_modicons         1 "enable this panel"
+seta hud_panel_pressedkeys      1 "enable this panel, 1 = show only when spectating other players, 2 = show always"
+seta hud_panel_chat             1 "enable this panel"
+seta hud_panel_engineinfo       0 "enable this panel"
+seta hud_panel_infomessages     1 "enable this panel"
+seta hud_panel_physics          3 "enable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing"
+seta hud_panel_centerprint      1 "enable this panel"
+seta hud_panel_minigameboard    1 "enable this panel"
+seta hud_panel_minigamestatus   1 "enable this panel"
+seta hud_panel_minigamehelp     1 "enable this panel"
+seta hud_panel_minigamemenu     0 "enable this panel"
+seta hud_panel_mapvote          1 "enable this panel"
+seta hud_panel_itemstime        2 "enable this panel, 1 = show when spectating, 2 = even playing in warmup stage"
+seta hud_panel_quickmenu        1 "enable this panel"
+
+seta hud_panel_weapons_dynamichud          1 "apply the dynamic hud effects to this panel"
+seta hud_panel_ammo_dynamichud             1 "apply the dynamic hud effects to this panel"
+seta hud_panel_powerups_dynamichud         1 "apply the dynamic hud effects to this panel"
+seta hud_panel_healtharmor_dynamichud      1 "apply the dynamic hud effects to this panel"
+seta hud_panel_notify_dynamichud           1 "apply the dynamic hud effects to this panel"
+seta hud_panel_timer_dynamichud            1 "apply the dynamic hud effects to this panel"
+seta hud_panel_radar_dynamichud            1 "apply the dynamic hud effects to this panel"
+seta hud_panel_score_dynamichud            1 "apply the dynamic hud effects to this panel"
+seta hud_panel_racetimer_dynamichud        1 "apply the dynamic hud effects to this panel"
+seta hud_panel_vote_dynamichud             1 "apply the dynamic hud effects to this panel"
+seta hud_panel_modicons_dynamichud         1 "apply the dynamic hud effects to this panel"
+seta hud_panel_pressedkeys_dynamichud      1 "apply the dynamic hud effects to this panel"
+seta hud_panel_engineinfo_dynamichud       1 "apply the dynamic hud effects to this panel"
+seta hud_panel_infomessages_dynamichud     0 "apply the dynamic hud effects to this panel"
+seta hud_panel_physics_dynamichud          1 "apply the dynamic hud effects to this panel"
+seta hud_panel_centerprint_dynamichud      1 "apply the dynamic hud effects to this panel"
+seta hud_panel_itemstime_dynamichud        1 "apply the dynamic hud effects to this panel"
+
 seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_cells 180 "show 100% of the status bar at this ammo count"
@@ -52,6 +95,9 @@ seta hud_panel_quickmenu_file "" "load the quick menu from this file (empty or 0
 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"
 
+seta hud_panel_infomessages_group_time 6 "number of seconds a message of a group lasts before it gets changed"
+seta hud_panel_infomessages_group_fadetime 0.4 "group message fade in/out time"
+
 // hud panel aliases
 alias quickmenu "cl_cmd hud quickmenu ${* ?}"
 
@@ -63,8 +109,14 @@ alias hud_panel_radar_maximized "cl_cmd hud radar"
 // other hud cvars
 seta hud_panel_update_interval 2 "how often (in seconds) common panel cvars are reloaded"
 
-seta hud_dynamic_follow 1 "HUD moves around following player's movement (effect shared with cl_followmodel, can be enabled independently from it though)"
+seta hud_dynamic_follow 0 "HUD moves around following player's movement (effect shared with cl_followmodel, can be enabled independently from it though)"
 seta hud_dynamic_follow_scale 0.01 "HUD following scale"
+seta hud_dynamic_follow_scale_xyz "1 1 1" "HUD following scale for the x, y and z axis"
+
+seta hud_dynamic_shake 1 "shake the HUD when hurt"
+seta hud_dynamic_shake_damage_max 130 "damage value at which the HUD shake effect is maximum"
+seta hud_dynamic_shake_damage_min 10 "damage value at which the HUD shake effect is minimum"
+seta hud_dynamic_shake_scale 0.2 "HUD shake scale"
 
 seta hud_showbinds 1   "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both"
 seta hud_showbinds_limit 2     "maximum number of bound keys to show for a command. 0 for unlimited"