]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/divVerent/ballistic2'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 1 Jan 2014 10:14:00 +0000 (11:14 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 1 Jan 2014 10:14:00 +0000 (11:14 +0100)
* 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


Trivial merge