From: otta8634 Date: Fri, 13 Dec 2024 15:46:02 +0000 (+0800) Subject: Merge remote-tracking branch 'origin/master' into k9er/standardize-cvar-descs X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8847186388aafcc7f303e0c1b8e51ec6eb4f4d02;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into k9er/standardize-cvar-descs --- 8847186388aafcc7f303e0c1b8e51ec6eb4f4d02 diff --cc qcsrc/client/main.qh index da5c3e3dd,c5efafb5e..abae33860 --- a/qcsrc/client/main.qh +++ b/qcsrc/client/main.qh @@@ -25,11 -25,13 +25,13 @@@ bool autocvar_cl_race_checkpoint_splits bool autocvar_cl_race_checkpoint_splits_hud; bool autocvar_cl_race_cptimes_showspeed = false; bool autocvar_cl_race_cptimes_showspeed_unit = true; + float autocvar_cl_race_cptimes_namesize = 10; #else -AUTOCVAR_SAVE(cl_race_checkpoint_splits_console, bool, 1, "Print checkpoint splits to console"); -AUTOCVAR_SAVE(cl_race_checkpoint_splits_hud, bool, 1, "Show race checkpoint splits on HUD in infomessages"); -AUTOCVAR_SAVE(cl_race_cptimes_showspeed, bool, 0, "Show race checkpoint speed (NOTE: ignores vertical speed)"); -AUTOCVAR_SAVE(cl_race_cptimes_showspeed_unit, bool, 1, "Show race checkpoint speed units"); -AUTOCVAR_SAVE(cl_race_cptimes_namesize, float, 10, "Maximum player name length in checkpoint messages"); +AUTOCVAR_SAVE(cl_race_checkpoint_splits_console, bool, 1, "print checkpoint splits to console"); +AUTOCVAR_SAVE(cl_race_checkpoint_splits_hud, bool, 1, "show race checkpoint splits on HUD in infomessages"); +AUTOCVAR_SAVE(cl_race_cptimes_showspeed, bool, 0, "show race checkpoint speed (NOTE: ignores vertical speed)"); +AUTOCVAR_SAVE(cl_race_cptimes_showspeed_unit, bool, 1, "show race checkpoint speed units"); ++AUTOCVAR_SAVE(cl_race_cptimes_namesize, float, 10, "maximum player name length in race checkpoint messages"); #endif bool autocvar_cl_race_cptimes_onlyself; // TODO: move to race gamemode bool autocvar_cl_race_cptimes_showself = false; diff --cc xonotic-client.cfg index 043dd13c8,6668db2b4..700d1239d --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@@ -710,18 -710,19 +710,19 @@@ alias _cl_autoscreenshot_set "con_chatt alias _cl_autoscreenshot_restore "set con_chattime $_con_chattime_save; set hud_panel_scoreboard_fadeinspeed $_hud_panel_scoreboard_fadeinspeed_save; set menu_slowmo $_menu_slowmo_save; set scr_conheight $_scr_conheight_save; set con_textsize $_con_textsize_save; set scr_conalpha $_scr_conalpha_save" alias cl_autoscreenshot_screenshot "alias cl_autoscreenshot_screenshot_s ""; togglemenu 0; -con_chat_maximize; _cl_autoscreenshot_save; _cl_autoscreenshot_set; defer 0.1 \"screenshot screenshots/autoscreenshot/${1}-${2}.jpg\"; defer 0.1 \"_cl_autoscreenshot_restore\"" -seta cl_jetpack_jump 1 "Activate jetpack by pressing jump in the air. 0 = Disable, 1 = Stop when touching ground, 2 = Enable" +seta cl_jetpack_jump 1 "activate Jetpack by pressing jump in the air; \"0\" = disable, \"1\" = stop when touching ground, \"2\" = enable" -seta cl_race_cptimes_showself 1 "Always show your own times as well as the current best on checkpoints in Race/CTS" -seta cl_race_cptimes_onlyself 0 "Only show your own times on checkpoints in Race/CTS. Can be forced on by the server via g_race_cptimes_onlyself" -seta cl_race_cptimes_showspeed 0 "Show race checkpoint speed (NOTE: ignores vertical speed)" -seta cl_race_cptimes_showspeed_unit 1 "Show race checkpoint speed units" -seta cl_race_cptimes_namesize 10 "Maximum length of player names in checkpoint messages" -seta cl_race_checkpoint_splits_console 1 "Print checkpoint splits to console" -seta cl_race_checkpoint_splits_hud 1 "Show race checkpoint splits on HUD in infomessages" +seta cl_race_cptimes_showself 1 "always show your own times as well as the current best on checkpoints in Race/CTS" +seta cl_race_cptimes_onlyself 0 "only show your own times on checkpoints in Race/CTS. can be forced on by the server via g_race_cptimes_onlyself" +seta cl_race_cptimes_showspeed 0 "show race checkpoint speed (NOTE: ignores vertical speed)" +seta cl_race_cptimes_showspeed_unit 1 "show race checkpoint speed units" ++seta cl_race_cptimes_namesize 10 "maximum length of player names in race checkpoint messages" +seta cl_race_checkpoint_splits_console 1 "print race checkpoint splits to console" +seta cl_race_checkpoint_splits_hud 1 "show race checkpoint splits on HUD in infomessages" -seta cl_cts_noautoswitch 0 "Prevent forced switching to new weapons in CTS" +seta cl_cts_noautoswitch 0 "prevent forced switching to new weapons in CTS" -set cl_stripcolorcodes 0 "experimental feature (notes: strips ALL color codes from messages!)" +set cl_stripcolorcodes 0 "experimental feature (NOTE: strips ALL color codes from messages!)" // prints view position and orientation alias posview_camera_info "prvm_globalget client view_origin _posview_tmpcvar1; prvm_globalget client view_angles _posview_tmpcvar2; _posview_camera_info_2"