Merge branch 'master' into terencehill/itemstime

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

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

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

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

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

diff --cc qcsrc/server/g_world.qc
index cbe31ec1c09f5189f39c79b3ff2d17a503879c4e,4cd5cc810a1c9f456bc372c0e8106e9b2d274488..fb211aaeb7a52653402f11d8f9345887d07cf2a2
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -547,9 -560,7 +560,8 @@@ void spawnfunc___init_dedicated_server(
  
  void Map_MarkAsRecent(string m);
  float world_already_spawned;
- void RegisterWeapons();
  void Nagger_Init();
 +void Item_ItemsTime_Init();
  void ClientInit_Spawn();
  void WeaponStats_Init();
  void WeaponStats_Shutdown();

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