Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Jan 2012 12:21:05 +0000 (14:21 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Jan 2012 12:21:05 +0000 (14:21 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/damage.qc
qcsrc/common/util.qh
qcsrc/server/cl_player.qc

Simple merge
Simple merge
Simple merge
index 311f402e78dcac0b174ae44a78f55a9b756cbb71,a8dd88c2f05b7b7490bd989a8015969533dc3106..222c0223fdaefe8c595c31db76b7e5b841b3ca94
@@@ -277,10 -273,15 +273,20 @@@ float lowestbit(float f)
  entity ReadCSQCEntity()
  #endif
  
+ #ifndef MENUQC
+ string strtolower(string s);
+ #endif
+ string MakeConsoleSafe(string input);
+ #ifndef MENUQC
+ float InterpretBoolean(string input);
+ #endif
  // 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
Simple merge