Merge branch 'Mario/spawnsystem_mutator' into Mario/overkill

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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index d1cce37c22b4886ae83656520776674b080faad2..1909ee499fb1d4f83db0311d511b4d3998021b6a 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;
@@ -817,6 +815,8 @@ string autocvar_g_forced_team_red;
 string autocvar_g_forced_team_yellow;
 float autocvar_g_freezetag_frozen_force;
 float autocvar_g_freezetag_frozen_maxtime;
+float autocvar_g_freezetag_revive_falldamage;
+float autocvar_g_freezetag_revive_falldamage_health;
 float autocvar_g_freezetag_point_leadlimit;
 float autocvar_g_freezetag_point_limit;
 float autocvar_g_freezetag_revive_extra_size;
@@ -928,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;
@@ -1203,10 +1204,35 @@ 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;
+float autocvar_g_balance_hmg_bulletconstant;
+float autocvar_g_balance_hmg_speed;
+float autocvar_g_balance_hmg_spread_add;
+float autocvar_g_balance_hmg_spread_max;
+float autocvar_g_balance_hmg_spread_min;
+float autocvar_g_balance_hmg_sustained_ammo;
+float autocvar_g_balance_hmg_sustained_damage;
+float autocvar_g_balance_hmg_sustained_force;
+float autocvar_g_balance_hmg_sustained_refire;
+float autocvar_g_balance_hmg_reload_ammo;
+float autocvar_g_balance_hmg_reload_time;
+float autocvar_g_balance_rpc_ammo;
+float autocvar_g_balance_rpc_animtime;
+float autocvar_g_balance_rpc_damage;
+float autocvar_g_balance_rpc_damage2;
+float autocvar_g_balance_rpc_damageforcescale;
+float autocvar_g_balance_rpc_edgedamage;
+float autocvar_g_balance_rpc_force;
+float autocvar_g_balance_rpc_health;
+float autocvar_g_balance_rpc_lifetime;
+float autocvar_g_balance_rpc_radius;
+float autocvar_g_balance_rpc_refire;
+float autocvar_g_balance_rpc_speed;
+float autocvar_g_balance_rpc_speedaccel;
+float autocvar_g_balance_rpc_reload_ammo;
+float autocvar_g_balance_rpc_reload_time;
 float autocvar_g_grab_range;
 float autocvar_g_sandbox_info;
 float autocvar_g_sandbox_readonly;
@@ -1253,3 +1279,18 @@ float autocvar_g_nades_nade_newton_style;
 float autocvar_g_campcheck_damage;
 float autocvar_g_campcheck_distance;
 float autocvar_g_campcheck_interval;
+float autocvar_g_jump_grunt;
+float autocvar_g_overkill_powerups_replace;
+float autocvar_g_overkill_superguns_respawn_time;
+float autocvar_g_overkill_100h_anyway;
+float autocvar_g_overkill_100a_anyway;
+float autocvar_g_overkill_ammo_start;
+float autocvar_g_overkill_ammo_charge;
+float autocvar_g_overkill_ammo_charge_notice;
+float autocvar_g_overkill_ammo_charge_limit;
+float autocvar_g_spawn_near_teammate_distance;
+float autocvar_g_spawn_near_teammate_ignore_spawnpoint;
+float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
+float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
+float autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health;
+float autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;