Merge branch 'master' into divVerent/fruitbalance

diff --combined defaultXonotic.cfg
index 8e4d45d364413adbf0c88777f28a36b996d5526f,c5cb78928071377c06f02513afbab0905ad530cd..f553047154a8838bdb50199563618407e9f00057
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -298,8 -298,6 +298,8 @@@ set sv_ready_restart 0 "if set to 1 all
  set sv_ready_restart_after_countdown 0        "if set to 1 the players and map items are reset after the countdown ended, otherwise they're reset already at the beginning of the countdown"
  set sv_ready_restart_repeatable 0     "allows the players to restart the game as often as needed"
  
 +set sv_hitsound_antispam_time 0.05 "don't play the hitsound more often than this for the electro lightning gun or the laser gauntlet"
 +
  //nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
  set teamplay_lockonrestart 0 "it set to 1 in a team-based game, the teams are locked once all players readied up and the game restarted (no new players can join after restart unless using the server-command unlockteams)"
  
@@@ -345,7 -343,7 +345,7 @@@ set sv_fragmessage_information_typefra
  
  // use default physics
  set sv_friction_on_land 0
- exec physicsNoQWBunny.cfg
+ exec physicsNoQWBunny-nexbased.cfg
  
  set sv_player_viewoffset "0 0 35" "view offset of the player model"
  set sv_player_mins "-16 -16 -24" "playermodel mins"