Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
	qcsrc/common/util.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
index 0f28e4bac5f7658d5c3faba9d716112e88793328,8c7c6bc0c7a47509695dd131d48682dca0fdf4f8..a57888e7065e4a65b467bfbc707554e097e7e8c8
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -19,9 -41,57 +19,58 @@@ void menu_sub_null(
  float __engine_check;
  #endif
  
+ void precache_playermodel(string m)
+ {
+       string f;
+ 
+       if(substring(m, -9,5) == "_lod1")
+               return;
+       if(substring(m, -9,5) == "_lod2")
+               return;
+       precache_model(m);
+       f = strcat(substring(m, 0, -5), "_lod1", substring(m, -4, -1));
+       if(fexists(f))
+               precache_model(f);
+       f = strcat(substring(m, 0, -5), "_lod2", substring(m, -4, -1));
+       if(fexists(f))
+               precache_model(f);
+ 
+       /*
+       float globhandle, i, n;
+       globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE);
+       if (globhandle < 0)
+               return;
+       n = search_getsize(globhandle);
+       for (i = 0; i < n; ++i)
+       {
+               //print(search_getfilename(globhandle, i), "\n");
+               f = search_getfilename(globhandle, i);
+               PrecachePlayerSounds(f);
+       }
+       search_end(globhandle);
+       */
+ }
+ void precache_all_playermodels(string pattern)
+ {
+       float globhandle, i, n;
+       string f;
+ 
+       globhandle = search_begin(pattern, TRUE, FALSE);
+       if (globhandle < 0)
+               return;
+       n = search_getsize(globhandle);
+       for (i = 0; i < n; ++i)
+       {
+               //print(search_getfilename(globhandle, i), "\n");
+               f = search_getfilename(globhandle, i);
+               precache_playermodel(f);
+       }
+       search_end(globhandle);
+ }
+ 
  string forcefog;
  void WaypointSprite_Load();
 +void ConsoleCommand_macro_init();
  void CSQC_Init(void)
  {
        prvm_language = cvar_string("prvm_language");

diff --cc qcsrc/client/progs.src
Simple merge

diff --cc qcsrc/common/util.qc
index 5f648dd52a2f6e328854a457ac92fef15be0fbbf,10f77b6cdfedeb59629f375f4ca5cd9f9a4da2bd..5bb7943fe6d920923e998f3977c45be3c6ccf8d3
--- 1/qcsrc/common/util.qc
--- 2/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -2108,10 -2108,13 +2108,22 @@@ float lowestbit(float f
        return f;
  }
  
 +string strlimitedlen(string input, string truncation, float strip_colors, float limit)
 +{
 +      if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit)
 +              return input;
 +      else
 +              return strcat(substring(input, 0, (strlen(input) - strlen(truncation))), truncation);
 +}
++
+ #ifdef CSQC
+ entity ReadCSQCEntity()
+ {
+       float f;
+       f = ReadShort();
+       if(f == 0)
+               return world;
+       return findfloat(world, entnum, f);
+ }
+ #endif
++

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

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

diff --cc qcsrc/server/defs.qh
Simple merge

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

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

diff --cc qcsrc/server/progs.src
index 1ede5759485da4fb1300f7c3a3a03c8569c2e59c,45d83116f46295b910aadfb84c0d1ceb694f3dfd..156b6279d234232534a9af146af7771a7302afff
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -38,15 -36,11 +38,18 @@@ campaign.q
  ../common/mapinfo.qh
  ../common/util.qc
  
 +command/common.qh
 +command/ipban.qh
 +command/radarmap.qh
 +command/vote.qh
 +command/cmd.qh
 +command/sv_cmd.qh
 +
  accuracy.qh
  csqcprojectile.qh
+ ../csqcmodel/settings.qh
+ ../csqcmodel/common.qh
+ ../csqcmodel/sv_model.qh
  csqceffects.qc
  
  anticheat.qh