From: Lyberta <lyberta@lyberta.net>
Date: Fri, 16 Aug 2019 17:00:28 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2FGunGame;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Lyberta/GunGame
---

61ace116c5800871e17f1a492510e8332eeb2fd3
diff --cc maps/drain.mapinfo
index 3d9d6246,50a96fa8..79ed5915
--- a/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype k
  gametype ft
  gametype ka
  gametype tdm
 -hidden
 +gametype gg
++hidden
diff --cc maps/oilrig.mapinfo
index 9498285c,47a54e8c..34b0463f
--- a/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@@ -10,6 -10,6 +10,7 @@@ gametype c
  gametype kh
  gametype ft
  gametype ka
 +gametype gg
+ hidden
  
 -clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly
 +clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly