From: Martin Taibr Date: Mon, 17 Jul 2017 00:57:38 +0000 (+0200) Subject: a couple more X-Git-Tag: xonotic-v0.8.5~2430^2~65 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b55ba77c4f0459e618a5de15081881101f39e0f;p=xonotic%2Fxonotic-data.pk3dir.git a couple more --- diff --git a/defaultClient.cfg b/defaultClient.cfg index 52529b491..0f108e723 100644 --- a/defaultClient.cfg +++ b/defaultClient.cfg @@ -747,3 +747,13 @@ r_polygonoffset_submodel_factor 0 // decals: need a higher polygonoffset than default to not compete with _decal surfaces too much r_polygonoffset_decals_offset -28 r_polygonoffset_decals_factor 0 + +// loading screen +scr_loadingscreen_background 0 +scr_loadingscreen_barcolor "0 0.5 1" +scr_loadingscreen_barheight 12 +scr_loadingscreen_count 1 +scr_loadingscreen_firstforstartup 1 +scr_loadingscreen_scale 999 +scr_loadingscreen_scale_base 1 +scr_loadingscreen_scale_limit 2 diff --git a/defaultServer.cfg b/defaultServer.cfg index 142c6c1dd..94e6f0a4b 100644 --- a/defaultServer.cfg +++ b/defaultServer.cfg @@ -538,3 +538,25 @@ set g_forced_team_otherwise "default" "action if a non listed player joins (can // example: g_forced_team_matchsetup stormkeep "mzDo0nO2y3XpFPNbQAyeUucyaejZ9xpiXLYMGU2x3qM=" "BRLOGENSHFEGLE/+Mq3x2UGMYLXipx9ZjeaycuUeyAQ=" // will set up a match on stormkeep where mzDo0nO2y3XpFPNbQAyeUucyaejZ9xpiXLYMGU2x3qM= and BRLOGENSHFEGLE/+Mq3x2UGMYLXipx9ZjeaycuUeyAQ= play against each other alias g_forced_team_matchsetup "map $1; settemp g_forced_team_red \"$2\"; settemp g_forced_team_blue \"$3\"; settemp g_forced_team_yellow \"$4\"; settemp g_forced_team_pink \"$5\"; settemp g_forced_team_otherwise spectate" + +// frozen +set g_frozen_revive_falldamage 0 "Enable reviving from this amount of fall damage" +set g_frozen_revive_falldamage_health 40 "Amount of health player has if they revived from falling" +set g_frozen_damage_trigger 1 "if 1, frozen players falling into the void will die instead of teleporting to spawn" +set g_frozen_force 0.6 "How much to multiply the force on a frozen player with" + +// player statistics +set g_playerstats_gamereport_uri "http://stats.xonotic.org/stats/submit" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory." +set g_playerstats_gamereport_ladder "" +set g_playerstats_playerbasic_uri "http://stats.xonotic.org" +set g_playerstats_playerdetail_uri "http://stats.xonotic.org/player/me" +set g_playerstats_playerdetail_autoupdatetime 1800 // automatically update every 30 minutes anyway + +// autoscreenshots +set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allowed" + +// mod names for server browser +// note: the lowest of these that mismatches default is used +set g_mod_physics "" "Current physics config name" +set g_mod_balance "" "Current balance config name" +set g_mod_config "" "Current config mod name" diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index c73eba8a8..f1826201c 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -135,28 +135,6 @@ set g_weapon_charge_colormod_red_full 1 set g_weapon_charge_colormod_green_full -0.5 set g_weapon_charge_colormod_blue_full -1 -// frozen -set g_frozen_revive_falldamage 0 "Enable reviving from this amount of fall damage" -set g_frozen_revive_falldamage_health 40 "Amount of health player has if they revived from falling" -set g_frozen_damage_trigger 1 "if 1, frozen players falling into the void will die instead of teleporting to spawn" -set g_frozen_force 0.6 "How much to multiply the force on a frozen player with" - -// player statistics -set g_playerstats_gamereport_uri "http://stats.xonotic.org/stats/submit" "Output player statistics information to either: URL (with ://), console (with a dash like this: -), or supply a filename to output to data directory." -set g_playerstats_gamereport_ladder "" -set g_playerstats_playerbasic_uri "http://stats.xonotic.org" -set g_playerstats_playerdetail_uri "http://stats.xonotic.org/player/me" -set g_playerstats_playerdetail_autoupdatetime 1800 // automatically update every 30 minutes anyway - -// autoscreenshots -set g_max_info_autoscreenshot 3 "how many info_autoscreenshot entities are allowed" - -// mod names for server browser -// note: the lowest of these that mismatches default is used -set g_mod_physics "" "Current physics config name" -set g_mod_balance "" "Current balance config name" -set g_mod_config "" "Current config mod name" - // session locking locksession 1 @@ -180,16 +158,6 @@ seta snd_channel9volume 1 "QuakeC controlled ambient sound volume" snd_identicalsoundrandomization_time -0.1 snd_identicalsoundrandomization_tics 1 -// loading screen -scr_loadingscreen_background 0 -scr_loadingscreen_barcolor "0 0.5 1" -scr_loadingscreen_barheight 12 -scr_loadingscreen_count 1 -scr_loadingscreen_firstforstartup 1 -scr_loadingscreen_scale 999 -scr_loadingscreen_scale_base 1 -scr_loadingscreen_scale_limit 2 - // other config files exec balance-xonotic.cfg exec effects-normal.cfg