Merge remote branch 'origin/master' into samual/mutator_ctf

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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 512a9c6d9ad2449758335548ee8618eed62e7c78..13aa4bb2100977d71d7852373778c046d52b5222 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -289,7 +289,7 @@ float autocvar_g_balance_grenadelauncher_primary_edgedamage;
 float autocvar_g_balance_grenadelauncher_primary_force;
 float autocvar_g_balance_grenadelauncher_primary_health;
 float autocvar_g_balance_grenadelauncher_primary_lifetime;
-float autocvar_g_balance_grenadelauncher_primary_lifetime2;
+float autocvar_g_balance_grenadelauncher_primary_lifetime_stick;
 float autocvar_g_balance_grenadelauncher_primary_radius;
 float autocvar_g_balance_grenadelauncher_primary_refire;
 float autocvar_g_balance_grenadelauncher_primary_remote_minbouncecnt;
@@ -304,7 +304,8 @@ float autocvar_g_balance_grenadelauncher_secondary_edgedamage;
 float autocvar_g_balance_grenadelauncher_secondary_force;
 float autocvar_g_balance_grenadelauncher_secondary_health;
 float autocvar_g_balance_grenadelauncher_secondary_lifetime;
-float autocvar_g_balance_grenadelauncher_secondary_lifetime2;
+float autocvar_g_balance_grenadelauncher_secondary_lifetime_bounce;
+float autocvar_g_balance_grenadelauncher_secondary_lifetime_stick;
 float autocvar_g_balance_grenadelauncher_secondary_radius;
 float autocvar_g_balance_grenadelauncher_secondary_refire;
 float autocvar_g_balance_grenadelauncher_secondary_speed;
@@ -739,6 +740,7 @@ float autocvar_g_ctf_flag_blue_skin;
 float autocvar_g_ctf_flag_capture_effects;
 float autocvar_g_ctf_flag_glowtrails;
 float autocvar_g_ctf_flag_pickup_effects;
+float autocvar_g_ctf_flag_pickup_verbosename;
 string autocvar_g_ctf_flag_red_model;
 float autocvar_g_ctf_flag_red_skin;
 float autocvar_g_ctf_flag_returntime;