Merge branch 'master' into mirceakitsune/sandbox

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / autocvars.qh

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index edd3420..564e9ae 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -759,7 +759,6 @@ float autocvar_g_chat_flood_spl_team;
 float autocvar_g_chat_flood_spl_tell;
 float autocvar_g_chat_nospectators;
 float autocvar_g_chat_teamcolors;
 float autocvar_g_chat_flood_spl_tell;
 float autocvar_g_chat_nospectators;
 float autocvar_g_chat_teamcolors;

-float autocvar_g_ctf_allow_drop;

 float autocvar_g_ctf_captimerecord_always;
 float autocvar_g_ctf_capture_leadlimit;
 float autocvar_g_ctf_capture_limit;
 float autocvar_g_ctf_captimerecord_always;
 float autocvar_g_ctf_capture_leadlimit;
 float autocvar_g_ctf_capture_limit;


@@ -927,7 +926,6 @@ float autocvar_g_player_alpha;
 float autocvar_g_player_brightness;
 float autocvar_g_playerclip_collisions;
 string autocvar_g_playerstats_uri;
 float autocvar_g_player_brightness;
 float autocvar_g_playerclip_collisions;
 string autocvar_g_playerstats_uri;

-float autocvar_g_playerstats_debug;

 float autocvar_g_powerup_shield;
 float autocvar_g_powerup_strength;
 float autocvar_g_powerup_superhealth;
 float autocvar_g_powerup_shield;
 float autocvar_g_powerup_strength;
 float autocvar_g_powerup_superhealth;


@@ -967,6 +965,7 @@ float autocvar_g_shootfromeye;
 string autocvar_g_shootfromfixedorigin;
 float autocvar_g_showweaponspawns;
 float autocvar_g_spawn_furthest;
 string autocvar_g_shootfromfixedorigin;
 float autocvar_g_showweaponspawns;
 float autocvar_g_spawn_furthest;

+float autocvar_g_spawn_useallspawns;

 float autocvar_g_spawnpoints_auto_move_out_of_solid;
 #define autocvar_g_spawnshieldtime cvar("g_spawnshieldtime")
 float autocvar_g_spawnsound;
 float autocvar_g_spawnpoints_auto_move_out_of_solid;
 #define autocvar_g_spawnshieldtime cvar("g_spawnshieldtime")
 float autocvar_g_spawnsound;