From: Samual <samual@xonotic.org>
Date: Thu, 12 Jan 2012 19:00:00 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~24^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b976c2b363a9f5b8d17373c7ef290aa0c498372;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into mirceakitsune/damage_effects

Conflicts:
	qcsrc/common/util.qh
---

7b976c2b363a9f5b8d17373c7ef290aa0c498372
diff --cc qcsrc/common/util.qh
index 436299c51,4b0526815..f4955ea06
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -291,7 -291,9 +291,14 @@@ float InterpretBoolean(string input)
  // generic shutdown handler
  void Shutdown();
  
 +#ifndef MENUQC
 +// loops through the tags of model v using counter tagnum
 +#define FOR_EACH_TAG(v) float tagnum; for(tagnum = 1, gettaginfo(v, tagnum);; tagnum++, gettaginfo(v, tagnum)) if not(gettaginfo_name) break; else
 +#endif
++
+ #ifdef SVQC
+ void WriteApproxPastTime(float dst, float t);
+ #endif
+ #ifdef CSQC
+ float ReadApproxPastTime();
+ #endif