From: Samual Lenks <samual@xonotic.org>
Date: Mon, 17 Feb 2014 03:39:19 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~105
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8956fac358b1f67619049037f188cbffd6fe1b36;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/server/mutators/mutator_melee_only.qc
---

8956fac358b1f67619049037f188cbffd6fe1b36
diff --cc defaultXonotic.cfg
index dcfd3110b,747e0c419..f833ab0ec
--- a/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/server/mutators/mutator_melee_only.qc
index 93e6edb5f,c435aba03..da6b1e84b
--- a/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;
  }