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

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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 6f5ea2b297c332b430d38805966e6dd714ec241f..ee01e21d19b78f227255dd76d2daee76d3b912d0 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1,5 +1,6 @@
 float autocvar__notarget;
 float autocvar__independent_players;
+float autocvar__campaign_testrun;
 float autocvar__campaign_index;
 string autocvar__campaign_name;
 float autocvar__sv_init;
@@ -236,7 +237,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;
@@ -255,7 +255,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;
@@ -268,8 +267,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;
@@ -438,11 +435,13 @@ float autocvar_g_balance_laser_primary_force;
 float autocvar_g_balance_laser_primary_force_other_scale;
 float autocvar_g_balance_laser_primary_force_velocitybias;
 float autocvar_g_balance_laser_primary_force_zscale;
+var float autocvar_g_balance_laser_primary_jumpradius = 150;
 float autocvar_g_balance_laser_primary_lifetime;
 float autocvar_g_balance_laser_primary_radius;
 float autocvar_g_balance_laser_primary_refire;
 float autocvar_g_balance_laser_primary_shotangle;
 float autocvar_g_balance_laser_primary_speed;
+var float autocvar_g_balance_laser_primary_spread = 0.15;
 float autocvar_g_balance_laser_secondary;
 float autocvar_g_balance_laser_secondary_animtime;
 float autocvar_g_balance_laser_secondary_damage;
@@ -561,6 +560,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;
@@ -568,6 +572,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;
@@ -898,10 +903,10 @@ float autocvar_g_nexball_goalleadlimit;
 float autocvar_g_nexball_radar_showallplayers;
 float autocvar_g_nexball_sound_bounce;
 float autocvar_g_nexball_trail_color;
-float autocvar_g_nick_flood_penalty;
+//float autocvar_g_nick_flood_penalty;
 float autocvar_g_nick_flood_penalty_red;
 float autocvar_g_nick_flood_penalty_yellow;
-float autocvar_g_nick_flood_timeout;
+//float autocvar_g_nick_flood_timeout;
 float autocvar_g_nix_with_healtharmor;
 float autocvar_g_nix_with_laser;
 float autocvar_g_nix_with_powerups;
@@ -925,6 +930,7 @@ float autocvar_g_playerclip_collisions;
 string autocvar_g_playerstats_uri;
 float autocvar_g_powerups;
 float autocvar_g_projectiles_damage;
+float autocvar_g_projectiles_keep_owner;
 float autocvar_g_projectiles_newton_style;
 float autocvar_g_projectiles_newton_style_2_maxfactor;
 float autocvar_g_projectiles_newton_style_2_minfactor;
@@ -975,8 +981,15 @@ float autocvar_g_telefrags;
 float autocvar_g_telefrags_avoid;
 float autocvar_g_telefrags_teamplay;
 float autocvar_g_teleport_maxspeed;
+float autocvar_g_throughfloor_debug;
 float autocvar_g_throughfloor_damage;
 float autocvar_g_throughfloor_force;
+float autocvar_g_throughfloor_damage_max_stddev;
+float autocvar_g_throughfloor_force_max_stddev;
+float autocvar_g_throughfloor_min_steps_player;
+float autocvar_g_throughfloor_max_steps_player;
+float autocvar_g_throughfloor_min_steps_other;
+float autocvar_g_throughfloor_max_steps_other;
 float autocvar_g_triggerimpulse_accel_multiplier;
 float autocvar_g_triggerimpulse_accel_power;
 float autocvar_g_triggerimpulse_directional_multiplier;
@@ -1024,6 +1037,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;
@@ -1049,6 +1063,7 @@ float autocvar_minplayers;
 string autocvar_nextmap;
 float autocvar_prvm_backtraceforwarnings;
 string autocvar_quit_and_redirect;
+float autocvar_quit_and_redirect_timer;
 float autocvar_quit_when_empty;
 float autocvar_r_showbboxes;
 float autocvar_rescan_pending;
@@ -1159,7 +1174,7 @@ string autocvar_sv_vote_master_password;
 float autocvar_sv_vote_master_playerlimit;
 float autocvar_sv_vote_no_stops_vote;
 float autocvar_sv_vote_nospectators;
-string autocvar_sv_vote_only_commands;
+//string autocvar_sv_vote_only_commands;
 float autocvar_sv_vote_override_mostrecent;
 float autocvar_sv_vote_singlecount;
 float autocvar_sv_vote_stop;
@@ -1209,3 +1224,5 @@ 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;
+float autocvar_physics_ode;