Merge branch 'master' into cbrutail/darkzone

diff --git a/maps/courtfun.map b/maps/courtfun.map
index 640cd5209639e21f27de385cab2e86de9182c059..3131a101b284d047961358832045e1fe11fa783f 100644 (file)
--- a/maps/courtfun.map
+++ b/maps/courtfun.map
@@ -35851,3 +35851,55 @@ map_courtfun/screen_obey
 "angle" "-179.999985"
 "target" "redside1"
 }
+{
+"classname" "misc_gamemodel"
+"origin" "2144.000000 -1248.000244 472.000031"
+"model" "models/teleporters/gianttele.md3"
+"angle" "45.685581"
+"modelscale" "1.250000"
+"gametypefilter" "+nexball"
+}
+{
+"classname" "nexball_redgoal"
+"spawnflags" "1"
+{
+( 2200.1584472656 -1213.3843994141 568 ) ( 2110.73828125 -1304.9705810547 568 ) ( 2177.2619628906 -1191.029296875 568 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 2211.3359375 -1201.9361572266 472 ) ( 2188.439453125 -1179.5810546875 472 ) ( 2211.3359375 -1201.9361572266 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 2200.1584472656 -1213.3843994141 472 ) ( 2200.1584472656 -1213.3843994141 456 ) ( 2110.73828125 -1304.9705810547 472 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 2087.8415527344 -1282.6154785156 408 ) ( 2110.73828125 -1304.9705810547 408 ) ( 2177.2619628906 -1191.029296875 408 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 2076.6640625 -1294.0637207031 456 ) ( 2076.6640625 -1294.0637207031 472 ) ( 2099.560546875 -1316.4188232422 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 2087.8415527344 -1282.6154785156 456 ) ( 2177.2619628906 -1191.029296875 456 ) ( 2087.8415527344 -1282.6154785156 472 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 5693.5053710938 -4758.2846679688 568 ) ( 5568.3862304688 -4703.2094726562 520 ) ( 5601.9189453125 -4668.8647460938 568 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 5646.62890625 -4623.0712890625 568 ) ( 5680.1616210938 -4588.7265625 520 ) ( 5738.2153320312 -4712.4916992188 568 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 5680.1616210938 -4588.7265625 456 ) ( 5646.62890625 -4623.0712890625 408 ) ( 5771.748046875 -4678.1469726562 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 5659.97265625 -4792.6293945312 456 ) ( 5601.9189453125 -4668.8647460938 408 ) ( 5568.3862304688 -4703.2094726562 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+}
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-6240.000000 5216.000000 472.000031"
+"model" "models/teleporters/gianttele.md3"
+"angle" "45.685581"
+"modelscale" "1.250000"
+"gametypefilter" "+nexball"
+}
+{
+"classname" "nexball_bluegoal"
+"spawnflags" "1"
+{
+( -6183.841796875 5250.6157226562 568 ) ( -6273.26171875 5159.029296875 568 ) ( -6206.73828125 5272.970703125 568 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -6172.6640625 5262.0639648438 472 ) ( -6195.560546875 5284.4189453125 472 ) ( -6172.6640625 5262.0639648438 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -6183.841796875 5250.6157226562 472 ) ( -6183.841796875 5250.6157226562 456 ) ( -6273.26171875 5159.029296875 472 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -6296.158203125 5181.384765625 408 ) ( -6273.26171875 5159.029296875 408 ) ( -6206.73828125 5272.970703125 408 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -6307.3359375 5169.9365234375 456 ) ( -6307.3359375 5169.9365234375 472 ) ( -6284.439453125 5147.5810546875 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -6296.158203125 5181.384765625 456 ) ( -6206.73828125 5272.970703125 456 ) ( -6296.158203125 5181.384765625 472 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -2690.4946289062 1705.7153320312 568 ) ( -2815.6137695312 1760.7905273438 520 ) ( -2782.0810546875 1795.1352539062 568 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -2737.37109375 1840.9287109375 568 ) ( -2703.8383789062 1875.2734375 520 ) ( -2645.7846679688 1751.5083007812 568 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -2703.8383789062 1875.2734375 456 ) ( -2737.37109375 1840.9287109375 408 ) ( -2612.251953125 1785.8530273438 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -2724.02734375 1671.3706054688 456 ) ( -2782.0810546875 1795.1352539062 408 ) ( -2815.6137695312 1760.7905273438 456 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+}
+}
+{
+"classname" "nexball_basketball"
+"origin" "-2048.000000 1984.000000 432.000000"
+}

diff --git a/maps/courtfun.mapinfo b/maps/courtfun.mapinfo
index ead5dd2a58e3afdddbc59df9491b2585da4478fd..60e8033b0a9fc3c431167b613b731df8645afe1a 100644 (file)
--- a/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@ -7,6 +7,7 @@ gametype ctf // defaults: timelimit=20 caplimit=10 leadlimit=0
 gametype rc
 gametype cts
 gametype ons
+gametype nexball
 // 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

diff --git a/maps/courtfun.tga b/maps/courtfun.tga
index 2f4d039418de3f4c17afcae193d43f5ab8b9cb3f..ddf9a2edd3b0aee8a8dc641ceb3c50a3d099f965 100644 (file)
Binary files a/maps/courtfun.tga and b/maps/courtfun.tga differ

diff --git a/maps/leave_em_behind.map b/maps/leave_em_behind.map
index c36ebb5dee4768ef8bf5535ce8094f6dad872615..1fa55a01ccb4a8d78e7e6908d4bbdece543ade78 100644 (file)
--- a/maps/leave_em_behind.map
+++ b/maps/leave_em_behind.map
@@ -16177,7 +16177,7 @@ exx/panel-q201
 {
 "classname" "target_speaker"
 "origin" "0.000000 -288.000000 184.000000"
-"noise" "sound/map_leave_em_behind/pumps.ogg"
+"noise" "sound/machines/pumps_looped.ogg"
 }
 {
 "classname" "target_speaker"
@@ -16667,7 +16667,7 @@ exx/panel-q201
 {
 "classname" "target_speaker"
 "origin" "0.000000 288.000000 184.000000"
-"noise" "sound/map_leave_em_behind/pumps.ogg"
+"noise" "sound/machines/pumps_looped.ogg"
 }
 {
 "classname" "target_speaker"