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

Conflicts:
	qcsrc/common/util.qh

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/common/util.qh
index 436299c51686c1d845d07cdad93e0b4dbc652eed,4b0526815d65763eb11f2cbe7b51e2596a060ec4..f4955ea065b4eedc1784c383e00d8a4e732de486
--- 1/qcsrc/common/util.qh
--- 2/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

diff --cc qcsrc/server/cl_player.qc
Simple merge