Merge branch 'matthiaskrgr/implosion_clipfix' into 'master'

implosion: remove weaponclip

there was weaponclip at the bottom of the map which would cause items dropped by players who died by falling off the map to not disappear. removed the clip.

See merge request !41

diff --git a/maps/implosion.map b/maps/implosion.map
index e8caf7d8c7791cf7bca49d278af20c1ee1602c67..41de7971025a9dd35065aeb1c03234fb8c23cd58 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -61083,14 +61083,6 @@ trak5x/light-light2b-surfacelight
 ( -428 -1992 0 ) ( -428 -1968 0 ) ( -428 -1992 8 ) trak5x/base-base1b 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 1552 4488 -1468 ) ( 1552 -6264 -1468 ) ( -1520 4488 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 1536 292 -1468 ) ( -1536 292 -1468 ) ( 1536 292 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 6136 4380 -1468 ) ( 6136 4380 -1532 ) ( 6136 -6372 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1520 -6264 -1532 ) ( 1552 -6264 -1532 ) ( -1520 4488 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1516 -6220 -1532 ) ( -1516 -6220 -1468 ) ( 1556 -6220 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1544 -6256 -1532 ) ( -1544 4496 -1532 ) ( -1544 -6256 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-}
-{
 ( 2064 -2688 384 ) ( 2064 -3144 384 ) ( 1984 -2688 384 ) trak5x/floor-tile4e 64 240 0 0.5 0.5 0 0 0
 ( 2064 -2720 384 ) ( 1984 -2720 384 ) ( 2064 -2720 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2400 -2680 384 ) ( 2400 -2680 320 ) ( 2400 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index bf3ed8fdde6b19caa72cbbf6393d9678ded9131a..fc867f009cc78fda89bc24c3455d2a0e00cbff9e 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -3,4 +3,4 @@
 -vis + 
 -minimap +
 -sRGB
-Version: 2b
+Version: 2c