Merged master.

diff --cc maps/atelier.mapinfo
index 5edebc55bb2fc1d50b8f2ecaddffa148825a1598,7f3d96dd8d86f781f8b1b064d2466b1988d6b0b6..4afb6ec0fdf8c121787ea18a683ccdcb54161ee5
--- 1/maps/atelier.mapinfo
--- 2/maps/atelier.mapinfo
+++ b/maps/atelier.mapinfo
@@@ -11,10 -11,3 +11,4 @@@ gametype f
  gametype ka
  gametype kh
  gametype dom
- 
- // optional: fog density red green blue alpha mindist maxdist
- // optional: settemp_for_type (all|gametypename) cvarname value
- // optional: clientsettemp_for_type (all|gametypename) cvarname value
- // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
- // optional: hidden
 +gametype surv

diff --cc maps/boil.mapinfo
Simple merge

diff --cc maps/courtfun.mapinfo
index cae2228349cd23102f376511c8d07aa5eeb18d32,2c0dcebcf12c6689ff52b6c1d20727e58eefa6bc..8ab9eb9deb5cf12803e072e41d10a043550cb095
--- 1/maps/courtfun.mapinfo
--- 2/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@@ -36,6 -35,4 +36,4 @@@ settemp_for_type cts g_cts_finish_kill_
  settemp_for_type ons g_powerups 0
  
  clientsettemp_for_type all r_water 1
 -clientsettemp_for_type all r_water_resolutionmultiplier 1
 +clientsettemp_for_type all r_water_resolutionmultiplier 1
- 
- clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting

diff --cc maps/dance.mapinfo
index 82f2eb65345fa080af03bbe17a2ad340ec004f49,9c9e5790f2efd7abc17b4edf2fe526b0bc26e641..3217d4f24d828ea9454123ef97159a7d56e062b1
--- 1/maps/dance.mapinfo
--- 2/maps/dance.mapinfo
+++ b/maps/dance.mapinfo
@@@ -6,7 -6,4 +6,5 @@@ has weapon
  gametype ctf
  gametype kh
  gametype ft
 -gametype ca
 +gametype ca
 +gametype surv
- 
- clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting

diff --cc maps/darkzone.mapinfo
index aa87497d634015cd8dbb984894eff0cda56e1733,a6918fc927c52a853cc6dab2c89c41ef0026ae04..76ddf69af8f9f4d28a8bb784ec1d4957b79c387c
--- 1/maps/darkzone.mapinfo
--- 2/maps/darkzone.mapinfo
+++ b/maps/darkzone.mapinfo
@@@ -9,13 -9,4 +9,5 @@@ gametype k
  gametype tdm
  gametype ca
  gametype kh
 -gametype ft
 +gametype ft
 +gametype surv
- 
- // optional: fog density red green blue alpha mindist maxdist
- // optional: settemp_for_type (all|gametypename) cvarname value
- // optional: clientsettemp_for_type (all|gametypename) cvarname value
- // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
- // optional: hidden
- 
- clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting

diff --cc maps/fuse.mapinfo
index 5436213439c636ad304826b47cd5a2aa9421bec4,d346019fd67837565e82416a29ff00e777ff8109..415637637d834190f68587b116b7773fa92ada98
--- 1/maps/fuse.mapinfo
--- 2/maps/fuse.mapinfo
+++ b/maps/fuse.mapinfo
@@@ -11,11 -9,4 +9,5 @@@ gametype k
  gametype kh
  gametype ft
  gametype ca
 -gametype tdm
 +gametype tdm
 +gametype surv
- 
- // optional: fog density red green blue alpha mindist maxdist
- // optional: settemp_for_type (all|gametypename) cvarname value
- // optional: clientsettemp_for_type (all|gametypename) cvarname value
- // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
- // optional: hidden

diff --cc maps/implosion.mapinfo
Simple merge

diff --cc maps/runningman.mapinfo
index ae02a574f6e8b09196fb756d196dc4dab7f67d1d,17ff3fcf459f39e9e4183779a770f23657cc91ea..212b44917469be890040dc5d216d35646be6c11b
--- 1/maps/runningman.mapinfo
--- 2/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@@ -6,5 -6,6 +6,7 @@@ has weapon
  gametype dm
  gametype lms
  gametype ka
 +gametype surv
+ 
  clientsettemp_for_type all r_water 1
 -clientsettemp_for_type all r_water_resolutionmultiplier 1
++clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/runningmanctf.mapinfo
index dbb4075f0d1851a59eb934edc6decb6f980254ac,17accddbd2094afc5d422c6a63db79ece2aa327b..983b04187c782a41a0bde78c9b25f809fae11101
--- 1/maps/runningmanctf.mapinfo
--- 2/maps/runningmanctf.mapinfo
+++ b/maps/runningmanctf.mapinfo
@@@ -10,7 -10,6 +10,7 @@@ gametype on
  gametype dom
  gametype ft
  gametype kh
- clientsettemp_for_type all r_water 1
 +gametype surv
  
- clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting
+ clientsettemp_for_type all r_water 1
 -clientsettemp_for_type all r_water_resolutionmultiplier 1
++clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/silentsiege.mapinfo
index cba06bd035b9323b1aae8d76e3bbb03f50e2c059,079d4eb5037e77d07442ec67084593863bce5042..567563ce39b052817e02671aa29f630ad9d37f6e
--- 1/maps/silentsiege.mapinfo
--- 2/maps/silentsiege.mapinfo
+++ b/maps/silentsiege.mapinfo
@@@ -10,7 -10,4 +10,5 @@@ gametype c
  gametype ft
  gametype ka
  gametype kh
 -gametype dom
 +gametype dom
 +gametype surv
- 
- //Great thanks to all developers of the game Xonotic. Also greetings to my friends, level designers, especially: kuniu, cityy, Maddin, sev, Fruitex, monad. For making the best maps ever created! 

diff --cc maps/solarium.mapinfo
index 2030ad567dac44772b77f2113984959f882e2086,ed254a94498ecaccb26bed31e5822d28a5e6784b..12877de70fabf17a2c9cebc65cd48a094934aced
--- 1/maps/solarium.mapinfo
--- 2/maps/solarium.mapinfo
+++ b/maps/solarium.mapinfo
@@@ -9,7 -9,4 +9,5 @@@ gametype lm
  gametype ca
  gametype ka
  gametype ft
 -gametype kh
 +gametype kh
 +gametype surv
- 
- // Special thanks to: Maikmerten, matthiaskrgr, Samuncle, and the rest of the dev team for all their help and support.

diff --cc maps/stormkeep.mapinfo
index cd8bb732d4875c03fe155ddb8fc99272ea11cd52,ed03ff106c288db03d673daadbd6c6a0cb67b9a0..574f648ac60ff55473aa8dde9fa3e0003f59801c
--- 1/maps/stormkeep.mapinfo
--- 2/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@@ -12,11 -12,6 +12,7 @@@ gametype k
  gametype ca
  gametype ft
  gametype ka
 +gametype surv
  
- // optional: fog density red green blue alpha mindist maxdist
- // optional: settemp_for_type (all|gametypename) cvarname value
- // optional: clientsettemp_for_type (all|gametypename) cvarname value
- // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
- // optional: hidden
  clientsettemp_for_type all r_water 1
 -clientsettemp_for_type all r_water_resolutionmultiplier 1
++clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/xoylent.mapinfo
index 7ebba96304a61b037eca0c39ec9f3f4bbf5e062c,d515a80b675935df98ab22c3a2f2ed3e5e20912d..e45d30a24837bf96160c76819c8f59e5a10d0af9
--- 1/maps/xoylent.mapinfo
--- 2/maps/xoylent.mapinfo
+++ b/maps/xoylent.mapinfo
@@@ -8,7 -8,4 +8,5 @@@ gametype lm
  gametype tdm
  gametype ca
  gametype ft
 -gametype ka
 +gametype ka
 +gametype surv
- 
- clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting