Merge branch 'master' into terencehill/itemstime

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

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 758fbe1d2956439c9cd7d56270a84451e715f54e..0b6d044753c6cc2e8004ef157287837daf21c16e 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -626,9 +626,9 @@ int autocvar_sv_gentle;
 #define autocvar_sv_gravity cvar("sv_gravity")
 string autocvar_sv_intermission_cdtrack;
 float autocvar_sv_itemstime;
-float autocvar_sv_jumpspeedcap_max;
+string autocvar_sv_jumpspeedcap_max;
 float autocvar_sv_jumpspeedcap_max_disable_on_ramps;
-float autocvar_sv_jumpspeedcap_min;
+string autocvar_sv_jumpspeedcap_min;
 float autocvar_sv_jumpvelocity;
 bool autocvar_sv_logscores_bots;
 bool autocvar_sv_logscores_console;
@@ -839,6 +839,7 @@ bool autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;
 bool autocvar_g_physics_clientselect;
 string autocvar_g_physics_clientselect_options;
 string autocvar_g_physics_clientselect_default;
+bool  autocvar_g_buffs_effects;
 float autocvar_g_buffs_waypoint_distance;
 bool autocvar_g_buffs_randomize;
 float autocvar_g_buffs_random_lifetime;
@@ -857,16 +858,25 @@ float autocvar_g_buffs_medic_regen;
 float autocvar_g_buffs_vengeance_damage_multiplier;
 float autocvar_g_buffs_bash_force;
 float autocvar_g_buffs_bash_force_self;
-float autocvar_g_buffs_disability_time;
+float autocvar_g_buffs_disability_slowtime;
 float autocvar_g_buffs_disability_speed;
 float autocvar_g_buffs_disability_rate;
+float autocvar_g_buffs_disability_weaponspeed;
 float autocvar_g_buffs_speed_speed;
 float autocvar_g_buffs_speed_rate;
+float autocvar_g_buffs_speed_weaponspeed;
 float autocvar_g_buffs_speed_damage_take;
 float autocvar_g_buffs_speed_regen;
 float autocvar_g_buffs_vampire_damage_steal;
 float autocvar_g_buffs_invisible_alpha;
 float autocvar_g_buffs_flight_gravity;
 float autocvar_g_buffs_jump_height;
+float autocvar_g_buffs_inferno_burntime_factor;
+float autocvar_g_buffs_inferno_burntime_min_time;
+float autocvar_g_buffs_inferno_burntime_target_damage;
+float autocvar_g_buffs_inferno_burntime_target_time;
+float autocvar_g_buffs_inferno_damagemultiplier;
+float autocvar_g_buffs_swapper_range;
+float autocvar_g_buffs_magnet_range_item;
 float autocvar_sv_player_scale;
 #endif