]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
not sure
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 17 Jul 2017 00:49:55 +0000 (02:49 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 17 Jul 2017 00:49:55 +0000 (02:49 +0200)
defaultServer.cfg
defaultXonotic.cfg

index 7001b2aeaae842705579de5bede7e508432840d1..142c6c1dd3da5852be9a1a4b6a30061f6cefc1af 100644 (file)
@@ -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
index 4d5b7bbe9420a47940a012d9a1df8c1e48093914..c73eba8a84107d2dc140aebb3f63e39b9dd076fe 100644 (file)
@@ -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"