Merge branch 'master' into mirio/geoplanetary

diff --git a/maps/atelier.map b/maps/atelier.map
index 07c04cc33b3c6c9f00931f87d0fcece08e13d55c..068abbb692a63e3dee762e26707b5033ccdc86fd 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -2,7 +2,7 @@
 "classname" "worldspawn"
 "_floodlight" "255 190 150 128 128"
 "gridsize" "64 64 64"
-"author" "ShadoW"
+"author" "ShadoW, Mirio, Debugger"
 "message" "Atelier"
 {
 ( -704 -624 160 ) ( -704 -624 0 ) ( -704 -608 160 ) common/caulk 128 96 0 -0.25 0.25 0 0 0
@@ -6400,7 +6400,7 @@ exx/wall-crete02
 ( 760 8 64 ) ( 824 -56 64 ) ( 760 8 192 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 ( 1024 -256 -64 ) ( 896 -384 -64 ) ( 1024 -256 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 640 -128 64 ) ( 656 -144 -64 ) ( 640 -128 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
-( -448 -184 724 ) ( -576 -144 724 ) ( -576 -184 724 ) exx/wall-bigrib02 51.0100097656 44.0200004578 135 0.25 0.25 0 0 0
+( -448 -184 724 ) ( -576 -144 724 ) ( -576 -184 724 ) exx/wall-bigrib02 51.0100097656 5.0199999809 135 0.25 0.25 0 0 0
 }
 {
 ( 408 -416 724 ) ( 408 -664 724 ) ( 248 -416 724 ) common/caulk 32 96 0 0.25 0.25 134217728 0 0
@@ -6423,7 +6423,7 @@ exx/wall-crete02
 ( 376 -648 -20 ) ( 504 -520 -20 ) ( 376 -648 108 ) common/caulk 250.22265625 176 0 0.25 0.25 134217728 0 0
 ( 1024 -256 -84 ) ( 896 -384 -84 ) ( 1024 -256 44 ) common/caulk 0 176 0 0.25 0.25 134217728 0 0
 ( 644 -104 44 ) ( 660 -120 -84 ) ( 644 -104 -84 ) exx/wall-bigrib02 250.22265625 256 0 0.25 0.25 134217728 0 0
-( -448 -184 704 ) ( -576 -144 704 ) ( -576 -184 704 ) exx/wall-bigrib02 51.0100097656 13.0193252563 135 0.25 0.25 134217728 0 0
+( -448 -184 704 ) ( -576 -144 704 ) ( -576 -184 704 ) exx/wall-bigrib02 51.0099983215 13.0193252563 135 0.25 0.25 134217728 0 0
 ( 924 -356 64 ) ( 916 -348 -64 ) ( 924 -356 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
@@ -11851,12 +11851,12 @@ common/weapclip
 "classname" "trigger_push"
 "target" "target_position1"
 {
-( 1432 472 344 ) ( 1432 432 344 ) ( 1392 472 344 ) common/trigger 160 96 0 0.25 0.25 0 0 0
-( 1420 436 384 ) ( 1420 436 320 ) ( 1444 460 280 ) common/trigger 208 96 0 0.25 0.25 0 0 0
-( 1504 416 280 ) ( 1504 416 344 ) ( 1440 480 344 ) common/trigger 128 96 0 0.25 0.25 0 0 0
+( 1432.5 472 341.375 ) ( 1432.5 432 341.375 ) ( 1392.5 472 341.375 ) common/trigger 158 96 0 0.25 0.25 0 0 0
+( 1420.625 435.5 384 ) ( 1420.625 435.5 320 ) ( 1444.625 459.5 280 ) common/trigger 210 96 0 0.25 0.25 0 0 0
+( 1502.25 414.125 280 ) ( 1502.25 414.125 344 ) ( 1438.25 478.125 344 ) common/trigger 135.5 96 0 0.25 0.25 0 0 0
 ( 1392 432 320 ) ( 1432 432 320 ) ( 1392 472 320 ) common/trigger 160 96 0 0.25 0.25 0 0 0
-( 1456 396 280 ) ( 1456 396 344 ) ( 1480 420 344 ) common/trigger 112 96 0 0.25 0.25 0 0 0
-( 1376 416 320 ) ( 1376 416 384 ) ( 1440 352 344 ) common/trigger 32 96 0 0.25 0.25 0 0 0
+( 1457 394.875 280 ) ( 1457 394.875 344 ) ( 1481 418.875 344 ) common/trigger 116.5 96 0 0.25 0.25 0 0 0
+( 1380.5 417.5 320 ) ( 1380.5 417.5 384 ) ( 1444.5 353.5 344 ) common/trigger 26 96 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -37335,7 +37335,7 @@ exx/trim-psimple04
 {
 "classname" "dom_controlpoint"
 "origin" "1216.000000 672.000000 80.000000"
-"message" " has captured the ^2Nex ^3control point"
+"message" " has captured the ^2Vortex ^3control point"
 }
 {
 "classname" "light"
@@ -40793,3 +40793,8 @@ common/weapclip
 "origin" "-1792.000000 608.000000 336.000000"
 "message" " has captured the ^2Mega Armor ^3control point"
 }
+{
+"classname" "dom_controlpoint"
+"origin" "-512.000000 576.000000 400.000000"
+"message" " has captured the ^2Center Room ^3control point"
+}

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index ac30f3e5aee0c391dbbbfe82f8012e32f27ae70f..2f9b70c4c20a27a56a8400361a8c541c45cb3788 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 3a
\ No newline at end of file
+Version: 3d
\ No newline at end of file

diff --git a/maps/courtfun.map b/maps/courtfun.map
index cef741330672b3e8076e5fbd24118a0938e9fb3c..9559cab6ce30aca673b84ce64b32c73c2904e9aa 100644 (file)
--- a/maps/courtfun.map
+++ b/maps/courtfun.map
@@ -1,6 +1,6 @@
 {
 "classname" "worldspawn"
-"author" "SavageX & Calinou"
+"author" "SavageX, Calinou, Debugger"
 "message" "Courtfun"
 "license" "GPL"
 "spawnflags" "1"
@@ -35204,12 +35204,12 @@ map_courtfun/screen_obey
 "height" "64"
 "gametypefilter" "+rc,cts"
 {
-( -1536 2656 352 ) ( -1536 2560 352 ) ( -1776 2656 352 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1536 2656 336 ) ( -1776 2656 336 ) ( -1536 2656 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1600 2656 336 ) ( -1600 2656 320 ) ( -1600 2560 336 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1776 2560 320 ) ( -1536 2560 320 ) ( -1776 2656 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1776 2576 320 ) ( -1776 2576 336 ) ( -1536 2576 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1728 2560 320 ) ( -1728 2656 320 ) ( -1728 2560 336 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1533.1952362061 2623.405960083 362.625 ) ( -1578.2645111084 2538.6429901123 362.625 ) ( -1745.1026611328 2736.0791320801 362.625 ) common/trigger 101.3819351196 114.1533508301 -28.0000019073 0.25 0.25 0 0 0
+( -1530.47605896 2627.2758331299 336 ) ( -1742.3834838867 2739.9490203857 336 ) ( -1530.47605896 2627.2758331299 320 ) common/trigger 184.6893310547 0 0 0.2588757277 0.25 0 0 0
+( -1595.0788879395 2655.2021331787 336 ) ( -1595.0788879395 2655.2021331787 320 ) ( -1640.148147583 2570.439163208 336 ) common/trigger 93.0182189941 0 0 0.2588757277 0.25 0 0 0
+( -1789.6719360352 2651.3161621094 320 ) ( -1577.7645111084 2538.6429901123 320 ) ( -1744.6026611328 2736.0791320801 320 ) common/trigger 99.6160430908 115.0922927856 -28.0000019073 0.25 0.25 0 0 0
+( -1812.2853851318 2587.5683288574 320 ) ( -1812.2853851318 2587.5683288574 336 ) ( -1600.3779602051 2474.8951416016 320 ) common/trigger 52.7878227234 0 0 0.2588757277 0.25 0 0 0
+( -1735.6654510498 2623.0315246582 320 ) ( -1690.5961761475 2707.7944946289 320 ) ( -1735.6654510498 2623.0315246582 336 ) common/trigger 121.9896469116 0 0 0.2588757277 0.25 0 0 0
 }
 }
 {

diff --git a/maps/courtfun.map.options b/maps/courtfun.map.options
index e0458a1c1e71599fcfe1a3204443f9a0ab1bf373..c73b8568c8a912a58f5067355471f707c1adb939 100644 (file)
--- a/maps/courtfun.map.options
+++ b/maps/courtfun.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 11a
+Version: 11c
\ No newline at end of file

diff --git a/maps/dance.map b/maps/dance.map
index f4f06917cf32be6b49232aa4185ba3e4e737144e..1308b2f5cebaade26003004dfaad4dbd14bd5361 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -20461,6 +20461,135 @@ effects_jumppad/jumppadfx1_a
 ( 704 832 -272 ) ( 576 960 -272 ) ( 704 960 -272 ) exx/base-metal06rust 128 0 180 0.25 0.25 0 0 0
 ( 576 -1664 -320 ) ( 544 -1792 -320 ) ( 576 -1792 -320 ) exx/floor-tile03 128 0 180 0.25 0.25 0 0 0
 }
+{
+( 632 264 -64 ) ( 632 264 -160 ) ( 696 264 -160 ) common/clip 0 0 0 -0.5 0.5 0 0 0
+( 1210 -314 -64 ) ( 1210 -314 -160 ) ( 632 264 -160 ) common/clip 256 0 0 0.25 0.25 0 0 0
+( 1210 -314 -160 ) ( 1210 -314 -64 ) ( 1248 -288 -64 ) common/clip 128 0 0 -0.5 0.5 0 0 0
+( -952 -128 -160 ) ( -1080 -96 -160 ) ( -1080 -128 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 704 256 -64 ) ( 768 192 -64 ) ( 704 256 64 ) common/clip -0 0 0 0.25 0.25 0 0 0
+( -64 624 -64 ) ( -64 656 -64 ) ( 64 624 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -632 -264 -64 ) ( -632 -264 -160 ) ( -696 -264 -160 ) common/clip 0 0 0 0.5 0.5 0 0 0
+( -1210 314 -64 ) ( -1210 314 -160 ) ( -632 -264 -160 ) common/clip 256 0 0 -0.25 0.25 0 0 0
+( -1210 314 -160 ) ( -1210 314 -64 ) ( -1248 288 -64 ) common/clip 128 0 0 0.5 0.5 0 0 0
+( 960 120 -160 ) ( 1088 88 -160 ) ( 1088 120 -160 ) common/clip 0 -0 180 0.25 0.25 0 0 0
+( -704 -256 -64 ) ( -768 -192 -64 ) ( -704 -256 64 ) common/clip 0 0 0 -0.25 0.25 0 0 0
+( 64 -624 -64 ) ( 64 -656 -64 ) ( -64 -624 -64 ) common/clip 0 -0 180 0.25 0.25 0 0 0
+}
+{
+( -518 6 -64 ) ( -518 6 -160 ) ( -992 480 -160 ) common/clip 208 0 0 -0.25 0.25 0 0 0
+( -518 6 -160 ) ( -518 6 -64 ) ( -400 140 -160 ) common/clip 288 0 0 -0.25 0.25 0 0 0
+( -400 704 -64 ) ( -400 576 -64 ) ( -400 704 64 ) common/clip 256 0 0 -0.25 0.25 0 0 0
+( -992 480 -64 ) ( -960 512 -64 ) ( -992 480 64 ) common/clip 256 0 0 -0.25 0.25 0 0 0
+( 960 368 -160 ) ( 1088 336 -160 ) ( 1088 368 -160 ) common/clip 0 256 180 0.25 0.25 0 0 0
+( -780 1280 -32 ) ( -716 1216 -32 ) ( -780 1280 96 ) common/clip 256 0 0 -0.25 0.25 0 0 0
+( -448 952 96 ) ( -496 952 -32 ) ( -448 952 -32 ) common/clip 0 0 0 -0.25 0.25 0 0 0
+( 64 -624 -64 ) ( 64 -656 -64 ) ( -64 -624 -64 ) common/clip 0 -0 180 0.25 0.25 0 0 0
+}
+{
+( 996 -484 -160 ) ( 996 -484 -64 ) ( 518 -6 -160 ) common/clip 4.5 0 0 0.25 0.25 0 0 0
+( 518 -6 -160 ) ( 518 -6 -64 ) ( 360 -268 -64 ) common/clip 144 0 0 0.25 0.25 0 0 0
+( 360 -268 -160 ) ( 360 -268 -64 ) ( 335.25 -755.25 -64 ) common/clip 144 0 0 0.25 0.25 0 0 0
+( 996 -484 -64 ) ( 996 -484 -160 ) ( 526 -946 -160 ) common/clip 256 0 0 0.25 0.25 0 0 0
+( -952 -368 -160 ) ( -1080 -336 -160 ) ( -1080 -368 -160 ) common/clip 0 256 0 0.25 0.25 0 0 0
+( 812 -1232 -32 ) ( 748 -1168 -32 ) ( 812 -1232 96 ) common/clip 64 0 0 0.25 0.25 0 0 0
+( -64 624 -64 ) ( -64 656 -64 ) ( 64 624 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1528.4782714844 801.0959472656 -383.8393554688 ) ( 1550.7209472656 824.1014404297 -383.9467773438 ) ( 1505.47265625 823.3377685547 -384.0510253906 ) exx/base-metal04 33.4191894531 494.5179443359 -44.035949707 0.0625017881 0.0937520266 0 0 0
+( 1505.47265625 823.3377685547 -392.0510253906 ) ( 1527.7154541016 846.3432617188 -392.1584472656 ) ( 1482.9974365234 801.0053710938 -295.9462890625 ) exx/base-metal04 105.7946243286 489.6811523438 -44.0359535217 0.1161396205 0.115173839 0 0 0
+( 1528.4782714844 801.0959472656 -391.8393554688 ) ( 1505.47265625 823.3377685547 -392.0510253906 ) ( 1506.1580810547 778.3148193359 -359.7328491211 ) exx/base-metal04 75.6074066162 80.6601028442 -44.0359535217 0.0628073812 0.0467207395 0 0 0
+( 1536 832 -448 ) ( 1664 832 -256 ) ( 1536 832 -256 ) exx/base-metal04 -0 0 0 -0.25 0.25 0 0 0
+( 256 -1024 -384 ) ( -1216 192 -384 ) ( 256 192 -384 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
+}
+{
+( 1528.4782714844 801.0959472656 -383.8393554688 ) ( 1550.7209472656 824.1014404297 -383.9467773438 ) ( 1505.47265625 823.3377685547 -384.0510253906 ) exx/base-metal04 33.4191894531 494.5179443359 -44.035949707 0.0625017881 0.0937520266 0 0 0
+( 1505.7783203125 778.6513671875 -351.7332763672 ) ( 1504.2525634766 869.1459960938 -352.3714599609 ) ( 1550.263671875 824.6623535156 -351.9480895996 ) exx/base-metal04 37.1766357422 375.9302368164 -44.0359535217 0.06250453 0.187501967 0 0 0
+( 1550.7209472656 824.1014404297 -391.9467773438 ) ( 1528.4782714844 801.0959472656 -391.8393554688 ) ( 1572.7310791016 847.7799072266 -296.0568237305 ) exx/base-metal04 244.7597961426 356.7658691406 -44.0359535217 0.1161399856 0.1151738465 0 0 0
+( 1527.7154541016 846.3432617188 -392.1584472656 ) ( 1550.7209472656 824.1014404297 -391.9467773438 ) ( 1572.8862304688 847.3312988281 -360.0550537109 ) exx/base-metal04 76.0003509521 355.4490966797 -44.035949707 0.0628100634 0.0470356941 0 0 0
+( 1536 832 -448 ) ( 1664 832 -256 ) ( 1536 832 -256 ) exx/base-metal04 -0 0 0 -0.25 0.25 0 0 0
+( 256 192 -384 ) ( -1216 192 -384 ) ( 256 -1024 -384 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
+( 1536 -1280 -64 ) ( 1536 -1216 -64 ) ( 1536 -1280 64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
+}
+{
+( 1506.1580810547 778.3148193359 -359.7328491211 ) ( 1483.1525878906 800.556640625 -359.944519043 ) ( 1506.0417480469 778.6513671875 -311.734161377 ) exx/base-metal04 168.1041870117 147.1131896973 -44.035949707 0.0429062843 0.0427399874 0 0 0
+( 1505.7783203125 778.6513671875 -351.7332763672 ) ( 1504.2525634766 869.1459960938 -352.3714599609 ) ( 1550.263671875 824.6623535156 -351.9480895996 ) exx/base-metal04 37.1766357422 375.9302368164 -44.0359535217 0.06250453 0.187501967 0 0 0
+( 1528.4782714844 801.0959472656 -391.8393554688 ) ( 1505.47265625 823.3377685547 -392.0510253906 ) ( 1506.1580810547 778.3148193359 -359.7328491211 ) exx/base-metal04 75.6074066162 80.6601028442 -44.0359535217 0.0628073812 0.0467207395 0 0 0
+( 1504 -1760 64 ) ( 1504 -1744 -64 ) ( 1504 -1760 -64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
+( -1056 800 -64 ) ( -1040 800 -64 ) ( -1056 800 64 ) exx/base-metal04 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1528.4782714844 801.0959472656 -383.8393554688 ) ( 1550.7209472656 824.1014404297 -383.9467773438 ) ( 1505.47265625 823.3377685547 -384.0510253906 ) exx/base-metal04 33.4191894531 494.5179443359 -44.035949707 0.0625017881 0.0937520266 0 0 0
+( 1505.47265625 823.3377685547 -392.0510253906 ) ( 1527.7154541016 846.3432617188 -392.1584472656 ) ( 1482.9974365234 801.0053710938 -295.9462890625 ) exx/base-metal04 105.7946243286 489.6811523438 -44.0359535217 0.1161396205 0.115173839 0 0 0
+( 1505.7783203125 778.6513671875 -351.7332763672 ) ( 1504.2525634766 869.1459960938 -352.3714599609 ) ( 1550.263671875 824.6623535156 -351.9480895996 ) exx/base-metal04 37.1766357422 375.9302368164 -44.0359535217 0.06250453 0.187501967 0 0 0
+( 1527.7154541016 846.3432617188 -392.1584472656 ) ( 1550.7209472656 824.1014404297 -391.9467773438 ) ( 1572.8862304688 847.3312988281 -360.0550537109 ) exx/base-metal04 76.0003509521 355.4490966797 -44.035949707 0.0628100634 0.0470356941 0 0 0
+( 1536 832 -256 ) ( 1664 832 -256 ) ( 1536 832 -448 ) exx/base-metal04 -0 0 0 -0.25 0.25 0 0 0
+( 1536 960 -256 ) ( 1536 896 -448 ) ( 1536 896 -256 ) exx/base-metal04 128 0 0 -0.25 0.25 0 0 0
+}
+{
+( 1528.4782714844 801.0959472656 -383.8393554688 ) ( 1550.7209472656 824.1014404297 -383.9467773438 ) ( 1505.47265625 823.3377685547 -384.0510253906 ) exx/base-metal04 33.4191894531 494.5179443359 -44.035949707 0.0625017881 0.0937520266 0 0 0
+( 1527.7154541016 846.3432617188 -392.1584472656 ) ( 1550.7209472656 824.1014404297 -391.9467773438 ) ( 1572.8862304688 847.3312988281 -360.0550537109 ) exx/base-metal04 76.0003509521 355.4490966797 -44.035949707 0.0628100634 0.0470356941 0 0 0
+( 1536 832 -256 ) ( 1664 832 -256 ) ( 1536 832 -448 ) exx/base-metal04 -0 0 0 -0.25 0.25 0 0 0
+( 1536 896 -256 ) ( 1536 896 -448 ) ( 1536 960 -256 ) exx/base-metal04 128 0 0 -0.25 0.25 0 0 0
+( -1088 832 -384 ) ( -1088 896 -384 ) ( -960 832 -384 ) exx/base-metal04 -0 384 180 0.25 0.25 0 0 0
+}
+{
+( 1505.9990234375 823.3377685547 -320.155670166 ) ( 1551.2419433594 824.1014404297 -320.8559570312 ) ( 1528.9997558594 801.0959472656 -320.6703796387 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1550.2578125 824.6623535156 -352.8451538086 ) ( 1504.2562255859 869.1459960938 -351.8157348633 ) ( 1505.7734375 778.6513671875 -352.4739379883 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1571.9869384766 847.7799072266 -409.0275268555 ) ( 1528.9997558594 801.0959472656 -312.6703796387 ) ( 1551.2419433594 824.1014404297 -312.8559570312 ) exx/base-metal04 23.0050430298 489.7563781738 -44.0359535217 0.25 0.25 0 0 0
+( 1572.9851074219 847.3312988281 -345.036895752 ) ( 1551.2419433594 824.1014404297 -312.8559570312 ) ( 1528.2410888672 846.3432617188 -312.3412780762 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1536 832 -448 ) ( 1664 832 -256 ) ( 1536 832 -256 ) exx/base-metal04 -0 0 0 -0.25 0.25 0 0 0
+( 1536 -1280 -64 ) ( 1536 -1216 -64 ) ( 1536 -1280 64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
+}
+{
+( 1505.5100097656 778.6513671875 -392.4730834961 ) ( 1483.2578125 800.556640625 -343.9653930664 ) ( 1506.2585449219 778.3148193359 -344.4801025391 ) exx/base-metal04 23.0049209595 489.7565002441 -44.0359535217 0.25 0.25 0 0 0
+( 1550.2578125 824.6623535156 -352.8451538086 ) ( 1504.2562255859 869.1459960938 -351.8157348633 ) ( 1505.7734375 778.6513671875 -352.4739379883 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1506.2585449219 778.3148193359 -344.4801025391 ) ( 1505.9990234375 823.3377685547 -312.155670166 ) ( 1528.9997558594 801.0959472656 -312.6703796387 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1504 -1760 64 ) ( 1504 -1744 -64 ) ( 1504 -1760 -64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
+( -1056 800 -64 ) ( -1040 800 -64 ) ( -1056 800 64 ) exx/base-metal04 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1505.9990234375 823.3377685547 -320.155670166 ) ( 1551.2419433594 824.1014404297 -320.8559570312 ) ( 1528.9997558594 801.0959472656 -320.6703796387 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1482.2596435547 801.0053710938 -407.9560546875 ) ( 1528.2410888672 846.3432617188 -312.3412780762 ) ( 1505.9990234375 823.3377685547 -312.155670166 ) exx/base-metal04 23.0050430298 489.7563781738 -44.0359535217 0.25 0.25 0 0 0
+( 1550.2578125 824.6623535156 -352.8451538086 ) ( 1504.2562255859 869.1459960938 -351.8157348633 ) ( 1505.7734375 778.6513671875 -352.4739379883 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1572.9851074219 847.3312988281 -345.036895752 ) ( 1551.2419433594 824.1014404297 -312.8559570312 ) ( 1528.2410888672 846.3432617188 -312.3412780762 ) exx/base-metal04 0.7613372803 466.7514038086 -44.0359535217 0.25 0.25 0 0 0
+( 1536 832 -256 ) ( 1664 832 -256 ) ( 1536 832 -448 ) exx/base-metal04 -0 0 0 -0.25 0.25 0 0 0
+( 1536 960 -256 ) ( 1536 896 -448 ) ( 1536 896 -256 ) exx/base-metal04 128 0 0 -0.25 0.25 0 0 0
+}
+{
+( -1543.5217285156 -862.9040527344 -383.8393554688 ) ( -1521.2790527344 -839.8985595703 -383.9467773438 ) ( -1566.52734375 -840.6622314453 -384.0510253906 ) exx/base-metal04 477.8979797363 285.8718566895 -44.035949707 0.0625017881 0.0937520266 0 0 0
+( -1566.2216796875 -885.3486328125 -351.7332763672 ) ( -1567.7474365234 -794.8540039062 -352.3714599609 ) ( -1521.736328125 -839.3376464844 -351.9480895996 ) exx/base-metal04 480.913269043 15.4094238281 -44.0359535217 0.06250453 0.187501967 0 0 0
+( -1521.2790527344 -839.8985595703 -391.9467773438 ) ( -1543.5217285156 -862.9040527344 -391.8393554688 ) ( -1499.2689208984 -816.2200927734 -296.0568237305 ) exx/base-metal04 304.8802490234 42.0131835938 -44.0359535217 0.1161399856 0.1151738465 0 0 0
+( -1544.2845458984 -817.6567382812 -392.1584472656 ) ( -1521.2790527344 -839.8985595703 -391.9467773438 ) ( -1499.1137695312 -816.6687011719 -360.0550537109 ) exx/base-metal04 437.8876953125 179.4396362305 -44.035949707 0.0628100634 0.0470356941 0 0 0
+( -1536 -832 -448 ) ( -1408 -832 -256 ) ( -1536 -832 -256 ) exx/base-metal04 0 0 0 -0.25 0.25 0 0 0
+( -2816 -1472 -384 ) ( -4288 -1472 -384 ) ( -2816 -2688 -384 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
+( -1536 -2944 -64 ) ( -1536 -2880 -64 ) ( -1536 -2944 64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
+}
+{
+( -1543.5217285156 -862.9040527344 -383.8393554688 ) ( -1521.2790527344 -839.8985595703 -383.9467773438 ) ( -1566.52734375 -840.6622314453 -384.0510253906 ) exx/base-metal04 477.8979797363 285.8718566895 -44.035949707 0.0625017881 0.0937520266 0 0 0
+( -1566.52734375 -840.6622314453 -392.0510253906 ) ( -1544.2845458984 -817.6567382812 -392.1584472656 ) ( -1589.0025634766 -862.9946289062 -295.9462890625 ) exx/base-metal04 165.9471435547 174.9278564453 -44.0359535217 0.1161396205 0.115173839 0 0 0
+( -1566.2216796875 -885.3486328125 -351.7332763672 ) ( -1567.7474365234 -794.8540039062 -352.3714599609 ) ( -1521.736328125 -839.3376464844 -351.9480895996 ) exx/base-metal04 480.913269043 15.4094238281 -44.0359535217 0.06250453 0.187501967 0 0 0
+( -1544.2845458984 -817.6567382812 -392.1584472656 ) ( -1521.2790527344 -839.8985595703 -391.9467773438 ) ( -1499.1137695312 -816.6687011719 -360.0550537109 ) exx/base-metal04 437.8876953125 179.4396362305 -44.035949707 0.0628100634 0.0470356941 0 0 0
+( -1536 -832 -256 ) ( -1408 -832 -256 ) ( -1536 -832 -448 ) exx/base-metal04 0 0 0 -0.25 0.25 0 0 0
+( -1536 -704 -256 ) ( -1536 -768 -448 ) ( -1536 -768 -256 ) exx/base-metal04 128 0 0 -0.25 0.25 0 0 0
+}
+{
+( -1566.0009765625 -840.6622314453 -320.155670166 ) ( -1520.7580566406 -839.8985595703 -320.8559570312 ) ( -1543.0002441406 -862.9040527344 -320.6703796387 ) exx/base-metal04 112.0017929077 452.220916748 -44.0359535217 0.25 0.25 0 0 0
+( -1521.7421875 -839.3376464844 -352.8451538086 ) ( -1567.7437744141 -794.8540039062 -351.8157348633 ) ( -1566.2265625 -885.3486328125 -352.4739379883 ) exx/base-metal04 112.0017929077 452.220916748 -44.0359535217 0.25 0.25 0 0 0
+( -1500.0130615234 -816.2200927734 -409.0275268555 ) ( -1543.0002441406 -862.9040527344 -312.6703796387 ) ( -1520.7580566406 -839.8985595703 -312.8559570312 ) exx/base-metal04 200.0285644531 471.1069946289 -44.0359535217 0.25 0.25 0 0 0
+( -1499.0148925781 -816.6687011719 -345.036895752 ) ( -1520.7580566406 -839.8985595703 -312.8559570312 ) ( -1543.7589111328 -817.6567382812 -312.3412780762 ) exx/base-metal04 112.0017929077 452.220916748 -44.0359535217 0.25 0.25 0 0 0
+( -1536 -832 -448 ) ( -1408 -832 -256 ) ( -1536 -832 -256 ) exx/base-metal04 0 0 0 -0.25 0.25 0 0 0
+( -1536 -2944 -64 ) ( -1536 -2880 -64 ) ( -1536 -2944 64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
+}
+{
+( -1566.0009765625 -840.6622314453 -320.155670166 ) ( -1520.7580566406 -839.8985595703 -320.8559570312 ) ( -1543.0002441406 -862.9040527344 -320.6703796387 ) exx/base-metal04 112.0017929077 452.220916748 -44.0359535217 0.25 0.25 0 0 0
+( -1589.7403564453 -862.9946289062 -407.9560546875 ) ( -1543.7589111328 -817.6567382812 -312.3412780762 ) ( -1566.0009765625 -840.6622314453 -312.155670166 ) exx/base-metal04 200.0285644531 471.1069946289 -44.0359535217 0.25 0.25 0 0 0
+( -1521.7421875 -839.3376464844 -352.8451538086 ) ( -1567.7437744141 -794.8540039062 -351.8157348633 ) ( -1566.2265625 -885.3486328125 -352.4739379883 ) exx/base-metal04 112.0017929077 452.220916748 -44.0359535217 0.25 0.25 0 0 0
+( -1499.0148925781 -816.6687011719 -345.036895752 ) ( -1520.7580566406 -839.8985595703 -312.8559570312 ) ( -1543.7589111328 -817.6567382812 -312.3412780762 ) exx/base-metal04 112.0017929077 452.220916748 -44.0359535217 0.25 0.25 0 0 0
+( -1536 -832 -256 ) ( -1408 -832 -256 ) ( -1536 -832 -448 ) exx/base-metal04 0 0 0 -0.25 0.25 0 0 0
+( -1536 -704 -256 ) ( -1536 -768 -448 ) ( -1536 -768 -256 ) exx/base-metal04 128 0 0 -0.25 0.25 0 0 0
+}
 }
 {
 "classname" "trigger_push"
@@ -25224,3 +25353,45 @@ effects_jumppad/jumppadfx1_a
 "light" "175"
 "_color" "1 1 0.9"
 }
+{
+"classname" "misc_model"
+"origin" "335.999908 -79.999802 0.000000"
+"model" "models/lights/xonlight01.md3"
+"angle" "45.267586"
+}
+{
+"classname" "light"
+"origin" "335.999939 -79.999969 -17.999996"
+"light" "240"
+}
+{
+"classname" "light"
+"origin" "348.668335 -67.212746 -17.999996"
+"light" "240"
+}
+{
+"classname" "light"
+"origin" "322.627808 -93.497620 -17.999996"
+"light" "240"
+}
+{
+"classname" "misc_model"
+"origin" "-336.000092 80.000198 0.000000"
+"model" "models/lights/xonlight01.md3"
+"angle" "45.267586"
+}
+{
+"classname" "light"
+"origin" "-336.000061 80.000031 -17.999996"
+"light" "240"
+}
+{
+"classname" "light"
+"origin" "-323.331665 92.787254 -17.999996"
+"light" "240"
+}
+{
+"classname" "light"
+"origin" "-349.372192 66.502380 -17.999996"
+"light" "240"
+}

diff --git a/maps/dance.map.options b/maps/dance.map.options
index 681986a3168c8e6f7827fc5c4ee530b11a6e023b..c563d2625917f915a1024c66601c6412ede78002 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 5a
+Version: 5b
\ No newline at end of file

diff --git a/maps/drain.map b/maps/drain.map
index 80dd550fbbb6382a179cdf5a18fba1a03e4318c7..605fe3d7c93cadc25742cfb9ae42071ef50d30d3 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -1,5 +1,7 @@
 {
 "classname" "worldspawn"
+"message" "Drain"
+"author" "FruitieX, kuniu the frogg"
 {
 ( -240 -32 0 ) ( 16 -32 0 ) ( -240 224 0 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 ( -240 -64 0 ) ( -240 -64 192 ) ( 16 -64 192 ) common/caulk 64 0 0 0.25 0.25 0 0 0
@@ -9808,12 +9810,12 @@ trak5x/base-pipe1d
 "classname" "trigger_push"
 "target" "target_position1"
 {
-( 228 348 176 ) ( 228 296 176 ) ( 180 348 176 ) common/trigger 240 0 0 0.25 0.25 0 0 0
-( 248 376 132 ) ( 200 376 132 ) ( 248 376 128 ) common/trigger 160 0 0 0.25 0.25 0 0 0
-( 244 380 132 ) ( 244 380 128 ) ( 244 328 132 ) common/trigger 128 0 0 0.25 0.25 0 0 0
-( 176 296 128 ) ( 224 296 128 ) ( 176 348 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 164 292 128 ) ( 164 292 132 ) ( 212 292 128 ) common/trigger 48 0 0 0.25 0.25 0 0 0
-( 168 288 128 ) ( 168 340 128 ) ( 168 288 132 ) common/trigger 32 0 0 0.25 0.25 0 0 0
+( 249.1302947998 342.8143920898 160 ) ( 212.6830291748 305.7253875732 160 ) ( 214.8942871094 376.4580230713 160 ) common/trigger 122.3580856323 28.5217342377 -44.5000076294 0.2499998659 0.2499998659 0 0 0
+( 283.1425018311 347.8944396973 132 ) ( 248.9064941406 381.5380706787 132 ) ( 283.1425018311 347.8944396973 128 ) common/trigger 137.2804107666 245.80418396 90 8731.0458984375 0.250005424 0 0 0
+( 283.2213897705 354.6738586426 132 ) ( 283.2213897705 354.6738586426 128 ) ( 246.7741241455 317.584854126 132 ) common/trigger 43.7611083984 0 0 0.2659956217 0.25 0 0 0
+( 176.0940246582 342.1726531982 128 ) ( 210.3300323486 308.5290222168 128 ) ( 212.5412902832 379.2616577148 128 ) common/trigger 136.9316101074 29.9235534668 -44.5000076294 0.2499998659 0.2499998659 0 0 0
+( 136.3563842773 316.2305603027 128 ) ( 136.3563842773 316.2305603027 132 ) ( 170.5923919678 282.5869293213 128 ) common/trigger 23.8868045807 103.8016891479 90 8731.0458984375 0.250005424 0 0 0
+( 159.78074646 345.448928833 128 ) ( 196.228012085 382.5379333496 128 ) ( 159.78074646 345.448928833 132 ) common/trigger 192.0127716064 0 0 0.2659956217 0.25 0 0 0
 }
 }
 {
@@ -11721,7 +11723,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.953918 -188.056213 -255.521118"
+"origin" "-73.953918 -185.306213 -255.896118"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 5fd71631dcccd9ca3ca36d77e5bf97c8129fb733..f6f05cbd1e60ee41641ab3bf0bace28d1fe9fdd7 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 13b
+Version: 13d

diff --git a/maps/implosion.map b/maps/implosion.map
index 94ca7cc64deef4fcdd1acb0934867f3d637cf644..6654aad77cf46508197eb1c7f294e2d1a6592ffb 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -1,8 +1,8 @@
 {
 "classname" "worldspawn"
 "hurt" "20"
-"message" "implosion by mintOX"
-"author" "mintOX"
+"message" "Implosion"
+"author" "MintOX, Mirio, Mario"
 {
 ( 440 64 72 ) ( 440 -192 72 ) ( 184 64 72 ) map_implosion/s_solarpanel 0 42 90 0.5 0.5 134217728 0 0
 ( 472 -64 128 ) ( 216 -64 128 ) ( 472 -64 64 ) map_implosion/s_solarpanel 8 42 90 0.5 0.5 134217728 0 0
@@ -63888,54 +63888,6 @@ trak5x/trim-trim1b
 }
 }
 {
-patchDef2
-{
-trak5x/light-light2c-surfacelight
-( 3 3 0 0 0 )
-(
-( ( -288.125 -2240 80 0 0 ) ( -288.125 -2240 64 0 0.5 ) ( -288.125 -2240 48 0 1 ) )
-( ( -288.125 -2208 80 0.5 0 ) ( -288.125 -2208 64 0.5 0.5 ) ( -288.125 -2208 48 0.5 1 ) )
-( ( -288.125 -2176 80 1 0 ) ( -288.125 -2176 64 1 0.5 ) ( -288.125 -2176 48 1 1 ) )
-)
-}
-}
-{
-patchDef2
-{
-trak5x/light-light2c-surfacelight
-( 3 3 0 0 0 )
-(
-( ( -640 -1920.125 48 0 0 ) ( -640 -1920.125 64 0 -0.5 ) ( -640 -1920.125 80 0 -1 ) )
-( ( -608 -1920.125 48 0.5 0 ) ( -608 -1920.125 64 0.5 -0.5 ) ( -608 -1920.125 80 0.5 -1 ) )
-( ( -576 -1920.125 48 1 0 ) ( -576 -1920.125 64 1 -0.5 ) ( -576 -1920.125 80 1 -1 ) )
-)
-}
-}
-{
-patchDef2
-{
-trak5x/light-light2b-surfacelight
-( 3 3 0 0 0 )
-(
-( ( 4704.125 -3712 48 0 0 ) ( 4704.125 -3712 64 0 -0.5 ) ( 4704.125 -3712 80 0 -1 ) )
-( ( 4704.125 -3680 48 0.5 0 ) ( 4704.125 -3680 64 0.5 -0.5 ) ( 4704.125 -3680 80 0.5 -1 ) )
-( ( 4704.125 -3648 48 1 0 ) ( 4704.125 -3648 64 1 -0.5 ) ( 4704.125 -3648 80 1 -1 ) )
-)
-}
-}
-{
-patchDef2
-{
-trak5x/light-light2b-surfacelight
-( 3 3 0 0 0 )
-(
-( ( 4992 -3967.875 80 0 -1 ) ( 4992 -3967.875 64 0 -0.5 ) ( 4992 -3967.875 48 0 0 ) )
-( ( 5024 -3967.875 80 0.5 -1 ) ( 5024 -3967.875 64 0.5 -0.5 ) ( 5024 -3967.875 48 0.5 0 ) )
-( ( 5056 -3967.875 80 1 -1 ) ( 5056 -3967.875 64 1 -0.5 ) ( 5056 -3967.875 48 1 0 ) )
-)
-}
-}
-{
 ( 3056 -3560 -388 ) ( 3056 -3688 -388 ) ( 2640 -3560 -388 ) trak5x/trim-trim1b 64 64 90 0.5 0.5 134217728 0 0
 ( 2816 -3560 -392 ) ( 2400 -3560 -392 ) ( 2816 -3560 -496 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0
 ( 3408 -3560 -384 ) ( 3408 -3560 -488 ) ( 3408 -3688 -384 ) trak5x/trim-trim1b 0 0 90 0.5 0.5 134217728 0 0
@@ -77127,16 +77079,6 @@ logos/logo02_yellow_glowy
 }
 {
 "classname" "light"
-"origin" "-609.000000 -1937.000000 64.000000"
-"light" "500"
-}
-{
-"classname" "light"
-"origin" "-320.000000 -2208.000000 64.000000"
-"light" "500"
-}
-{
-"classname" "light"
 "origin" "-64.000000 -1408.000000 -24.000000"
 "light" "1000"
 }
@@ -77384,16 +77326,6 @@ logos/logo02_yellow_glowy
 }
 {
 "classname" "light"
-"origin" "5025.000000 -3951.000000 64.000000"
-"light" "500"
-}
-{
-"classname" "light"
-"origin" "4736.000000 -3680.000000 64.000000"
-"light" "500"
-}
-{
-"classname" "light"
 "origin" "4480.000000 -4480.000000 -24.000000"
 "light" "1000"
 }
@@ -78348,16 +78280,8 @@ logos/logo02_yellow_glowy
 "origin" "4008.000000 -4256.000000 384.000000"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "1703.999878 -2944.000000 -384.000000"
-"model" "models/xonotic_jumppad01/xonotic_launchpad01.md3"
-"angle" "-86.101425"
-"scale" "2"
-"skin" "0"
-}
-{
 "classname" "target_push"
-"origin" "512.000000 -3008.000000 -168.000000"
+"origin" "456.000000 -3008.000000 -168.000000"
 "targetname" "t12"
 }
 {
@@ -78412,18 +78336,10 @@ logos/logo02_yellow_glowy
 }
 }
 {
-"classname" "misc_gamemodel"
-"origin" "2712.000000 -2944.000244 -384.000000"
-"model" "models/xonotic_jumppad01/xonotic_launchpad01.md3"
-"angle" "94.612640"
-"scale" "2"
-"skin" "1"
-}
-{
 "classname" "target_push"
-"origin" "3904.000000 -2880.000000 -168.000000"
+"origin" "3960.000000 -2880.000000 -168.000000"
 "targetname" "t14"
-"angle" "180.000000"
+"angle" "-179.999985"
 }
 {
 "classname" "trigger_push"
@@ -78719,53 +78635,63 @@ logos/logo02_yellow_glowy
 "classname" "trigger_push"
 "target" "t6"
 {
-( 758.0822143555 -3412.6670532227 640 ) ( 665.3533172607 -3437.5136871338 640 ) ( 758.0822143555 -3412.6670532227 632 ) common/trigger 49.5389404297 224 0 0.2528758645 0.25 0 0 0
-( 679.8471984863 -3491.6055450439 632 ) ( 772.5760803223 -3466.7589111328 632 ) ( 665.3533172607 -3437.5136871338 632 ) common/trigger 92.0480957031 237.6434783936 15 0.2500000298 0.2500000298 0 0 0
-( 679.8471984863 -3491.6055450439 632 ) ( 679.8471984863 -3491.6055450439 640 ) ( 772.5760803223 -3466.7589111328 632 ) common/trigger 49.5389404297 224 0 0.2528758645 0.25 0 0 0
-( 674 64 639 ) ( 767 64 663 ) ( 674 -64 639 ) common/trigger 24 0 0 0.25 0.25 0 0 0
-( 672 -64 638 ) ( 672 64 632 ) ( 672 64 638 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 754 -3414 -64 ) ( 770 -3468 -64 ) ( 754 -3414 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 64 -3414 656 ) ( -64 -3468 656 ) ( -64 -3414 656 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 672 -3436 64 ) ( 687 -3489 -64 ) ( 672 -3436 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 794.6775817871 -3371.3126220703 662.75 ) ( 828.1066894531 -3494.3522033691 662.75 ) ( 590.335357666 -3426.8311767578 662.75 ) common/trigger 227.58984375 87.5434570313 15.200003624 0.4999999404 0.4999999404 0 0 0
+( 797.4275817871 -3374.3126220703 668 ) ( 593.085357666 -3429.8311767578 668 ) ( 797.4275817871 -3374.3126220703 620 ) common/trigger 137.6793212891 248 0 0.5321431756 0.5 0 0 0
+( 785.7693786621 -3377.2808227539 668 ) ( 785.7693786621 -3377.2808227539 620 ) ( 819.1985168457 -3500.3204345703 668 ) common/trigger 98.1137695313 248 0 0.5321431756 0.5 0 0 0
+( 623.764465332 -3549.8707580566 620 ) ( 828.1066894531 -3494.3522033691 620 ) ( 590.335357666 -3426.8311767578 620 ) common/trigger 227.58984375 87.5434570313 15.200003624 0.4999999404 0.4999999404 0 0 0
+( 616.764465332 -3536.3707580566 620 ) ( 616.764465332 -3536.3707580566 668 ) ( 821.1066894531 -3480.8522033691 620 ) common/trigger 156.0014648438 248 0 0.5321431756 0.5 0 0 0
+( 657.264465332 -3542.8707580566 620 ) ( 623.835357666 -3419.8311767578 620 ) ( 657.264465332 -3542.8707580566 668 ) common/trigger 72.7348632813 248 0 0.5321431756 0.5 0 0 0
 }
 }
 {
 "classname" "trigger_push"
 "target" "t7"
 {
-( 3657.9177856445 -2469.3329467773 640 ) ( 3750.6466827393 -2444.4863128662 640 ) ( 3657.9177856445 -2469.3329467773 632 ) common/trigger 104.6521759033 224 0 -0.2528758645 0.25 0 0 0
-( 3736.1528015137 -2390.3944549561 632 ) ( 3643.4239196777 -2415.2410888672 632 ) ( 3750.6466827393 -2444.4863128662 632 ) common/trigger 56.6656112671 143.7222900391 -165 0.2500000298 0.2500000298 0 0 0
-( 3736.1528015137 -2390.3944549561 632 ) ( 3736.1528015137 -2390.3944549561 640 ) ( 3643.4239196777 -2415.2410888672 632 ) common/trigger 104.6521759033 224 0 -0.2528758645 0.25 0 0 0
-( 3742 -5946 639 ) ( 3649 -5946 663 ) ( 3742 -5818 639 ) common/trigger 24 232 180 0.25 0.25 0 0 0
-( 3744 -5818 638 ) ( 3744 -5946 632 ) ( 3744 -5946 638 ) common/trigger 24 0 0 -0.25 0.25 0 0 0
-( 3662 -2468 -64 ) ( 3646 -2414 -64 ) ( 3662 -2468 64 ) common/trigger 24 0 0 -0.25 0.25 0 0 0
-( 4352 -2468 656 ) ( 4480 -2414 656 ) ( 4480 -2468 656 ) common/trigger 0 232 180 0.25 0.25 0 0 0
-( 3744 -2446 64 ) ( 3729 -2392 -64 ) ( 3744 -2446 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 3775.5147705078 -2326.3806762695 662.75 ) ( 3813.7423706055 -2451.4175109863 662.75 ) ( 3580.6676635742 -2385.9514160156 662.75 ) common/trigger 169.2509765625 88.8359375 17 0.5 0.5 0 0 0
+( 3786.0147705078 -2344.6306762695 668 ) ( 3591.1676635742 -2404.2014160156 668 ) ( 3786.0147705078 -2344.6306762695 620 ) common/trigger 100.0263671875 248 0 0.5082550645 0.5 0 0 0
+( 3757.0147705078 -2338.8806762695 668 ) ( 3757.0147705078 -2338.8806762695 620 ) ( 3795.2423706055 -2463.9175109863 668 ) common/trigger 204.37890625 248 0 0.5082550645 0.5 0 0 0
+( 3618.8952636719 -2510.9882507324 620 ) ( 3813.7423706055 -2451.4175109863 620 ) ( 3580.6676635742 -2385.9514160156 620 ) common/trigger 169.2509765625 88.8359375 17 0.5 0.5 0 0 0
+( 3617.8952636719 -2509.9882507324 620 ) ( 3617.8952636719 -2509.9882507324 668 ) ( 3812.7423706055 -2450.4175109863 620 ) common/trigger 122.6528320313 248 0 0.5082550645 0.5 0 0 0
+( 3634.0966186523 -2509.5237121582 620 ) ( 3595.8689880371 -2384.4868469238 620 ) ( 3634.0966186523 -2509.5237121582 668 ) common/trigger 178.3090820313 248 0 0.5082550645 0.5 0 0 0
+}
+}
+{
+"classname" "misc_gamemodel"
+"origin" "1663.999878 -2944.000000 -384.000000"
+"model" "models/xonotic_jumppad01/xonotic_launchpad01.md3"
+"angle" "-86.101440"
+"skin" "0"
+"scale" "2"
 }
+{
+"classname" "misc_gamemodel"
+"origin" "2752.000000 -2944.000244 -384.000000"
+"model" "models/xonotic_jumppad01/xonotic_launchpad01.md3"
+"angle" "94.612640"
+"skin" "1"
+"scale" "2"
 }
 {
 "classname" "trigger_push"
 "target" "t14"
 {
-( 2772.6678466797 -2905.9981994629 -376 ) ( 2677.0331268311 -2914.3651580811 -376 ) ( 2772.6678466797 -2905.9981994629 -384 ) common/trigger 252.6207275391 0 0 0.2567618787 0.25 0 0 0
-( 2681.9138641357 -2970.1520690918 -384 ) ( 2777.5485687256 -2961.7851257324 -384 ) ( 2677.0331268311 -2914.3651580811 -384 ) common/trigger 204.6313476563 125.6262207031 5.0000009537 0.2500000596 0.2500000596 0 0 0
-( 2681.9138641357 -2970.1520690918 -384 ) ( 2681.9138641357 -2970.1520690918 -376 ) ( 2777.5485687256 -2961.7851257324 -384 ) common/trigger 252.6207275391 0 0 0.2567618787 0.25 0 0 0
-( 3293.5799713135 532.4514923096 -377 ) ( 3385.167098999 516.3022155762 -353 ) ( 3271.353012085 406.3960876465 -377 ) common/trigger 99.6654052734 33.1457519531 -9.9999990463 0.25 0.25 0 0 0
-( 2768.4161834717 -2906.6020202637 -1080 ) ( 2774.7961120605 -2962.5600280762 -1080 ) ( 2768.4161834717 -2906.6020202637 -952 ) common/trigger 237.7098388672 32 0 0.2538418174 0.25 0 0 0
-( 2088.8987731934 -2786.7847747803 -360 ) ( 1953.4663696289 -2817.7374267578 -360 ) ( 1962.8433685303 -2764.557800293 -360 ) common/trigger 75.6654052734 33.1457519531 -9.9999990463 0.25 0.25 0 0 0
-( 2684 -2914 64 ) ( 2689 -2969 -64 ) ( 2684 -2914 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 2868.1811828613 -2871.0855407715 -353.25 ) ( 2878.6692810059 -2998.6549072266 -353.25 ) ( 2644.9347839355 -2889.4397277832 -353.25 ) common/trigger 1.4194335938 79.0947265625 4.7000012398 0.4999994636 0.4999994636 0 0 0
+( 2877.1811828613 -2878.3355407715 -348 ) ( 2653.9347839355 -2896.6897277832 -348 ) ( 2877.1811828613 -2878.3355407715 -396 ) common/trigger 200.7631835938 232 0 0.500813961 0.5 0 0 0
+( 2846.9976806641 -2878.8252258301 -348 ) ( 2846.9976806641 -2878.8252258301 -396 ) ( 2857.4858093262 -3006.3945922852 -348 ) common/trigger 132.0336914063 232 0 0.500813961 0.5 0 0 0
+( 2661.6728820801 -3017.0090942383 -396 ) ( 2884.9192810059 -2998.6549072266 -396 ) ( 2651.1847839355 -2889.4397277832 -396 ) common/trigger 244.9614257813 78.0703125 4.7000012398 0.4999994636 0.4999994636 0 0 0
+( 2661.8247070313 -3005.7573547363 -396 ) ( 2661.8247070313 -3005.7573547363 -348 ) ( 2885.071105957 -2987.4031677246 -396 ) common/trigger 205.7553710938 232 0 0.500813961 0.5 0 0 0
+( 2690.1523742676 -3015.1610412598 -396 ) ( 2679.664276123 -2887.5916748047 -396 ) ( 2690.1523742676 -3015.1610412598 -348 ) common/trigger 114.0615234375 232 0 0.500813961 0.5 0 0 0
 }
 }
 {
 "classname" "trigger_push"
 "target" "t12"
 {
-( 1643.3321533203 -2982.0018005371 -376 ) ( 1738.9668731689 -2973.6348419189 -376 ) ( 1643.3321533203 -2982.0018005371 -384 ) common/trigger 43.4349060059 0 0 -0.2567618787 0.25 0 0 0
-( 1734.0861358643 -2917.8479309082 -384 ) ( 1638.4514312744 -2926.2148742676 -384 ) ( 1738.9668731689 -2973.6348419189 -384 ) common/trigger 132.720413208 39.517414093 -175 0.2500000596 0.2500000596 0 0 0
-( 1734.0861358643 -2917.8479309082 -384 ) ( 1734.0861358643 -2917.8479309082 -376 ) ( 1638.4514312744 -2926.2148742676 -384 ) common/trigger 43.4349060059 0 0 -0.2567618787 0.25 0 0 0
-( 1122.4200286865 -6420.4514923096 -377 ) ( 1030.832901001 -6404.3022155762 -353 ) ( 1144.646987915 -6294.3960876465 -377 ) common/trigger 81.0716629028 192.0152893066 170 0.25 0.25 0 0 0
-( 1647.5838165283 -2981.3979797363 -1080 ) ( 1641.2038879395 -2925.4399719238 -1080 ) ( 1647.5838165283 -2981.3979797363 -952 ) common/trigger 82.1626586914 32 0 -0.2538418174 0.25 0 0 0
-( 2327.1012268066 -3101.2152252197 -360 ) ( 2462.5336303711 -3070.2625732422 -360 ) ( 2453.1566314697 -3123.442199707 -360 ) common/trigger 57.0716629028 192.0152893066 170 0.25 0.25 0 0 0
-( 1732 -2974 64 ) ( 1729 -2919 -64 ) ( 1732 -2974 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1753.7314453125 -2865.0000610352 -353.25 ) ( 1763.8050842285 -3016.6657409668 -353.25 ) ( 1530.2241516113 -2879.8453979492 -353.25 ) common/trigger 15.9948730469 50.138671875 3.8000016212 0.4999994636 0.4999994636 0 0 0
+( 1757.2314453125 -2883.7500610352 -348 ) ( 1533.7241516113 -2898.5953979492 -348 ) ( 1757.2314453125 -2883.7500610352 -396 ) common/trigger 136.6784667969 232 0 0.5000294447 0.5 0 0 0
+( 1726.7314453125 -2871.7500610352 -348 ) ( 1726.7314453125 -2871.7500610352 -396 ) ( 1736.8050842285 -3023.4157409668 -348 ) common/trigger 205.4838867188 232 0 0.5000294447 0.5 0 0 0
+( 1541.2977600098 -3031.5110778809 -396 ) ( 1764.8050842285 -3016.6657409668 -396 ) ( 1531.2241516113 -2879.8453979492 -396 ) common/trigger 13.9992675781 50.005859375 3.8000016212 0.4999994636 0.4999994636 0 0 0
+( 1538.7977600098 -3007.5110778809 -396 ) ( 1538.7977600098 -3007.5110778809 -348 ) ( 1762.3050842285 -2992.6657409668 -396 ) common/trigger 146.677734375 232 0 0.5000294447 0.5 0 0 0
+( 1568.906036377 -3023.7566833496 -396 ) ( 1558.8324279785 -2872.0910339355 -396 ) ( 1568.906036377 -3023.7566833496 -348 ) common/trigger 177.4853515625 232 0 0.5000294447 0.5 0 0 0
 }
 }

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index 1f5ccb0958ad8f3791a82929a4a85926aed6a8e8..b8dd36bf359ff9c1936f5afaee70d5caa0904f6f 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -1,5 +1,5 @@
--bsp +
--vis -fast +
--light -fast -deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 1 -fastbounce -bouncegrid -dirty -dirtscale 2
+-bsp + -samplesize 6
+-light + -fast -deluxe -patchshadows -samples 3  -bounce 8  -bouncegrid -dirty -dirtscale 2
+-vis + 
 -minimap +
-Version: 1b
\ No newline at end of file
+Version: 2

diff --git a/maps/oilrig.map b/maps/oilrig.map
index 86bf6fe521d384a305248a297815f71d43eca030..fde6c09fa78fb5fa0eadb71321b26c36a56e72e2 100644 (file)
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -1,10 +1,11 @@
 {
 "classname" "worldspawn"
-"message" "Oil Rig by Tronyn"
+"message" "Oilrig"
 "Version" "1.3"
 "_blocksize" "4096 4096 4096"
 "gridsize" "128 128 128"
 "fog" "1 0 0 0.05 1 800 5000 -805"
+"author" "Tronyn, Debugger, SavageX, Dustin Geeraert, Garth Hendy"
 {
 ( 360 -408 8 ) ( 360 -472 8 ) ( 360 -472 -8 ) exx/base-metal05rust 0 0 0 0.25 0.25 134217728 0 0
 ( 424 -408 16 ) ( 368 -408 16 ) ( 368 -408 0 ) exx/base-metal05rust 0 0 0 0.25 0.25 134217728 0 0
@@ -23671,12 +23672,12 @@ exx/wall-bigrib02
 "classname" "trigger_push"
 "target" "target_position4"
 {
-( 1296 184 -328 ) ( 1296 120 -328 ) ( 1232 184 -328 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1232 120 -344 ) ( 1296 120 -344 ) ( 1232 184 -344 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1232 152 -64 ) ( 1240 184 -64 ) ( 1232 152 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1240 176 -64 ) ( 1272 168 -64 ) ( 1240 176 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1288 176 -64 ) ( 1280 144 -64 ) ( 1288 176 64 ) common/trigger 160 0 0 0.25 0.25 0 0 0
-( 1280 112 -64 ) ( 1248 120 -64 ) ( 1280 112 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1291.7127075195 184.835357666 -328 ) ( 1290.9308319092 120.8401489258 -328 ) ( 1227.7174987793 185.6172485352 -328 ) common/trigger 26.5663566589 66.4098205566 -0.6999996901 0.2499999255 0.2499999255 0 0 0
+( 1226.4356536865 121.6281433105 -352.5 ) ( 1290.4308624268 120.8462524414 -352.5 ) ( 1227.2175445557 185.6233520508 -352.5 ) common/trigger 28.5663604736 66.4098205566 -0.6999996901 0.2499999255 0.2499999255 0 0 0
+( 1228.9564208984 153.7904205322 -64 ) ( 1237.3467712402 185.6902923584 -64 ) ( 1228.9564208984 153.7904205322 64 ) common/trigger 189.0574493408 0 0 0.2501268983 0.25 0 0 0
+( 1237.5629577637 182.7452697754 -64 ) ( 1269.4628295898 174.3549346924 -64 ) ( 1237.5629577637 182.7452697754 64 ) common/trigger 21.1590995789 0 0 0.2501268983 0.25 0 0 0
+( 1291.110824585 175.5312347412 -64 ) ( 1282.720489502 143.631362915 -64 ) ( 1291.110824585 175.5312347412 64 ) common/trigger 99.0558853149 0 0 0.2501268983 0.25 0 0 0
+( 1267.1574707031 88.3781738281 -64 ) ( 1235.257598877 96.7685089111 -64 ) ( 1267.1574707031 88.3781738281 64 ) common/trigger 58.1593589783 0 0 0.2501268983 0.25 0 0 0
 }
 }
 {

diff --git a/maps/oilrig.map.options b/maps/oilrig.map.options
index ab6af9a2bc98e909799b526d0de5ae0f18fe7e1d..08d1fae531e774b54af0801bc1bb6aa32d547272 100644 (file)
--- a/maps/oilrig.map.options
+++ b/maps/oilrig.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 6a
+Version: 6c
\ No newline at end of file

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 1befaf330ba7be46689509e19ba5d616215df385..4b1cf3d65868147bf5ff37bd95294aa4ac2aa891 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -1,10 +1,10 @@
 {
 "classname" "worldspawn"
-"author" "FruitieX & Cuinnton"
 "license" "GPL"
-"message" "Space Elevator"
 "description" "Small space elevator with 3 platforms."
 "_blocksize" "2048 2048 2048"
+"message" "Space Elevator"
+"author" "FruitieX, Mirio, Cuinnton"
 {
 ( 256 736 -128 ) ( 256 736 -192 ) ( 256 -736 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
 ( 192 736 -192 ) ( 192 736 -128 ) ( 192 -736 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
@@ -28770,30 +28770,6 @@ effects_jumppad/jumppadfx1_a
 "skin" "0"
 }
 {
-"classname" "trigger_push"
-"target" "t14"
-{
-( -480 -768 -112 ) ( -352 -896 -48 ) ( -480 -896 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -480 -832 -112 ) ( -480 -832 -80 ) ( -352 -832 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -416 -768 -144 ) ( -416 -896 -48 ) ( -416 -896 -80 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -352 -736 -144 ) ( -480 -864 -80 ) ( -352 -864 -80 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -352 -768 -112 ) ( -480 -768 -144 ) ( -352 -768 -144 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( -352 -768 -112 ) ( -352 -896 -80 ) ( -352 -896 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-}
-}
-{
-"classname" "trigger_push"
-"target" "t13"
-{
-( 304 -768 -112 ) ( 432 -896 -48 ) ( 304 -896 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 304 -832 -112 ) ( 304 -832 -80 ) ( 432 -832 -112 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 352 -768 -128 ) ( 352 -896 -32 ) ( 352 -896 -64 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 432 -768 -128 ) ( 304 -896 -64 ) ( 432 -896 -64 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 432 -768 -96 ) ( 304 -768 -128 ) ( 432 -768 -128 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-( 416 -768 -96 ) ( 416 -896 -64 ) ( 416 -896 -32 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
-}
-}
-{
 "classname" "target_position"
 "origin" "-384.000000 -1792.000000 256.000000"
 "targetname" "t14"
@@ -29746,30 +29722,6 @@ effects_jumppad/jumppadfx1_a
 "angle" "-179.999985"
 }
 {
-"classname" "trigger_push"
-"target" "t12"
-{
-( 480 768 -112 ) ( 352 896 -48 ) ( 480 896 -48 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( 480 832 -112 ) ( 480 832 -80 ) ( 352 832 -112 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( 416 768 -144 ) ( 416 896 -48 ) ( 416 896 -80 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( 352 736 -144 ) ( 480 864 -80 ) ( 352 864 -80 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( 352 768 -112 ) ( 480 768 -144 ) ( 352 768 -144 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( 352 768 -112 ) ( 352 896 -80 ) ( 352 896 -48 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-}
-}
-{
-"classname" "trigger_push"
-"target" "t10"
-{
-( -304 768 -112 ) ( -432 896 -48 ) ( -304 896 -48 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( -304 832 -112 ) ( -304 832 -80 ) ( -432 832 -112 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( -352 768 -128 ) ( -352 896 -32 ) ( -352 896 -64 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( -432 768 -128 ) ( -304 896 -64 ) ( -432 896 -64 ) common/trigger 256 -0 180 0.25 0.25 134217728 0 0
-( -432 768 -96 ) ( -304 768 -128 ) ( -432 768 -128 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-( -416 768 -96 ) ( -416 896 -64 ) ( -416 896 -32 ) common/trigger 0 0 0 -0.25 0.25 134217728 0 0
-}
-}
-{
 "classname" "target_position"
 "origin" "384.000000 1792.000000 256.000000"
 "targetname" "t12"
@@ -30564,3 +30516,51 @@ effects_jumppad/jumppadfx1_a
 "origin" "1993.48645 -4134.79639 1074.40051"
 "angles" "22.0440674 123.793945 0"
 }
+{
+"classname" "trigger_push"
+"target" "t14"
+{
+( -348.875 -709.5 -80 ) ( -348.875 -805.875 -80 ) ( -419 -709.5 -80 ) common/trigger 250 0 0 0.25 0.25 0 0 0
+( -350.25 -726.25 -80 ) ( -420.375 -726.25 -80 ) ( -350.25 -726.25 -128 ) common/trigger 255.5 0 0 0.25 0.25 0 0 0
+( -356.375 -710 -80 ) ( -356.375 -710 -128 ) ( -356.375 -806.375 -80 ) common/trigger 2 0 0 0.25 0.25 0 0 0
+( -420.5 -805.875 -128 ) ( -350.375 -805.875 -128 ) ( -420.5 -709.5 -128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -420.625 -832 -126.875 ) ( -420.625 -832 -78.875 ) ( -350.5 -832 -126.875 ) common/trigger 0.5 4.5 0 0.25 0.25 0 0 0
+( -411.5 -805.625 -128 ) ( -411.5 -709.25 -128 ) ( -411.5 -805.625 -80 ) common/trigger 255 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_push"
+"target" "t12"
+{
+( 414.625 811.75 -80 ) ( 414.625 724.75 -80 ) ( 352.5 811.75 -80 ) common/trigger 254 223.5 0 0.25 0.25 0 0 0
+( 414.125 832 -79.875 ) ( 352 832 -79.875 ) ( 414.125 832 -127.875 ) common/trigger 0 0.5 0 0.25 0.25 0 0 0
+( 411.625 811.5 -79.875 ) ( 411.625 811.5 -127.875 ) ( 411.625 724.5 -79.875 ) common/trigger 33.5 0.5 0 0.25 0.25 0 0 0
+( 352 724.75 -127.875 ) ( 414.125 724.75 -127.875 ) ( 352 811.75 -127.875 ) common/trigger 0 223.5 0 0.25 0.25 0 0 0
+( 351.875 726.25 -127.875 ) ( 351.875 726.25 -79.875 ) ( 414 726.25 -127.875 ) common/trigger 0.5 0.5 0 0.25 0.25 0 0 0
+( 356.5 724.75 -128 ) ( 356.5 811.75 -128 ) ( 356.5 724.75 -80 ) common/trigger 32.5 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_push"
+"target" "t13"
+{
+( 419 -709.625 -80 ) ( 419 -806 -80 ) ( 348.875 -709.625 -80 ) common/trigger 250.5 255.5 0 0.25 0.25 0 0 0
+( 417.625 -726.375 -80 ) ( 347.5 -726.375 -80 ) ( 417.625 -726.375 -128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 411.5 -710.125 -80 ) ( 411.5 -710.125 -128 ) ( 411.5 -806.5 -80 ) common/trigger 2.5 0 0 0.25 0.25 0 0 0
+( 347.375 -806 -128 ) ( 417.5 -806 -128 ) ( 347.375 -709.625 -128 ) common/trigger 0.5 255.5 0 0.25 0.25 0 0 0
+( 347.25 -832.125 -126.875 ) ( 347.25 -832.125 -78.875 ) ( 417.375 -832.125 -126.875 ) common/trigger 1 4.5 0 0.25 0.25 0 0 0
+( 356.375 -805.75 -128 ) ( 356.375 -709.375 -128 ) ( 356.375 -805.75 -80 ) common/trigger 255.5 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_push"
+"target" "t10"
+{
+( -353.375 811.75 -80 ) ( -353.375 724.75 -80 ) ( -415.5 811.75 -80 ) common/trigger 254 223.5 0 0.25 0.25 0 0 0
+( -353.875 832 -79.875 ) ( -416 832 -79.875 ) ( -353.875 832 -127.875 ) common/trigger 0 0.5 0 0.25 0.25 0 0 0
+( -356.375 811.5 -79.875 ) ( -356.375 811.5 -127.875 ) ( -356.375 724.5 -79.875 ) common/trigger 33.5 0.5 0 0.25 0.25 0 0 0
+( -416 724.75 -127.875 ) ( -353.875 724.75 -127.875 ) ( -416 811.75 -127.875 ) common/trigger 0 223.5 0 0.25 0.25 0 0 0
+( -416.125 726.25 -127.875 ) ( -416.125 726.25 -79.875 ) ( -354 726.25 -127.875 ) common/trigger 0.5 0.5 0 0.25 0.25 0 0 0
+( -411.5 724.75 -128 ) ( -411.5 811.75 -128 ) ( -411.5 724.75 -80 ) common/trigger 32.5 0 0 0.25 0.25 0 0 0
+}
+}

diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index 99dfc9ef5193a3263cd0520a34dbf0058671d207..03d9a6f8b3c402d3a0de610eae62c8b955d69b6d 100644 (file)
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 5
+Version: 6
\ No newline at end of file

diff --git a/scripts/entities.ent b/scripts/entities.ent
index cea79a935c2c244f2e6a2c949a86358e130767c8..f37e0b2299f2f0751b96b16d7dbe1b770bad8de8 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -206,6 +206,8 @@ BIDIR_IN_DOWN will the door prevent from reopening while closing if it is trigge
 <flag key="DOOR_DONT_LINK" name="DOOR_DONT_LINK" bit="2">the door won't link with another door it touches</flag>
 <flag key="TOGGLE" name="TOGGLE" bit="5">causes the door to wait in both the start and end states for a trigger event.</flag>
 <flag key="NOSPLASH" name="NOSPLASH" bit="8">if set, splash damage cannot activate the door, only direct damage can (requires health to be set)</flag>
+<flag key="X_AXIS" name="X_AXIS" bit="6">rotate around the X axis</flag>
+<flag key="Y_AXIS" name="Y_AXIS" bit="7">rotate around the Y axis</flag>
 </group>
 
 <group name="func_door_secret" color="0 .5 .8">