Merge branch 'master' into mirceakitsune/firing_buttons

diff --combined data/defaultVT.cfg
index 57886bb1849572bb6041940bac9e96cdf4452d07,b40744bb191ac40e8d5ecdd7d6bd66c8c9c0be7d..466a0739b3e094229285ef7220c6ce33ea329ff0
--- 1/data/defaultVT.cfg
--- 2/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@@ -107,16 -107,14 +107,16 @@@ _cl_color 18
  _cl_name "Player"\r
  _cl_playermodel models/player/vixen.zym\r
  _cl_playerskin 0\r
 -crosshair 13\r
 +seta crosshair 11\r
 +seta crosshair_primary 13\r
 +seta crosshair_secondary 14\r
  seta crosshair_color "1 1 0.5"\r
  seta crosshair_alpha 1\r
  seta crosshair_size 0.35\r
  seta crosshair_pickup 0.5 "crosshair grows then shrinks back when picking up an item"\r
  seta crosshair_color_by_health 1 "if enabled, crosshair color will depend on current health"\r
 -seta crosshair_unarmed_dim_color 0.5 "dim crosshair color by this amount when we aren't holding a weapon"\r
 -seta crosshair_unarmed_dim_alpha 0.5 "dim crosshair alpha by this amount when we aren't holding a weapon"\r
 +seta crosshair_unarmed_dim_color 0.75 "dim crosshair color to this amount when we aren't holding a weapon"\r
 +seta crosshair_unarmed_dim_alpha 0.75 "dim crosshair alpha to this amount when we aren't holding a weapon"\r
  seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect"\r
  seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring"\r
  seta crosshair_ring_size 2.5 "size of the crosshair ammo ring"\r
@@@ -1612,7 -1610,7 +1612,7 @@@ set g_healthsize_soundfactor 0.5 "The s
  set g_healthsize_exteriorweapon_scalefactor 1 "Amount by which player size resizes the exterior weapon model"\r
  set g_healthsize_weapon_scalefactor 1 "Amount by which player size resizes the view weapon model"\r
  set g_healthsize_weapon_scalefactor_pos 10 "Amount by which the view model is moved vertically based on player size"\r
- set g_healthsize_vore_pos 3 "Amount by which view height changes for prey, based on the size difference between them and their predator"\r
+ set g_healthsize_vore_pos 1 "Amount by which view height changes for prey, based on the size difference between them and their predator"\r
  set g_healthsize_min 50 "Player size may not drop below this amount of health"\r
  set g_healthsize_max 150 "Player size may not grow past this amount of health"\r
  \r