From: Lyberta Date: Sun, 2 Apr 2017 08:22:42 +0000 (+0300) Subject: Merged master. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44548c56265b276050d0539445e042c1b4a17ce9;p=xonotic%2Fxonotic-maps.pk3dir.git Merged master. --- 44548c56265b276050d0539445e042c1b4a17ce9 diff --cc maps/atelier.mapinfo index 5edebc55,7f3d96dd..4afb6ec0 --- a/maps/atelier.mapinfo +++ b/maps/atelier.mapinfo @@@ -11,10 -11,3 +11,4 @@@ gametype f gametype ka gametype kh gametype dom +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/courtfun.mapinfo index cae22283,2c0dcebc..8ab9eb9d --- a/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 82f2eb65,9c9e5790..3217d4f2 --- a/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 aa87497d,a6918fc9..76ddf69a --- a/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 54362134,d346019f..41563763 --- a/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/runningman.mapinfo index ae02a574,17ff3fcf..212b4491 --- a/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 dbb4075f,17accddb..983b0418 --- a/maps/runningmanctf.mapinfo +++ b/maps/runningmanctf.mapinfo @@@ -10,7 -10,6 +10,7 @@@ gametype on gametype dom gametype ft gametype kh +gametype surv - clientsettemp_for_type all r_water 1 - 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 cba06bd0,079d4eb5..567563ce --- a/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 2030ad56,ed254a94..12877de7 --- a/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 cd8bb732,ed03ff10..574f648a --- a/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 7ebba963,d515a80b..e45d30a2 --- a/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