Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir

diff --git a/maps/fuse.map b/maps/fuse.map
index bd7343aa0b3bf71d957c6fe424da28f7698b18be..039a0decc9e87aeec4a3859f15b8b7cbde57d1cc 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -28396,6 +28396,17 @@ brushDef
 ( 376 -580 168 ) ( 376 -580 160 ) ( 316 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 }
 }
+{
+brushDef
+{
+( 184 320 288 ) ( 64 320 288 ) ( 184 320 128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 184 320 288 ) ( 184 320 128 ) ( 184 128 288 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 64 128 128 ) ( 184 128 128 ) ( 64 320 128 ) ( ( 0.015625 0 254 ) ( 0 0.0166666675 3.0666668415 ) ) common/clip 134217728 0 0
+( 64 128 128 ) ( 64 128 288 ) ( 184 128 128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 64 128 128 ) ( 64 320 128 ) ( 64 128 288 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.5 ) ) common/clip 134217728 0 0
+( 80 64 136 ) ( 112 64 136 ) ( 80 -64 136 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
 }
 {
 "classname" "func_group"

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index 06342c75c6769f849d61f4b1fcbe8a58fcb4c737..58b6bfc20b6060a50520ee60a3b437b2ffc1f02a 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8a
+Version: 8b