From: Samual <samual@xonotic.org>
Date: Mon, 7 Feb 2011 07:55:19 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/balancesamual
X-Git-Tag: xonotic-v0.5.0~311^2~40
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8cc6c8edabb08c081f23dcf0cd3883d87f9e0f4;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	balanceXonotic.cfg
---

d8cc6c8edabb08c081f23dcf0cd3883d87f9e0f4
diff --cc balanceXonotic.cfg
index d3f3fba9c,e5adab962..1842dabd4
--- a/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_animlimit 0.5
- set g_balance_nex_charge_limit 0.5
- set g_balance_nex_charge_rot_rate 0.1
+ 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