Merge branch 'master' into Lyberta/Survival

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 6ff898e7ac16bfa7fa397fdf88cc749da4022d9e..745dacfad987408ad283db4a7adf45063ad1aad8 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -10,4 +10,5 @@ gametype ca
 gametype ft
 gametype ka
 gametype kh
-gametype dom
\ No newline at end of file
+gametype dom
+gametype surv

diff --git a/maps/atelier.mapinfo b/maps/atelier.mapinfo
index 7f3d96dd8d86f781f8b1b064d2466b1988d6b0b6..4afb6ec0fdf8c121787ea18a683ccdcb54161ee5 100644 (file)
--- a/maps/atelier.mapinfo
+++ b/maps/atelier.mapinfo
@@ -11,3 +11,4 @@ gametype ft
 gametype ka
 gametype kh
 gametype dom
+gametype surv

diff --git a/maps/boil.mapinfo b/maps/boil.mapinfo
index 31ab176e8b128bd2c74e674eeebd41cd6b05ad1a..839572734f7c68fbbbc8b10601ff31bbf86e997a 100644 (file)
--- a/maps/boil.mapinfo
+++ b/maps/boil.mapinfo
@@ -9,4 +9,5 @@ gametype lms
 gametype ca
 gametype ft
 gametype kh
-gametype ka
\ No newline at end of file
+gametype ka
+gametype surv

diff --git a/maps/catharsis.mapinfo b/maps/catharsis.mapinfo
index 20392cf659adb648f126dbf0c683185506cfb4df..46ccad800c70d37567d5c51f889debf3d03077a7 100644 (file)
--- a/maps/catharsis.mapinfo
+++ b/maps/catharsis.mapinfo
@@ -3,4 +3,5 @@ description Medium-sized CTF level with crystals
 author Justin, t0uYK8Ne
 cdtrack 16
 has weapons
-gametype ctf
\ No newline at end of file
+gametype ctf
+gametype surv

diff --git a/maps/courtfun.mapinfo b/maps/courtfun.mapinfo
index 2c0dcebcf12c6689ff52b6c1d20727e58eefa6bc..8ab9eb9deb5cf12803e072e41d10a043550cb095 100644 (file)
--- a/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@ -8,6 +8,7 @@ gametype rc
 gametype cts
 gametype ons
 gametype nb
+gametype surv
 
 settemp_for_type rc g_start_ammo_shells 3
 settemp_for_type rc g_pickup_shells 3
@@ -35,4 +36,4 @@ settemp_for_type cts g_cts_finish_kill_delay 0
 settemp_for_type ons g_powerups 0
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/dance.mapinfo b/maps/dance.mapinfo
index 9c9e5790f2efd7abc17b4edf2fe526b0bc26e641..3217d4f24d828ea9454123ef97159a7d56e062b1 100644 (file)
--- a/maps/dance.mapinfo
+++ b/maps/dance.mapinfo
@@ -6,4 +6,5 @@ has weapons
 gametype ctf
 gametype kh
 gametype ft
-gametype ca
\ No newline at end of file
+gametype ca
+gametype surv

diff --git a/maps/darkzone.mapinfo b/maps/darkzone.mapinfo
index a6918fc927c52a853cc6dab2c89c41ef0026ae04..76ddf69af8f9f4d28a8bb784ec1d4957b79c387c 100644 (file)
--- a/maps/darkzone.mapinfo
+++ b/maps/darkzone.mapinfo
@@ -9,4 +9,5 @@ gametype ka
 gametype tdm
 gametype ca
 gametype kh
-gametype ft
\ No newline at end of file
+gametype ft
+gametype surv

diff --git a/maps/drain.mapinfo b/maps/drain.mapinfo
index 50a96fa869ef16b503d945c5058400773e5c158a..fed171449ea817957a5020ba649e14f56f218741 100644 (file)
--- a/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@ -10,4 +10,5 @@ gametype kh
 gametype ft
 gametype ka
 gametype tdm
-hidden
\ No newline at end of file
+gametype surv
+hidden

diff --git a/maps/erbium.mapinfo b/maps/erbium.mapinfo
index fbd2d37ec89110e25265d560d6aebc0c29980354..529c0cf209ac675f5d601a46044e5945415b5b66 100644 (file)
--- a/maps/erbium.mapinfo
+++ b/maps/erbium.mapinfo
@@ -11,6 +11,7 @@ gametype ft
 gametype ka
 gametype kh
 gametype dom
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/finalrage.mapinfo b/maps/finalrage.mapinfo
index 631232ae44b32fcb2e0cb1ae30570f125e9128e2..a8d3e57832688c17bfcde784c4e61227a914872f 100644 (file)
--- a/maps/finalrage.mapinfo
+++ b/maps/finalrage.mapinfo
@@ -11,6 +11,7 @@ gametype ca
 gametype ft
 gametype kh
 gametype ka
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/fuse.mapinfo b/maps/fuse.mapinfo
index d346019fd67837565e82416a29ff00e777ff8109..415637637d834190f68587b116b7773fa92ada98 100644 (file)
--- a/maps/fuse.mapinfo
+++ b/maps/fuse.mapinfo
@@ -9,4 +9,5 @@ gametype ka
 gametype kh
 gametype ft
 gametype ca
-gametype tdm
\ No newline at end of file
+gametype tdm
+gametype surv

diff --git a/maps/geoplanetary.mapinfo b/maps/geoplanetary.mapinfo
index df86efcb9eae26858709fac621b7286108e88095..592ed2162ebeb615c679b06ae902a88b10920fc9 100644 (file)
--- a/maps/geoplanetary.mapinfo
+++ b/maps/geoplanetary.mapinfo
@@ -5,6 +5,7 @@ cdtrack 18
 has weapons
 gametype ctf
 gametype dom
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo
index 6b507e372f6029676710e799bf8150e6a9661a19..dc727074bd442c363bef4caea029d231ce6f31d3 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -11,6 +11,7 @@ gametype ca
 gametype kh
 gametype ft
 gametype ka
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/implosion.mapinfo b/maps/implosion.mapinfo
index 0ae90f699e3cdcc15bbd03a9df732a52235617df..5235fbc2716eb287128b7f5dc5ce500fe758d65d 100644 (file)
--- a/maps/implosion.mapinfo
+++ b/maps/implosion.mapinfo
@@ -11,4 +11,5 @@ gametype ca
 gametype tdm
 gametype lms
 gametype dom
-gametype dm
\ No newline at end of file
+gametype dm
+gametype surv

diff --git a/maps/oilrig.mapinfo b/maps/oilrig.mapinfo
index 47a54e8c0e408556533e965024747996622c00a5..5f12df7b6ba42e42b97e02835a59d254feb7b70b 100644 (file)
--- a/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@ -10,6 +10,7 @@ gametype ca
 gametype kh
 gametype ft
 gametype ka
+gametype surv
 hidden
 
-clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly
\ No newline at end of file
+clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly

diff --git a/maps/runningman.mapinfo b/maps/runningman.mapinfo
index 17ff3fcf459f39e9e4183779a770f23657cc91ea..212b44917469be890040dc5d216d35646be6c11b 100644 (file)
--- a/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@ -6,6 +6,7 @@ has weapons
 gametype dm
 gametype lms
 gametype ka
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/runningmanctf.mapinfo b/maps/runningmanctf.mapinfo
index 17accddbd2094afc5d422c6a63db79ece2aa327b..983b04187c782a41a0bde78c9b25f809fae11101 100644 (file)
--- a/maps/runningmanctf.mapinfo
+++ b/maps/runningmanctf.mapinfo
@@ -10,6 +10,7 @@ gametype ons
 gametype dom
 gametype ft
 gametype kh
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/silentsiege.mapinfo b/maps/silentsiege.mapinfo
index 079d4eb5037e77d07442ec67084593863bce5042..567563ce39b052817e02671aa29f630ad9d37f6e 100644 (file)
--- a/maps/silentsiege.mapinfo
+++ b/maps/silentsiege.mapinfo
@@ -10,4 +10,5 @@ gametype ca
 gametype ft
 gametype ka
 gametype kh
-gametype dom
\ No newline at end of file
+gametype dom
+gametype surv

diff --git a/maps/solarium.mapinfo b/maps/solarium.mapinfo
index ed254a94498ecaccb26bed31e5822d28a5e6784b..12877de70fabf17a2c9cebc65cd48a094934aced 100644 (file)
--- a/maps/solarium.mapinfo
+++ b/maps/solarium.mapinfo
@@ -9,4 +9,5 @@ gametype lms
 gametype ca
 gametype ka
 gametype ft
-gametype kh
\ No newline at end of file
+gametype kh
+gametype surv

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index ed03ff106c288db03d673daadbd6c6a0cb67b9a0..574f648ac60ff55473aa8dde9fa3e0003f59801c 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -12,6 +12,7 @@ gametype kh
 gametype ca
 gametype ft
 gametype ka
+gametype surv
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
+clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --git a/maps/vorix.mapinfo b/maps/vorix.mapinfo
index c3deeaa2bb65ffb6951662fa8964128e4fc67905..420a5a55b6bc4666d2eb9275cdb1d4033f30fd7f 100644 (file)
--- a/maps/vorix.mapinfo
+++ b/maps/vorix.mapinfo
@@ -3,4 +3,5 @@ description This is Vorix!
 author packer
 cdtrack 17
 has weapons
-gametype ctf
\ No newline at end of file
+gametype ctf
+gametype surv

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index f7714ec99b768a1860e46394f5f61ac6ddd6661f..b8559a7d7b4ced9253ccb82de2b3c25ed6bb9c47 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -9,4 +9,5 @@ gametype lms
 gametype ca
 gametype ka
 gametype kh
-gametype ft
\ No newline at end of file
+gametype ft
+gametype surv

diff --git a/maps/xoylent.mapinfo b/maps/xoylent.mapinfo
index d515a80b675935df98ab22c3a2f2ed3e5e20912d..e45d30a24837bf96160c76819c8f59e5a10d0af9 100644 (file)
--- a/maps/xoylent.mapinfo
+++ b/maps/xoylent.mapinfo
@@ -8,4 +8,5 @@ gametype lms
 gametype tdm
 gametype ca
 gametype ft
-gametype ka
\ No newline at end of file
+gametype ka
+gametype surv