From: Martin Taibr Date: Mon, 17 Jul 2017 01:35:52 +0000 (+0200) Subject: that's all of them X-Git-Tag: xonotic-v0.8.5~2430^2~63 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d58368035c139d10584e2e9afaa88af9ce8fb00;p=xonotic%2Fxonotic-data.pk3dir.git that's all of them --- diff --git a/defaultClient.cfg b/defaultClient.cfg index 12dd0aa28..55e6583eb 100644 --- a/defaultClient.cfg +++ b/defaultClient.cfg @@ -771,3 +771,23 @@ exec _hud_descriptions.cfg // exec the default skin config // please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency exec hud_luma.cfg + +// enable menu syncing +alias menu_sync "menu_cmd sync" + +seta cl_items_nofade 0 +seta cl_animate_items 1 +seta cl_ghost_items 0.45 "enable ghosted items (when between 0 and 1, overrides the alpha value)" +seta cl_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged" +seta cl_simple_items 0 "enable simple items (if server allows)" +set cl_simpleitems_postfix "_luma" "posfix to add fo model name when simple items are enabled" +set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems)" +set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0" +set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0" + +seta cl_showspectators 0 "Show who's spectating you if server has sv_showspectators enabled" + +// Facility for config.cfg use ONLY. +// Interpreted in post-config.cfg. +seta menu_forced_saved_cvars "" "These cvars will always be saved, despite engine/Xonotic cvar saving status" +set menu_reverted_nonsaved_cvars "" "These cvars are currently marked as saved in the flags, but have been reverted and won't stay saved. INTERNAL USE ONLY." diff --git a/defaultServer.cfg b/defaultServer.cfg index 1e44d6c59..b04d88001 100644 --- a/defaultServer.cfg +++ b/defaultServer.cfg @@ -569,3 +569,10 @@ exec mutators.cfg exec monsters.cfg exec minigames.cfg exec physics.cfg + +set sv_join_notices "" +set sv_join_notices_time 15 + +set sv_simple_items 1 "allow or forbid client use of simple items" + +set sv_showspectators 1 "Show who's spectating who in the player info panel when client has cl_showspectators on. Shouldn't be used on competitive servers, also disable when watching a suspected cheater" diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index be9b48464..be2faab6a 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -169,28 +169,3 @@ exec commands.cfg // Change g_start_delay based upon if the server is local or not. if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" - -// enable menu syncing -alias menu_sync "menu_cmd sync" - -set sv_join_notices "" -set sv_join_notices_time 15 - -seta cl_items_nofade 0 -seta cl_animate_items 1 -seta cl_ghost_items 0.45 "enable ghosted items (when between 0 and 1, overrides the alpha value)" -seta cl_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged" -set sv_simple_items 1 "allow or forbid client use of simple items" -seta cl_simple_items 0 "enable simple items (if server allows)" -set cl_simpleitems_postfix "_luma" "posfix to add fo model name when simple items are enabled" -set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems)" -set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0" -set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0" - -set sv_showspectators 1 "Show who's spectating who in the player info panel when client has cl_showspectators on. Shouldn't be used on competitive servers, also disable when watching a suspected cheater" -seta cl_showspectators 0 "Show who's spectating you if server has sv_showspectators enabled" - -// Facility for config.cfg use ONLY. -// Interpreted in post-config.cfg. -seta menu_forced_saved_cvars "" "These cvars will always be saved, despite engine/Xonotic cvar saving status" -set menu_reverted_nonsaved_cvars "" "These cvars are currently marked as saved in the flags, but have been reverted and won't stay saved. INTERNAL USE ONLY."