From: Rudolf Polzer Date: Sun, 24 Oct 2010 12:14:49 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round' X-Git-Tag: xonotic-v0.1.0preview~245^2~8 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=1430d30ddc3e83966012a69c4caf17f220a53c52;hp=-c Merge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round' --- 1430d30ddc3e83966012a69c4caf17f220a53c52 diff --combined defaultXonotic.cfg index 3ac447e864,edefdf3c3f..0ba520e135 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@@ -211,7 -211,7 +211,7 @@@ seta crosshair_fireball_color_green 1. seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" -seta crosshair_ring_size 3 "bullet counter ring size for Rifle, velocity ring for Nex" +seta crosshair_ring_size 2 "bullet counter ring size for Rifle, velocity ring for Nex" seta crosshair_campingrifle_bulletcounter_alpha 0.15 seta crosshair_nexvelocity_alpha 0.15 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" @@@ -615,6 -615,8 +615,8 @@@ set g_arena_respawn_delay set g_arena_respawn_waves 0 set g_ca_respawn_delay 0 set g_ca_respawn_waves 0 + set g_ca_damage2score_multiplier 0.01 + set g_ca_round_timelimit 180 set g_nexball_respawn_delay 0 set g_nexball_respawn_waves 0 set g_as_respawn_delay 0