Merge branch 'master' into Lyberta/GunGame

diff --cc gamemodes-server.cfg
Simple merge

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

diff --cc qcsrc/common/gamemodes/gamemode/_mod.inc
index 6cec1df9234e455ccc86742dfa5877a4964e6bbc,c4cd002c782221fe420d38415c25fed570909a4d..01a5a060c70a2dfd2333c151e2ecf076823e92f1
--- 1/qcsrc/common/gamemodes/gamemode/_mod.inc
--- 2/qcsrc/common/gamemodes/gamemode/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/_mod.inc
@@@ -1,5 -1,17 +1,18 @@@
  // generated file; do not modify
  
+ #include <common/gamemodes/gamemode/assault/_mod.inc>
+ #include <common/gamemodes/gamemode/clanarena/_mod.inc>
+ #include <common/gamemodes/gamemode/ctf/_mod.inc>
+ #include <common/gamemodes/gamemode/cts/_mod.inc>
+ #include <common/gamemodes/gamemode/deathmatch/_mod.inc>
+ #include <common/gamemodes/gamemode/domination/_mod.inc>
+ #include <common/gamemodes/gamemode/freezetag/_mod.inc>
 +#include <common/gamemodes/gamemode/gungame/_mod.inc>
+ #include <common/gamemodes/gamemode/invasion/_mod.inc>
+ #include <common/gamemodes/gamemode/keepaway/_mod.inc>
+ #include <common/gamemodes/gamemode/keyhunt/_mod.inc>
+ #include <common/gamemodes/gamemode/lms/_mod.inc>
  #include <common/gamemodes/gamemode/nexball/_mod.inc>
  #include <common/gamemodes/gamemode/onslaught/_mod.inc>
+ #include <common/gamemodes/gamemode/race/_mod.inc>
+ #include <common/gamemodes/gamemode/tdm/_mod.inc>

diff --cc qcsrc/common/gamemodes/gamemode/_mod.qh
index f06b224d8fecf6f81ad0c446c38e5b482ce5c7b2,d7c1aa66cc35f6f3f8143031123542abf134a33c..8ddd27c5908b1e31c399242e17c9bf43504dc306
--- 1/qcsrc/common/gamemodes/gamemode/_mod.qh
--- 2/qcsrc/common/gamemodes/gamemode/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@@ -1,5 -1,17 +1,18 @@@
  // generated file; do not modify
  
+ #include <common/gamemodes/gamemode/assault/_mod.qh>
+ #include <common/gamemodes/gamemode/clanarena/_mod.qh>
+ #include <common/gamemodes/gamemode/ctf/_mod.qh>
+ #include <common/gamemodes/gamemode/cts/_mod.qh>
+ #include <common/gamemodes/gamemode/deathmatch/_mod.qh>
+ #include <common/gamemodes/gamemode/domination/_mod.qh>
+ #include <common/gamemodes/gamemode/freezetag/_mod.qh>
 +#include <common/gamemodes/gamemode/gungame/_mod.qh>
+ #include <common/gamemodes/gamemode/invasion/_mod.qh>
+ #include <common/gamemodes/gamemode/keepaway/_mod.qh>
+ #include <common/gamemodes/gamemode/keyhunt/_mod.qh>
+ #include <common/gamemodes/gamemode/lms/_mod.qh>
  #include <common/gamemodes/gamemode/nexball/_mod.qh>
  #include <common/gamemodes/gamemode/onslaught/_mod.qh>
+ #include <common/gamemodes/gamemode/race/_mod.qh>
+ #include <common/gamemodes/gamemode/tdm/_mod.qh>

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