Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 36e66ff38d35f5e6c7c7a7e4ef730294ceeffcb7..e336efc538db42d1d1f737b96713047762903fe5 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -197,6 +197,7 @@ float autocvar_g_balance_electro_combo_edgedamage;
 float autocvar_g_balance_electro_combo_force;
 float autocvar_g_balance_electro_combo_radius;
 float autocvar_g_balance_electro_combo_speed;
+float autocvar_g_balance_electro_combo_safeammocheck;
 float autocvar_g_balance_electro_lightning;
 float autocvar_g_balance_electro_primary_ammo;
 float autocvar_g_balance_electro_primary_animtime;
@@ -235,7 +236,6 @@ float autocvar_g_balance_falldamage_deadminspeed;
 float autocvar_g_balance_falldamage_factor;
 float autocvar_g_balance_falldamage_maxdamage;
 float autocvar_g_balance_falldamage_minspeed;
-float autocvar_g_balance_fireball_primary_ammo;
 float autocvar_g_balance_fireball_primary_animtime;
 float autocvar_g_balance_fireball_primary_bfgdamage;
 float autocvar_g_balance_fireball_primary_bfgforce;
@@ -254,7 +254,6 @@ float autocvar_g_balance_fireball_primary_radius;
 float autocvar_g_balance_fireball_primary_refire;
 float autocvar_g_balance_fireball_primary_refire2;
 float autocvar_g_balance_fireball_primary_speed;
-float autocvar_g_balance_fireball_secondary_ammo;
 float autocvar_g_balance_fireball_secondary_animtime;
 float autocvar_g_balance_fireball_secondary_damage;
 float autocvar_g_balance_fireball_secondary_damageforcescale;
@@ -267,8 +266,6 @@ float autocvar_g_balance_fireball_secondary_lifetime;
 float autocvar_g_balance_fireball_secondary_refire;
 float autocvar_g_balance_fireball_secondary_speed;
 float autocvar_g_balance_fireball_secondary_speed_up;
-float autocvar_g_balance_fireball_reload_ammo;
-float autocvar_g_balance_fireball_reload_time;
 float autocvar_g_balance_firetransfer_damage;
 float autocvar_g_balance_firetransfer_time;
 float autocvar_g_balance_fuel_limit;
@@ -480,6 +477,8 @@ float autocvar_g_balance_minelayer_reload_ammo;
 float autocvar_g_balance_minelayer_reload_time;
 float autocvar_g_balance_minstanex_ammo;
 float autocvar_g_balance_minstanex_laser_ammo;
+float autocvar_g_balance_minstanex_laser_animtime;
+float autocvar_g_balance_minstanex_laser_refire;
 float autocvar_g_balance_minstanex_animtime;
 float autocvar_g_balance_minstanex_refire;
 float autocvar_g_balance_minstanex_reload_ammo;
@@ -558,6 +557,11 @@ float autocvar_g_balance_porto_primary_animtime;
 float autocvar_g_balance_porto_primary_lifetime;
 float autocvar_g_balance_porto_primary_refire;
 float autocvar_g_balance_porto_primary_speed;
+float autocvar_g_balance_porto_secondary;
+float autocvar_g_balance_porto_secondary_animtime;
+float autocvar_g_balance_porto_secondary_lifetime;
+float autocvar_g_balance_porto_secondary_refire;
+float autocvar_g_balance_porto_secondary_speed;
 float autocvar_g_balance_powerup_invincible_takedamage;
 float autocvar_g_balance_powerup_invincible_time;
 float autocvar_g_balance_powerup_strength_damage;
@@ -565,6 +569,7 @@ float autocvar_g_balance_powerup_strength_force;
 float autocvar_g_balance_powerup_strength_selfdamage;
 float autocvar_g_balance_powerup_strength_selfforce;
 float autocvar_g_balance_powerup_strength_time;
+float autocvar_g_balance_superweapons_time;
 float autocvar_g_balance_rocketlauncher_ammo;
 float autocvar_g_balance_rocketlauncher_animtime;
 float autocvar_g_balance_rocketlauncher_damage;
@@ -1021,6 +1026,7 @@ float autocvar_g_turrets_unit_walker_turn_strafe;
 float autocvar_g_turrets_unit_walker_turn_swim;
 float autocvar_g_use_ammunition;
 float autocvar_g_waypointeditor;
+float autocvar_g_waypointeditor_auto;
 float autocvar_g_waypoints_for_items;
 float autocvar_g_weapon_charge_colormod_blue_full;
 float autocvar_g_weapon_charge_colormod_blue_half;
@@ -1101,10 +1107,10 @@ float autocvar_sv_eventlog_files_counter;
 string autocvar_sv_eventlog_files_nameprefix;
 string autocvar_sv_eventlog_files_namesuffix;
 float autocvar_sv_eventlog_files_timestamps;
+float autocvar_sv_fraginfo;
 float autocvar_sv_fraginfo_handicap;
 float autocvar_sv_fraginfo_ping;
 float autocvar_sv_fraginfo_stats;
-float autocvar_sv_fraginfo_typefrag;
 float autocvar_sv_friction;
 float autocvar_sv_friction_on_land;
 float autocvar_sv_gameplayfix_q2airaccelerate;
@@ -1206,3 +1212,4 @@ float autocvar_g_sandbox_object_scale_min;
 float autocvar_g_sandbox_object_scale_max;
 float autocvar_g_sandbox_object_material_velocity_min;
 float autocvar_g_sandbox_object_material_velocity_factor;
+float autocvar_g_max_info_autoscreenshot;