Merge branch 'master' into Mario/weaponorder

[xonotic/xonotic-data.pk3dir.git] / vehicles.cfg

diff --git a/vehicles.cfg b/vehicles.cfg
index 1d2f153e7dbed57ae6940fb2f9f46f0e69944ee0..d3a2c0bc5658e578f14f4236f97530ddfd5f18cb 100644 (file)
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -11,6 +11,7 @@ set g_vehicles_teams 1 "allow team specific vehicles"
 set g_vehicles_teleportable 0
 set g_vehicles_crush_dmg 70
 set g_vehicles_crush_force 50
+set g_vehicles_crush_minspeed 100
 set g_vehicles_allow_bots 0
 set g_vehicles_exit_attempts 25
 set g_vehicles_thinkrate 0.1
@@ -34,7 +35,7 @@ set g_vehicle_bumblebee_turnspeed 120
 set g_vehicle_bumblebee_pitchspeed 60
 set g_vehicle_bumblebee_pitchlimit 60
 set g_vehicle_bumblebee_friction 0.5
-set g_vehicle_bumblebee_swim 0
+set g_vehicle_bumblebee_swim 1
 
 set g_vehicle_bumblebee_energy 500
 set g_vehicle_bumblebee_energy_regen 50