From: Martin Taibr Date: Mon, 17 Jul 2017 00:49:55 +0000 (+0200) Subject: not sure X-Git-Tag: xonotic-v0.8.5~2430^2~66 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=411c81c009437b1c9cfea969e98bb1010a0b7768;p=xonotic%2Fxonotic-data.pk3dir.git not sure --- diff --git a/defaultServer.cfg b/defaultServer.cfg index 7001b2aea..142c6c1dd 100644 --- a/defaultServer.cfg +++ b/defaultServer.cfg @@ -538,12 +538,3 @@ 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" - -// random charge stuff :P -set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector" -set g_weapon_charge_colormod_red_half 0 -set g_weapon_charge_colormod_green_half 0.5 -set g_weapon_charge_colormod_blue_half 1 -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 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 4d5b7bbe9..c73eba8a8 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -126,6 +126,15 @@ utf8_enable 1 mod_q3shader_default_polygonoffset -14 mod_q3shader_default_polygonfactor 0 +// random charge stuff :P +set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector" +set g_weapon_charge_colormod_red_half 0 +set g_weapon_charge_colormod_green_half 0.5 +set g_weapon_charge_colormod_blue_half 1 +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"