Merge branch 'master' into Mario/showspecs
authorMario <mario@smbclan.net>
Thu, 21 Jul 2016 16:21:06 +0000 (02:21 +1000)
committerMario <mario@smbclan.net>
Thu, 21 Jul 2016 16:21:06 +0000 (02:21 +1000)
1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge
@@@ -140,10 -140,8 +140,13 @@@ float g_trueaim_minrange
  
  float hud;
  float view_quality;
 +
 +int num_spectators;
 +const int MAX_SPECTATORS = 7;
 +int spectatorlist[MAX_SPECTATORS];
 +
  int framecount;
  .float health;
+ float GetSpeedUnitFactor(int speed_unit);
+ string GetSpeedUnit(int speed_unit);
Simple merge