Merge branch 'master' into mirio/mapfixes

diff --git a/maps/implosion.map b/maps/implosion.map
index 0eb2e6a88aed7141f4ff59171aa19f4dbd99e204..f5d4e5a11d374556dc40570f59fb024d89adc6b0 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -6070,11 +6070,11 @@ common/caulk
 }
 {
 ( 112 -2704 448 ) ( 112 -2728 448 ) ( 80 -2704 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 112 -2696 576 ) ( 80 -2696 576 ) ( 112 -2696 384 ) trak5x/trim-trim3d 0 384 90 0.5 0.5 0 0 0
-( 576 -2704 576 ) ( 576 -2704 384 ) ( 576 -2728 576 ) trak5x/trim-trim3d 0 256 90 0.5 0.5 0 0 0
+( 112 -2696 576 ) ( 80 -2696 576 ) ( 112 -2696 384 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
+( 576 -2704 576 ) ( 576 -2704 384 ) ( 576 -2728 576 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 80 -2728 384 ) ( 112 -2728 384 ) ( 80 -2704 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( 80 -2752 384 ) ( 80 -2752 576 ) ( 112 -2752 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 64 -2728 384 ) ( 64 -2704 384 ) ( 64 -2728 576 ) trak5x/trim-trim3d 0 272 90 0.5 0.5 0 0 0
+( 64 -2728 384 ) ( 64 -2704 384 ) ( 64 -2728 576 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 }
 {
 patchDef2
@@ -9196,9 +9196,9 @@ trak5x/base-base1b
 {
 ( 896 -3648 448 ) ( 896 -3704 448 ) ( 760 -3648 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 896 -3648 448 ) ( 760 -3648 448 ) ( 896 -3648 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 576 -3664 448 ) ( 576 -3664 384 ) ( 576 -3720 448 ) trak5x/trim-trim3d 0 256 90 0.5 0.5 0 0 0
+( 576 -3664 448 ) ( 576 -3664 384 ) ( 576 -3720 448 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 760 -3704 384 ) ( 896 -3704 384 ) ( 760 -3648 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( 760 -3704 384 ) ( 760 -3704 448 ) ( 896 -3704 384 ) trak5x/trim-trim3d 0 384 90 0.5 0.5 0 0 0
+( 760 -3704 384 ) ( 760 -3704 448 ) ( 896 -3704 384 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 64 -3704 384 ) ( 64 -3648 384 ) ( 64 -3704 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
@@ -16083,7 +16083,7 @@ trak5x/base-base1b
 {
 ( 576 -3496 448 ) ( 576 -3648 448 ) ( 512 -3496 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 576 -2752 448 ) ( 512 -2752 448 ) ( 576 -2752 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 576 -3496 448 ) ( 576 -3496 384 ) ( 576 -3648 448 ) trak5x/trim-trim3d 0 256 90 0.5 0.5 0 0 0
+( 576 -3496 448 ) ( 576 -3496 384 ) ( 576 -3648 448 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 512 -3648 384 ) ( 576 -3648 384 ) ( 512 -3496 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 512 -3648 384 ) ( 512 -3648 448 ) ( 576 -3648 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 512 -3648 384 ) ( 512 -3496 384 ) ( 512 -3648 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -33571,11 +33571,11 @@ common/caulk
 }
 {
 ( 4304 -3184 448 ) ( 4304 -3160 448 ) ( 4336 -3184 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 4304 -3192 576 ) ( 4336 -3192 576 ) ( 4304 -3192 384 ) trak5x/trim-trim3b 0 384 90 0.5 0.5 0 0 0
-( 3840 -3184 576 ) ( 3840 -3184 384 ) ( 3840 -3160 576 ) trak5x/trim-trim3b 0 256 90 0.5 0.5 0 0 0
+( 4304 -3192 576 ) ( 4336 -3192 576 ) ( 4304 -3192 384 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
+( 3840 -3184 576 ) ( 3840 -3184 384 ) ( 3840 -3160 576 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 4336 -3160 384 ) ( 4304 -3160 384 ) ( 4336 -3184 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( 4336 -3136 384 ) ( 4336 -3136 576 ) ( 4304 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 4352 -3160 384 ) ( 4352 -3184 384 ) ( 4352 -3160 576 ) trak5x/trim-trim3d 0 272 90 0.5 0.5 0 0 0
+( 4352 -3160 384 ) ( 4352 -3184 384 ) ( 4352 -3160 576 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 }
 {
 patchDef2
@@ -36681,9 +36681,9 @@ trak5x/base-base1b
 {
 ( 3520 -2240 448 ) ( 3520 -2184 448 ) ( 3656 -2240 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3520 -2240 448 ) ( 3656 -2240 448 ) ( 3520 -2240 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 3840 -2224 448 ) ( 3840 -2224 384 ) ( 3840 -2168 448 ) trak5x/trim-trim3b 0 256 90 0.5 0.5 0 0 0
+( 3840 -2224 448 ) ( 3840 -2224 384 ) ( 3840 -2168 448 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 3656 -2184 384 ) ( 3520 -2184 384 ) ( 3656 -2240 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( 3656 -2184 384 ) ( 3656 -2184 448 ) ( 3520 -2184 384 ) trak5x/trim-trim3b 0 384 90 0.5 0.5 0 0 0
+( 3656 -2184 384 ) ( 3656 -2184 448 ) ( 3520 -2184 384 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 4352 -2184 384 ) ( 4352 -2240 384 ) ( 4352 -2184 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
@@ -43568,7 +43568,7 @@ trak5x/base-base1b
 {
 ( 3840 -2392 448 ) ( 3840 -2240 448 ) ( 3904 -2392 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3840 -3136 448 ) ( 3904 -3136 448 ) ( 3840 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 3840 -2392 448 ) ( 3840 -2392 384 ) ( 3840 -2240 448 ) trak5x/trim-trim3b 0 256 90 0.5 0.5 0 0 0
+( 3840 -2392 448 ) ( 3840 -2392 384 ) ( 3840 -2240 448 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 3904 -2240 384 ) ( 3840 -2240 384 ) ( 3904 -2392 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3904 -2240 384 ) ( 3904 -2240 448 ) ( 3840 -2240 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3904 -2240 384 ) ( 3904 -2392 384 ) ( 3904 -2240 448 ) 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 027b4b8a0bab0ced14bd5143a8336db211af12e3..1f5ccb0958ad8f3791a82929a4a85926aed6a8e8 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -1,4 +1,5 @@
 -bsp +
 -vis -fast +
 -light -fast -deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 1 -fastbounce -bouncegrid -dirty -dirtscale 2
--minimap +
\ No newline at end of file
+-minimap +
+Version: 1b
\ No newline at end of file

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 2523b7284a4a626e7e7e7aa236e5f9ec74069848..0e1b840c6eac1bb56081fdd32d15ccc5340ff9c9 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -19805,8 +19805,8 @@ exx/base-metal03
 }
 {
 "classname" "info_player_deathmatch"
-"angle" "225"
-"origin" "1472 896 0"
+"origin" "1760.000000 336.000000 0.000000"
+"angle" "-180.000000"
 }
 {
 "classname" "item_cells"

diff --git a/maps/stormkeep.map.options b/maps/stormkeep.map.options
index bace8666236da06425c83a9e9e0bb078498b131b..a798180e103c2f890a6b74ddb3b66f0e43217e2d 100644 (file)
--- a/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 10
\ No newline at end of file
+Version: 10a
\ No newline at end of file