Merge remote branch 'origin/master' into samual/balancesamual

Conflicts:
	balanceXonotic.cfg

diff --cc balanceXonotic.cfg
index d3f3fba9c4fd6bb3e84e8efeb4dbf8e4138433c3,e5adab9627bc926ed79ae43fbe94f22305542b7b..1842dabd4fc62c50990ffba826fc57c647de658a
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -489,9 -488,8 +489,9 @@@ set g_balance_nex_charge 
  set g_balance_nex_charge_mindmg 20
  set g_balance_nex_charge_start 0.5
  set g_balance_nex_charge_rate 0.5
- set g_balance_nex_charge_limit 0.5
- set g_balance_nex_charge_rot_rate 0.1
 +set g_balance_nex_charge_animlimit 0.5
+ set g_balance_nex_charge_limit 1 // LOG: 0.5 -> 1 - allow to fully charge automaticaly
+ set g_balance_nex_charge_rot_rate 0 // LOG: 0.1 -> 0 - disable rot
  set g_balance_nex_charge_rot_pause 0.5 // Dont rot down until this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0
  set g_balance_nex_charge_velocity_rate 0

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