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

Conflicts:
	qcsrc/server/mutators/mutator_melee_only.qc

diff --cc defaultXonotic.cfg
index dcfd3110b1f50e3a92a5321810a68668d6927f04,747e0c4192e9a77e434719bbeaf6cc4d0268ccdf..f833ab0ec721ae759ca181973cc95ceb4f3af438
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -57,9 -57,9 +57,9 @@@ _cl_playerskin 
  
  seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown"
  seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
 -seta cl_reticle_item_nex 1 "draw aiming reticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
 +seta cl_reticle_item_vortex 1 "draw aiming reticle for the vortex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
  seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
- fov 90
+ fov 100
  seta cl_velocityzoom 0        "velocity based zooming of fov, negative values zoom out"
  seta cl_velocityzoom_type 3 "how to factor in speed, 1 = all velocity in all directions, 2 = velocity only in forward direction (can be negative), 3 = velocity only in forward direction (limited to forward only)"
  seta cl_velocityzoom_speed 1000 "target speed for fov factoring"

diff --cc qcsrc/common/notifications.qh
Simple merge

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_melee_only.qc
index 93e6edb5f24e4f1deae45332ffc1b44f0bf891db,c435aba0342c64e9c9fb3e238f2d5982772725d6..da6b1e84bd6689847ac7ae16f8ed6673c9387b66
--- 1/qcsrc/server/mutators/mutator_melee_only.qc
--- 2/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@@ -1,10 -1,7 +1,7 @@@
  MUTATOR_HOOKFUNCTION(melee_SetStartItems)
  {
-       start_ammo_shells = 0;
-       warmup_start_ammo_shells = 0;
- 
-       start_weapons = WEPSET_SHOCKWAVE;
-       warmup_start_weapons = WEPSET_SHOCKWAVE;
+       start_ammo_shells = warmup_start_ammo_shells = 0;
 -      start_weapons = warmup_start_weapons = WEPSET_SHOTGUN;
++      start_weapons = warmup_start_weapons = WEPSET_SHOCKWAVE;
  
        return FALSE;
  }