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

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

22fe9eb7e57292f484040ce7f28303164f498a84
diff --cc maps/drain.mapinfo
index da7217eb,50a96fa8..fed17144
--- a/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype k
  gametype ft
  gametype ka
  gametype tdm
 -hidden
 +gametype surv
++hidden
diff --cc maps/oilrig.mapinfo
index 4f5c8097,47a54e8c..5f12df7b
--- a/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@@ -10,6 -10,6 +10,7 @@@ gametype c
  gametype kh
  gametype ft
  gametype ka
 +gametype surv
+ 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