Merge branch 'master' into divVerent/csqcmodel

Conflicts:
	qcsrc/client/miscfunctions.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/View.qc
Simple merge

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

diff --cc qcsrc/client/miscfunctions.qc
index ce779634c66487200fca102a2d9aa1365216a881,84b6d3da6d21615017f375e2d763ad3dcb2cb872..c63a7952dfef634f29fab3362565405e637b0871
--- 1/qcsrc/client/miscfunctions.qc
--- 2/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@@ -575,15 -575,9 +575,15 @@@ vector getplayerorigin(float pl
        string s;
        entity e;
  
-       s = getplayerkey(pl, "TEMPHACK_origin");
 +      e = CSQCPlayer_GetPlayer(pl + 1);
 +      if(e)
 +              return e.origin;
 +
 +#ifndef NO_LEGACY_NETWORKING
+       s = getplayerkeyvalue(pl, "TEMPHACK_origin");
        if(s != "")
                return stov(s);
 +#endif
  
        e = entcs_receiver[pl];
        if(e)

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

diff --cc qcsrc/common/constants.qh
Simple merge

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

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

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

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

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