From: terencehill Date: Tue, 19 Mar 2013 16:34:21 +0000 (+0100) Subject: Merge branch 'master' into terencehill/quickmenu X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b4af8be2abfa8caeceb2fc714c3effb09acf910d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/quickmenu Conflicts: qcsrc/client/View.qc qcsrc/client/autocvars.qh --- b4af8be2abfa8caeceb2fc714c3effb09acf910d diff --cc _hud_common.cfg index 1dfc3b2ce,ca90bc9da..4e5b7328f --- a/_hud_common.cfg +++ b/_hud_common.cfg @@@ -26,13 -37,11 +37,13 @@@ 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_quickmenu_file quickmenu.txt "load the quick menu from this file" + // hud panel aliases alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4" - alias +hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 1" - alias -hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized 0" - alias hud_panel_radar_maximized "cl_cmd hud_panel_radar_maximized" + alias +hud_panel_radar_maximized "cl_cmd hud radar 1" + alias -hud_panel_radar_maximized "cl_cmd hud radar 0" + alias hud_panel_radar_maximized "cl_cmd hud radar" // other hud cvars seta hud_showbinds 1 "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both" diff --cc qcsrc/client/View.qc index 7f5879157,3362ce422..dd9bfa827 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@@ -473,9 -492,16 +492,16 @@@ void CSQC_UpdateView(float w, float h eventchase_current_distance = 0; // start from 0 next time } } - + // workaround for camera stuck between player's legs when using chase_active 1 + // because the engine stops updating the chase_active camera when the game ends + else if(intermission) + { + cvar_settemp("chase_active", "-1"); + eventchase_current_distance = 0; + } + // do lockview after event chase camera so that it still applies whenever necessary. - if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1 || HUD_QuickMenu_IsOpened()) - if(autocvar_cl_lockview || (!autocvar_hud_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1))) ++ if(autocvar_cl_lockview || (!autocvar_hud_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1 || HUD_QuickMenu_IsOpened()))) { setproperty(VF_ORIGIN, freeze_org); setproperty(VF_ANGLES, freeze_ang); @@@ -1457,23 -1480,23 +1480,25 @@@ if(autocvar__hud_configure) HUD_Panel_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(); - } - + else if (HUD_QuickMenu_IsOpened()) + HUD_QuickMenu_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(); + } + cl_notice_run(); - + // let's reset the view back to normal for the end setproperty(VF_MIN, '0 0 0'); setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h); diff --cc qcsrc/client/autocvars.qh index cc5a7f780,ba6abadc0..5532736d6 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@@ -279,7 -283,7 +283,8 @@@ string autocvar_hud_panel_powerups_prog float autocvar_hud_panel_powerups_text; float autocvar_hud_panel_pressedkeys; float autocvar_hud_panel_pressedkeys_aspect; + float autocvar_hud_panel_pressedkeys_attack; +string autocvar_hud_panel_quickmenu_file; float autocvar_hud_panel_racetimer; float autocvar_hud_panel_radar; float autocvar_hud_panel_radar_foreground_alpha; @@@ -318,8 -323,10 +324,12 @@@ float autocvar_hud_panel_weapons_label float autocvar_hud_panel_weapons_onlyowned; float autocvar_hud_panel_weapons_timeout; float autocvar_hud_panel_weapons_timeout_effect; + float autocvar_hud_panel_weapons_timeout_fadebgmin; + float autocvar_hud_panel_weapons_timeout_fadefgmin; + var float autocvar_hud_panel_weapons_timeout_speed_in = 0.25; + var float autocvar_hud_panel_weapons_timeout_speed_out = 0.75; +float autocvar_hud_panel_quickmenu; +float autocvar_hud_panel_quickmenu_align; float autocvar_hud_progressbar_alpha; float autocvar_hud_showbinds; float autocvar_hud_showbinds_limit; diff --cc qcsrc/client/command/cl_cmd.qc index 48dd4ae02,acac8b312..714ddc69c --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@@ -182,10 -211,13 +221,13 @@@ void LocalCommand_hud(float request, fl Cmd_HUD_Help(); return; } - + case "radar": { - hud_panel_radar_maximized = (argv(2) ? InterpretBoolean(argv(2)) : !hud_panel_radar_maximized); + if(argv(2)) + hud_panel_radar_maximized = InterpretBoolean(argv(2)); + else + hud_panel_radar_maximized = !hud_panel_radar_maximized; return; } }