]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into mirceakitsune/damage_effects
authorSamual <samual@xonotic.org>
Thu, 12 Jan 2012 19:00:00 +0000 (14:00 -0500)
committerSamual <samual@xonotic.org>
Thu, 12 Jan 2012 19:00:00 +0000 (14:00 -0500)
Conflicts:
qcsrc/common/util.qh

1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/common/util.qh
qcsrc/server/cl_player.qc

Simple merge
Simple merge
index 436299c51686c1d845d07cdad93e0b4dbc652eed,4b0526815d65763eb11f2cbe7b51e2596a060ec4..f4955ea065b4eedc1784c383e00d8a4e732de486
@@@ -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
Simple merge