From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 1 Jan 2014 10:14:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/divVerent/ballistic2'
X-Git-Tag: xonotic-v0.8.0~190^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=360a188afcd740bcb79138fbed32aafcf1f0bca1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/divVerent/ballistic2'

* origin/divVerent/ballistic2:
  Oops. Fix rifle config.
  We DO need to detect double-hits, due to the weird engine tracing that happens sometimes at low angles.
  Always show DamageInfo, even when hitting the same player twice.
  Fix use of "self".
  fix some bugs
  Kill some cvars I forgot.
  cvar cleanup
  Kill zcurveparticles due to 0 users.
  Simplify a LOT.
  work on restructuring fireBallisticBullet
---

360a188afcd740bcb79138fbed32aafcf1f0bca1