Merge remote-tracking branch 'origin/master' into samual/serverlist

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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 63e31030e860054e507fabdb3e4588ca969b5302..759aea6add8832d27b88c9cb413ef08f70b65ae9 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -139,7 +139,6 @@ float autocvar_g_balance_crylink_primary_joinexplode_edgedamage;
 float autocvar_g_balance_crylink_primary_joinexplode_force;
 float autocvar_g_balance_crylink_primary_joinexplode_radius;
 float autocvar_g_balance_crylink_primary_joinspread;
-float autocvar_g_balance_crylink_primary_jointime;
 float autocvar_g_balance_crylink_primary_linkexplode;
 float autocvar_g_balance_crylink_primary_middle_fadetime;
 float autocvar_g_balance_crylink_primary_middle_lifetime;
@@ -165,7 +164,6 @@ float autocvar_g_balance_crylink_secondary_joinexplode_edgedamage;
 float autocvar_g_balance_crylink_secondary_joinexplode_force;
 float autocvar_g_balance_crylink_secondary_joinexplode_radius;
 float autocvar_g_balance_crylink_secondary_joinspread;
-float autocvar_g_balance_crylink_secondary_jointime;
 float autocvar_g_balance_crylink_secondary_line_fadetime;
 float autocvar_g_balance_crylink_secondary_line_lifetime;
 float autocvar_g_balance_crylink_secondary_linkexplode;
@@ -930,6 +928,7 @@ float autocvar_g_nix_with_laser;
 float autocvar_g_nix_with_powerups;
 float autocvar_g_nodepthtestitems;
 float autocvar_g_nodepthtestplayers;
+float autocvar_g_norecoil;
 float autocvar_g_onslaught_cp_buildhealth;
 float autocvar_g_onslaught_cp_buildtime;
 float autocvar_g_onslaught_cp_health;
@@ -1205,7 +1204,6 @@ float autocvar_timelimit_overtimes;
 float autocvar_timelimit_suddendeath;
 #define autocvar_utf8_enable cvar("utf8_enable")
 float autocvar_waypoint_benchmark;
-float autocvar_welcome_message_time;
 float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 float autocvar_g_trueaim_minrange;
 float autocvar_g_debug_defaultsounds;