]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Tue, 29 Nov 2011 14:06:35 +0000 (15:06 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 29 Nov 2011 14:06:35 +0000 (15:06 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh

Simple merge
index 0270b020e1313e51e28bb8ff6c6de706ac868ed2,b3b4fb567cbfcbe0ee7bf914631aa27b02861b44..e18433e9666465ef36702c7ba10637eb4e3d1a6a
@@@ -151,11 -151,7 +151,10 @@@ float autocvar_g_waypointsprite_normdis
  float autocvar_g_waypointsprite_scale;
  float autocvar_g_waypointsprite_spam;
  float autocvar_g_waypointsprite_timealphaexponent;
 +float autocvar_g_waypointsprites_turrets;
 +float autocvar_g_waypointsprites_turrets_maxdist;
 +
  float autocvar_hud_colorflash_alpha;
- float autocvar_hud_configure_bg_minalpha;
  float autocvar_hud_configure_checkcollisions;
  float autocvar_hud_configure_grid;
  float autocvar_hud_configure_grid_alpha;