Merge remote branch 'origin/fruitiex/bots'

diff --cc defaultXonotic.cfg
index 686d898ec96340ccd09e97824f842921d67cf973,1463eda485fd08440446aac7d0c154fd88053158..8e27bff243a33caa562fed70eee21909a508eca2
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -419,11 -425,11 +419,11 @@@ set bot_ai_keyboard_treshold 0.5
  set bot_ai_aimskill_offset 0.3 "Amount of error induced to the bots aim"
  set bot_ai_aimskill_think 1 "Aiming velocity. Use values below 1 for slower aiming"
  set bot_ai_custom_weapon_priority_distances "300 850" "Define close and far distances in any order. Based on the distance to the enemy bots will choose different weapons"
 -set bot_ai_custom_weapon_priority_far   "minstanex nex campingrifle rocketlauncher minelayer grenadelauncher electro hagar hlac crylink laser uzi fireball seeker shotgun tuba"       "Desired weapons for far distances ordered by priority"
 -set bot_ai_custom_weapon_priority_mid   "minstanex rocketlauncher nex fireball seeker minelayer grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba"       "Desired weapons for middle distances ordered by priority"
 -set bot_ai_custom_weapon_priority_close "minstanex nex uzi hlac tuba seeker hagar crylink minelayer grenadelauncher shotgun electro campingrifle rocketlauncher laser fireball"       "Desired weapons for close distances ordered by priority"
 +set bot_ai_custom_weapon_priority_far   "minstanex nex sniperrifle electro rocketlauncher grenadelauncher hagar hlac crylink laser uzi fireball seeker shotgun tuba minelayer"        "Desired weapons for far distances ordered by priority"
 +set bot_ai_custom_weapon_priority_mid   "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi sniperrifle crylink hlac hagar shotgun laser tuba minelayer"        "Desired weapons for middle distances ordered by priority"
 +set bot_ai_custom_weapon_priority_close "minstanex shotgun nex uzi hlac tuba seeker hagar crylink grenadelauncher electro sniperrifle rocketlauncher laser fireball minelayer"        "Desired weapons for close distances ordered by priority"
  set bot_ai_weapon_combo 1     "Enable bots to do weapon combos"
- set bot_ai_weapon_combo_threshold 0.3 "Try to make a combo N seconds after the last attack"
+ set bot_ai_weapon_combo_threshold 0.4 "Try to make a combo N seconds after the last attack"
  set bot_ai_friends_aware_pickup_radius "500"  "Bots will not pickup items if a team mate is this distance near the item"
  set bot_ai_ignoregoal_timeout 3       "Ignore goals making bots to get stuck in front of a wall for N seconds"
  set bot_ai_bunnyhop_skilloffset 7     "Bots with skill equal or greater than this value will perform the  \"bunnyhop\" technique"

diff --cc qcsrc/server/bot/aim.qc
Simple merge

diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index c685735ac84b25e298a2a81a4a0dfb0b3ed6bbc0,442711514573e697ac99baa98c25b3ff4403ffc3..f71df778dad283a245f63a2ade567cad9e9f9d72
--- 1/qcsrc/server/bot/havocbot/havocbot.qc
--- 2/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@@ -232,14 -231,16 +232,16 @@@ void havocbot_bunnyhop(vector dir
                return;
  
        // Don't jump when using some weapons
+       /*
        if(self.aistatus & AI_STATUS_ATTACKING)
 -      if(self.weapon & WEP_CAMPINGRIFLE)
 +      if(self.weapon == WEP_SNIPERRIFLE)
                return;
  
        if(self.goalcurrent.classname == "player")
                return;
+       */
  
 -      maxspeed = cvar("sv_maxspeed");
 +      maxspeed = autocvar_sv_maxspeed;
  
        if(self.aistatus & AI_STATUS_DANGER_AHEAD)
        {