From: terencehill Date: Thu, 23 Jun 2016 16:58:13 +0000 (+0200) Subject: Merge branch 'master' into terencehill/infomessages_panel_update X-Git-Tag: xonotic-v0.8.2~758^2~5 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fc15d72b041c9a748b605ba28735380fbe5b5b01;hp=-c Merge branch 'master' into terencehill/infomessages_panel_update --- fc15d72b041c9a748b605ba28735380fbe5b5b01 diff --combined _hud_common.cfg index e1fde9b1d6,d8c7713f19..65046cafbb --- a/_hud_common.cfg +++ b/_hud_common.cfg @@@ -95,9 -95,6 +95,9 @@@ seta hud_panel_quickmenu_file "" "load 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 ${* ?}" @@@ -114,9 -111,9 +114,9 @@@ seta hud_dynamic_follow_scale 0.01 "HU 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 90 "damage value at which the HUD shake effect is maximum" + 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.4 "HUD shake scale" + 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"