Merge remote branch 'origin/master' into savagex/techassault

diff --git a/maps/campaignxonoticbeta.txt b/maps/campaignxonoticbeta.txt
new file mode 100644 (file)
index 0000000..d6ae77b
--- /dev/null
+++ b/maps/campaignxonoticbeta.txt
@@ -0,0 +1,8 @@
+"//campaign:Xonotic Beta Campaign"
+//"game","mapname","bots","skill","fraglimit","timelimit","mutator-sets","description","long description"
+"dm","red-planet","3","1","15",,,"DM: Red Planet","Welcome to Xonotic!\nWe'll start off easy with Deathmatch against 3 beginner bots on Red Planet. Xonotic is mainly a multiplayer game, but before jumping into online games it can be a good idea to practice a bit against bots. After finishing the campaign you should be set for online play, either on special beginners-only servers or regular servers, that's up to you. :)"
+"tdm","stormkeep","3","3",,"10",,"TDM: Stormkeep","Next we'll try some 2on2 Team Deathmatch on Stormkeep.\nYou'll have to do your best for ten minutes, because the team with the highest score after this time limit will be the winning team! The opponents are also slightly more difficult now. Don't let the warpzone get you lost!"
+"dm","glowplant","1","5",,"10",,"1v1 Duel: Glowplant","Now it's time for you to show what you've learnt so far!\nIn a duel, it is important to collect and control items, especially the bigger powerups such as the Mega Health. They all spawn at regular intervals, learning to time them is the key... This is a 10 minute match, the player who ends up with the highest score wins."
+"ctf","dance","5","7","5",,,"CTF: Dance","By now you are expected to know the basics so let's try something entirely new, namely Capture the Flag! In CTF you're supposed to bring the enemy flag to your own base, but that's not enough: both flags have to be in your base for a successful capture. First team to reach 5 flag captures wins."
+"ctf","space-elevator","5","9","5",,,"CTF: Space Elevator","More CTF!\nThis map is way more open than Dance, it is a space floater after all. Be careful not to fall down! Use the launchpads to your advantage to get up to huge speeds quick. Same story as before, 5 caps to win."
+"dm","g-23","3","14",,"10",,"DM: G-23","Let's end this with a real challenge!\nYou'll face three Godlike bots in a 10-minute Deathmatch on the G-23 docking station. Can you prove that you are the best?

diff --git a/maps/dance.map b/maps/dance.map
index 6d8fcaf12f407bab6fd73579ceed5033a7a88f8f..4d542fe420e2e2cc322b08e53cc3e1a9d935a89d 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -477,14 +477,6 @@
 ( 320 -1280 64 ) ( 384 -1344 0 ) ( 384 -1344 64 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 }
 {
-( -1600 384 128 ) ( -1544 440 128 ) ( -1544 428.625 128 ) exx/base-metal04 512 256 180 0.25 0.25 0 0 0
-( -1600 384 120 ) ( -1544 428.625 120 ) ( -1544 440 120 ) exx/base-metal04 512 256 180 0.25 0.25 0 0 0
-( -1600 384 128 ) ( -1544 440 120 ) ( -1544 440 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 372.625 120 ) ( -1544 428.625 128 ) ( -1544 428.625 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1544 440 128 ) ( -1544 428.625 120 ) ( -1544 428.625 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 384 120 ) ( -1600 372.625 128 ) ( -1600 372.625 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-}
-{
 ( 608 -480 -128 ) ( 608 96 -128 ) ( 992 -480 -128 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
 ( 992 96 -192 ) ( 608 96 -192 ) ( 992 -480 -192 ) exx/base-metal04 0 256 0 0.25 0.25 0 0 0
 ( 608 -96 -176 ) ( 672 -32 -176 ) ( 608 -96 -48 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
@@ -7119,14 +7111,6 @@ exx/base-metal01
 ( -1608 264 120 ) ( -1608 376 96 ) ( -1608 376 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1632 384 64 ) ( -1536 160 64 ) ( -1536 480 64 ) narmorx/base-concrete05_blue 1024 256 180 0.25 0.25 0 0 0
-( -1632 256 96 ) ( -1536 160 96 ) ( -1536 160 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1536 480 96 ) ( -1536 160 64 ) ( -1536 160 96 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1536 480 96 ) ( -1632 384 96 ) ( -1632 384 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1536 480 96 ) ( -1536 160 96 ) ( -1632 384 96 ) narmorx/base-concrete05_blue 1024 256 180 0.25 0.25 0 0 0
-( -1632 384 64 ) ( -1632 256 96 ) ( -1632 256 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -1544 428.625 128 ) ( -1544 211.375 128 ) ( -1600 372.625 128 ) exx/floor-rnd02 512 256 180 0.25 0.25 0 0 0
 ( -1600 372.625 120 ) ( -1544 211.375 120 ) ( -1544 428.625 120 ) exx/floor-rnd02 512 256 180 0.25 0.25 0 0 0
 ( -1544 428.625 128 ) ( -1544 211.375 120 ) ( -1544 211.375 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
@@ -10123,14 +10107,6 @@ facility114x/misc-tube
 ( -544 -32 -64 ) ( -576 0 -64 ) ( -544 -32 64 ) exx/floor-rnd02 506.6711425781 506.6711425781 135 0.25 -0.25 0 0 0
 }
 {
-( -1600 256 128 ) ( -1544 211.375 128 ) ( -1544 200 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1600 256 120 ) ( -1544 200 120 ) ( -1544 211.375 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1600 256 120 ) ( -1544 200 128 ) ( -1544 200 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 267.375 128 ) ( -1544 211.375 120 ) ( -1544 211.375 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1544 211.375 128 ) ( -1544 200 120 ) ( -1544 200 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 256 128 ) ( -1600 267.375 120 ) ( -1600 267.375 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -960 1664 64 ) ( -896 1664 64 ) ( -960 1600 64 ) exx/floor-simple05 0 -0 180 0.25 0.25 0 0 0
 ( -896 1664 0 ) ( -960 1600 0 ) ( -896 1600 0 ) exx/base-metal02 0 256 180 0.25 0.25 0 0 0
 ( -896 1600 64 ) ( -896 1664 0 ) ( -896 1600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -17011,14 +16987,6 @@ exx/base-metal01
 ( -960 1440 64 ) ( -1344 1312 64 ) ( -960 1312 64 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
 }
 {
-( -1608 376 120 ) ( -1536 448 96 ) ( -1536 448 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1536 448 120 ) ( -1536 192 96 ) ( -1536 192 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1536 448 120 ) ( -1536 192 120 ) ( -1608 376 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1608 264 120 ) ( -1536 192 120 ) ( -1536 192 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1608 264 96 ) ( -1536 192 96 ) ( -1608 376 96 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1608 264 120 ) ( -1608 376 96 ) ( -1608 376 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -1632 384 64 ) ( -1536 160 64 ) ( -1536 480 64 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
 ( -1632 256 96 ) ( -1536 160 96 ) ( -1536 160 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
 ( -1536 480 96 ) ( -1536 160 64 ) ( -1536 160 96 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
@@ -17027,22 +16995,6 @@ exx/base-metal01
 ( -1632 384 64 ) ( -1632 256 96 ) ( -1632 256 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1544 428.625 128 ) ( -1544 211.375 128 ) ( -1600 372.625 128 ) exx/floor-rnd02 0 256 180 0.25 0.25 0 0 0
-( -1600 372.625 120 ) ( -1544 211.375 120 ) ( -1544 428.625 120 ) exx/floor-rnd02 0 256 180 0.25 0.25 0 0 0
-( -1544 428.625 128 ) ( -1544 211.375 120 ) ( -1544 211.375 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-( -1600 267.375 128 ) ( -1544 211.375 128 ) ( -1544 211.375 120 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-( -1600 372.625 120 ) ( -1544 428.625 120 ) ( -1544 428.625 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-( -1600 267.375 128 ) ( -1600 372.625 120 ) ( -1600 372.625 128 ) exx/floor-rnd02 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1664 -640 128 ) ( -1664 320 128 ) ( -1600 -640 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1728 320 120 ) ( -1792 320 120 ) ( -1728 -640 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1792 448 64 ) ( -1728 384 -64 ) ( -1792 448 -64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1536 -1152 64 ) ( -1536 -768 128 ) ( -1536 -768 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1544 -896 64 ) ( -1544 -896 128 ) ( -1544 -1280 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1792 192 -64 ) ( -1728 256 -64 ) ( -1792 192 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( -1504 1408 64 ) ( -1536 992 64 ) ( -1536 1408 64 ) exx/floor-simple05 0 -0 180 0.25 0.25 0 0 0
 ( -1504 1408 64 ) ( -1536 1408 0 ) ( -1504 1408 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -1504 1408 0 ) ( -1536 992 0 ) ( -1504 992 0 ) exx/base-metal02 0 256 180 0.25 0.25 0 0 0
@@ -17723,70 +17675,6 @@ exx/base-metal01
 ( 0 -64 -320 ) ( -16 -64 -320 ) ( 0 64 -320 ) common/caulk 0 -0 180 0.25 0.25 0 0 0
 }
 {
-( -1600 256 128 ) ( -1608 376 128 ) ( -1600 384 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1600 256 128 ) ( -1600 384 128 ) ( -1600 384 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 256 120 ) ( -1600 384 120 ) ( -1608 376 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1608 264 128 ) ( -1608 376 120 ) ( -1608 376 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 256 128 ) ( -1608 264 120 ) ( -1608 264 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1600 384 120 ) ( -1608 376 128 ) ( -1608 376 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1376 219.375 128 ) ( -1376 208 128 ) ( -1464 131.375 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1464 120 120 ) ( -1376 208 120 ) ( -1464 131.375 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1464 120 128 ) ( -1376 208 128 ) ( -1376 208 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 219.375 120 ) ( -1464 131.375 128 ) ( -1464 131.375 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1464 120 128 ) ( -1464 131.375 120 ) ( -1464 131.375 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 219.375 128 ) ( -1376 208 120 ) ( -1376 208 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1376 432 128 ) ( -1464 508.625 128 ) ( -1464 520 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1376 420.625 120 ) ( -1464 520 120 ) ( -1464 508.625 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1376 432 120 ) ( -1464 520 128 ) ( -1464 520 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1464 508.625 120 ) ( -1464 508.625 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1464 520 120 ) ( -1464 508.625 128 ) ( -1464 508.625 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1376 432 128 ) ( -1376 432 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1368 424 120 ) ( -1472 528 120 ) ( -1472 528 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 120 ) ( -1472 112 120 ) ( -1472 112 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 120 ) ( -1368 216 120 ) ( -1472 112 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1472 112 96 ) ( -1368 216 120 ) ( -1368 216 96 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 96 ) ( -1472 112 96 ) ( -1368 216 96 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1368 424 120 ) ( -1368 216 96 ) ( -1368 216 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1536 64 64 ) ( -1536 0 64 ) ( -576 64 64 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
-( -1536 16 64 ) ( -1472 80 -64 ) ( -1536 16 -64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1472 1792 64 ) ( -1472 1408 128 ) ( -1472 1408 64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( -1216 304 64 ) ( -1280 368 -64 ) ( -1216 304 -64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-( 1088 224 96 ) ( 1088 208 96 ) ( 960 224 96 ) narmorx/base-concrete05_blue 0 256 180 0.25 0.25 0 0 0
-( -1344 248 64 ) ( -1344 312 -64 ) ( -1344 248 -64 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1464 508.625 128 ) ( -1376 219.375 128 ) ( -1464 131.375 128 ) exx/floor-rnd02 0 256 180 0.25 0.25 0 0 0
-( -1464 508.625 120 ) ( -1464 131.375 120 ) ( -1376 219.375 120 ) common/caulk 0 -0 180 0.25 0.25 0 0 0
-( -1464 508.625 128 ) ( -1464 131.375 128 ) ( -1464 131.375 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -1376 219.375 120 ) ( -1464 131.375 120 ) ( -1464 131.375 128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1464 508.625 128 ) ( -1464 508.625 120 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -1376 420.625 128 ) ( -1376 219.375 120 ) ( -1376 219.375 128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1376 432 128 ) ( -1368 216 128 ) ( -1376 208 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1376 432 120 ) ( -1376 208 128 ) ( -1376 208 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1376 432 120 ) ( -1376 208 120 ) ( -1368 216 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1368 424 128 ) ( -1368 216 120 ) ( -1368 216 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1368 216 128 ) ( -1376 208 120 ) ( -1376 208 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1368 424 120 ) ( -1376 432 128 ) ( -1376 432 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1472 528 128 ) ( -1464 120 128 ) ( -1472 112 128 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1472 528 120 ) ( -1472 112 120 ) ( -1464 120 120 ) exx/base-metal04 0 256 180 0.25 0.25 0 0 0
-( -1472 112 120 ) ( -1464 120 128 ) ( -1464 120 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 128 ) ( -1472 112 128 ) ( -1472 112 120 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1464 520 128 ) ( -1464 120 120 ) ( -1464 120 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-( -1472 528 128 ) ( -1464 520 120 ) ( -1464 520 128 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
-}
-{
 ( 640 -832 -192 ) ( -576 640 -192 ) ( -576 -832 -192 ) ex2x/light-beam_blue 0 -0 180 0.25 0.25 0 0 0
 ( -1280 -832 64 ) ( -64 -832 -64 ) ( -1280 -832 -64 ) ex2x/light-beam_blue 0 0 0 -0.25 0.25 0 0 0
 ( 784 -800 64 ) ( 752 -800 -64 ) ( 784 -800 -64 ) ex2x/light-beam_blue 0 0 0 -0.25 0.25 0 0 0
@@ -20062,14 +19950,6 @@ effects_jumppad/jumppadfx1_a
 ( -1528 240 96 ) ( -1528 192 96 ) ( -1528 240 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
 }
 {
-( -1480 112 128 ) ( -1480 160 128 ) ( -1472 112 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1480 112 128 ) ( -1472 112 128 ) ( -1480 112 96 ) ex2x/trim-warn1 0 256 90 0.25 0.25 0 0 0
-( -1480 112 128 ) ( -1480 112 96 ) ( -1480 160 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1472 160 96 ) ( -1480 160 96 ) ( -1472 112 96 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1488 528 96 ) ( -1488 528 128 ) ( -1496 528 96 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-( -1472 160 96 ) ( -1472 112 96 ) ( -1472 160 128 ) ex2x/trim-warn1 0 256 0 0.25 0.25 0 0 0
-}
-{
 ( -1480 112 128 ) ( -1480 160 128 ) ( -1472 112 128 ) ex2x/trim-warn1 64 256 180 0.25 0.25 0 0 0
 ( -1480 112 128 ) ( -1472 112 128 ) ( -1480 112 96 ) ex2x/trim-warn1 0 256 90 0.25 -0.25 0 0 0
 ( -1480 112 128 ) ( -1480 112 96 ) ( -1480 160 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
@@ -20078,14 +19958,6 @@ effects_jumppad/jumppadfx1_a
 ( -1472 160 96 ) ( -1472 112 96 ) ( -1472 160 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
 }
 {
-( -1536 192 128 ) ( -1536 240 128 ) ( -1528 192 128 ) ex2x/trim-warn1 64 256 180 0.25 0.25 0 0 0
-( -1536 192 128 ) ( -1528 192 128 ) ( -1536 192 96 ) ex2x/trim-warn1 0 256 90 0.25 -0.25 0 0 0
-( -1536 192 128 ) ( -1536 192 96 ) ( -1536 240 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
-( -1528 240 96 ) ( -1536 240 96 ) ( -1528 192 96 ) ex2x/trim-warn1 64 256 180 0.25 0.25 0 0 0
-( -1552 448 96 ) ( -1552 448 128 ) ( -1560 448 96 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
-( -1528 240 96 ) ( -1528 192 96 ) ( -1528 240 128 ) ex2x/trim-warn1 0 256 0 -0.25 0.25 0 0 0
-}
-{
 ( -1536 1280 96 ) ( -1472 -736 96 ) ( -1472 1216 96 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1536 1280 224 ) ( -1472 -736 224 ) ( -1536 -800 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1536 1280 96 ) ( -1536 -800 224 ) ( -1536 -800 96 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
@@ -20772,10 +20644,6 @@ effects_jumppad/jumppadfx1_a
 "angle" "180.000000"
 }
 {
-"classname" "weapon_nex"
-"origin" "0.000000 0.000000 -176.000000"
-}
-{
 "classname" "item_flag_team1"
 "origin" "1440.000000 -2080.000000 -288.000000"
 }
@@ -23872,3 +23740,7 @@ effects_jumppad/jumppadfx1_a
 "_castshadows" "1"
 "angles" "18.369183 11.335669 90.000000"
 }
+{
+"classname" "weapon_campingrifle"
+"origin" "0.000000 0.000000 -176.000000"
+}

diff --git a/maps/dance.mapinfo b/maps/dance.mapinfo
index 32b6298332a0ca77cb9784de7baf27ed69082d4c..753f75c7d4099df48eeeddef84e8c7057a9644f6 100644 (file)
--- a/maps/dance.mapinfo
+++ b/maps/dance.mapinfo
@@ -1,6 +1,6 @@
-title FIXME
-description FIXME
-author FIXME
+title Dance
+description Very open, small sized CTF map floating above an ocean.
+author ..., FruitieX
 cdtrack 3
 has weapons
 gametype ctf

diff --git a/maps/dance.tga b/maps/dance.tga
new file mode 100644 (file)
index 0000000..e372358
Binary files /dev/null and b/maps/dance.tga differ

diff --git a/maps/g-23.map b/maps/g-23.map
index d7c96510690b8db11652b8efdea265ca439c643b..522232a36807bc5c3ef44b78350f4909897cc815 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -12510,10 +12510,6 @@ exx/wall-metalrib01
 "origin" "256.000000 0.000000 0.000000"
 }
 {
-"classname" "item_cells"
-"origin" "192.000000 0.000000 0.000000"
-}
-{
 "classname" "weapon_grenadelauncher"
 "origin" "-256.000000 -1024.000000 -448.000000"
 }
@@ -13091,18 +13087,6 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_uzi"
-"origin" "-864.000000 -768.000000 -256.000000"
-}
-{
-"classname" "item_bullets"
-"origin" "-864.000000 -704.000000 -256.000000"
-}
-{
-"classname" "item_bullets"
-"origin" "-864.000000 -640.000000 -256.000000"
-}
-{
 "classname" "info_player_deathmatch"
 "origin" "-1344.000000 512.000000 -424.000000"
 "angle" "-90.000000"
@@ -14859,3 +14843,11 @@ exx/wall-metalrib01
 "light" "32"
 "_color" "1 0.151965 0"
 }
+{
+"classname" "weapon_hlac"
+"origin" "-864.000000 -704.000000 -256.000000"
+}
+{
+"classname" "item_cells"
+"origin" "-864.000000 -640.000000 -256.000000"
+}

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 8538a65dc7e83becb2870852ac97289a064cd50d..594d03656f62f735364108a1242ebe4af7abb107 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -6,5 +6,4 @@ gametype dm
 gametype lms
 gametype arena
 gametype rune
-gametype kh
-cdtrack 6
+cdtrack 2

diff --git a/maps/nexballarena.mapinfo b/maps/nexballarena.mapinfo
new file mode 100644 (file)
index 0000000..40667a5
--- /dev/null
+++ b/maps/nexballarena.mapinfo
@@ -0,0 +1,5 @@
+title Nexball Arena
+description Small, simple, enclosed arena for finding out who's the true nexball champion! No obstacles in the way...
+author Revenant, Cortez, tZork, CuBe0wL, FruitieX
+cdtrack 4
+gametype nexball

diff --git a/maps/nexballarena.tga b/maps/nexballarena.tga
new file mode 100644 (file)
index 0000000..f6bd23c
Binary files /dev/null and b/maps/nexballarena.tga differ

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 2036871195bd9663e33ed1fb04ad4c3d517f8e4d..e77e60ee472dccdcc9d8362ba6082b8a7b03366f 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -11110,12 +11110,12 @@ exx/panel-metal01c
 ( -4560.2875976562 168.4975738525 136 ) ( -4560.2875976562 168.4975738525 200 ) ( -4564.2875976562 161.5693817139 200 ) common/caulk 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
 }
 {
-( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 200 ) ( -4612.2875976562 78.4309387207 200 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
-( -4605.359375 74.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4612.2875976562 78.4309387207 136 ) exx/floor-simplines 300.3607788086 424 0 0.769800365 0.5 134217728 0 0
-( -4609.359375 67.5027313232 136 ) ( -4609.359375 67.5027313232 200 ) ( -4605.359375 74.4309387207 200 ) exx/base-metal01 253.2339172363 400 0 0.3849001825 0.25 134217728 0 0
-( -4609.359375 67.5027313232 136 ) ( -4612.2875976562 78.4309387207 136 ) ( -4616.2875976562 71.5027313232 136 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
-( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 136 ) ( -4616.2875976562 71.5027313232 200 ) exx/base-metal01 88.7215499878 400 0 0.3849001825 0.25 134217728 0 0
-( -4612.2875976562 78.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4616.2875976562 71.5027313232 200 ) common/caulk 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
+( -4612.2875976562 -78.4309387207 200 ) ( -4616.2875976562 -71.5027313232 200 ) ( -4609.359375 -67.5027313232 200 ) common/clip 131.1476135254 227.559387207 30 0.5 -0.5 134217728 0 0
+( -4562.2875976562 -160.4309387207 136 ) ( -4562.2875976562 -160.4309387207 200 ) ( -4555.359375 -156.4309387207 136 ) common/clip 235.4088745117 168 0 0.769800365 0.5 134217728 0 0
+( -4605.359375 -74.4309387207 200 ) ( -4609.359375 -67.5027313232 200 ) ( -4609.359375 -67.5027313232 136 ) common/clip 253.2339477539 144 0 -0.3849001825 0.25 134217728 0 0
+( -4616.2875976562 -71.5027313232 136 ) ( -4612.2875976562 -78.4309387207 136 ) ( -4609.359375 -67.5027313232 136 ) common/clip 131.1476135254 227.559387207 30 0.5 -0.5 134217728 0 0
+( -4614.2875976562 -79.5027313232 200 ) ( -4614.2875976562 -79.5027313232 136 ) ( -4607.359375 -75.5027313232 200 ) common/clip 83.5253982544 144 0 0.3849001825 0.25 134217728 0 0
+( -4616.2875976562 -71.5027313232 200 ) ( -4612.2875976562 -78.4309387207 200 ) ( -4612.2875976562 -78.4309387207 136 ) common/clip 126.616973877 168 0 -0.769800365 0.5 134217728 0 0
 }
 {
 ( -4609.359375 67.5027313232 136 ) ( -4616.2875976562 71.5027313232 136 ) ( -4560.2875976562 168.4975738525 136 ) exx/floor-simplines 387.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
@@ -36160,6 +36160,22 @@ trak5x/base-pipe1a
 ( -768 -64 320 ) ( -736 64 288 ) ( -768 64 320 ) exx/trim-steptop01 0 -0 90 0.5 0.5 0 0 0
 ( -632 192 64 ) ( -624 192 -64 ) ( -632 192 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 200 ) ( -4612.2875976562 78.4309387207 200 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4605.359375 74.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4612.2875976562 78.4309387207 136 ) exx/floor-simplines 300.3607788086 424 0 0.769800365 0.5 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4609.359375 67.5027313232 200 ) ( -4605.359375 74.4309387207 200 ) exx/base-metal01 253.2339172363 400 0 0.3849001825 0.25 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4612.2875976562 78.4309387207 136 ) ( -4616.2875976562 71.5027313232 136 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 136 ) ( -4616.2875976562 71.5027313232 200 ) exx/base-metal01 88.7215499878 400 0 0.3849001825 0.25 134217728 0 0
+( -4612.2875976562 78.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4616.2875976562 71.5027313232 200 ) common/caulk 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
+}
+{
+( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 200 ) ( -4612.2875976562 78.4309387207 200 ) common/clip 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4555.359375 156.4309387207 136 ) ( -4562.2875976562 160.4309387207 200 ) ( -4562.2875976562 160.4309387207 136 ) common/clip 235.4088745117 424 0 0.769800365 0.5 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4609.359375 67.5027313232 200 ) ( -4605.359375 74.4309387207 200 ) common/clip 253.2339172363 400 0 0.3849001825 0.25 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4612.2875976562 78.4309387207 136 ) ( -4616.2875976562 71.5027313232 136 ) common/clip 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4607.359375 75.5027313232 200 ) ( -4614.2875976562 79.5027313232 136 ) ( -4614.2875976562 79.5027313232 200 ) common/clip 83.5253982544 400 0 0.3849001825 0.25 134217728 0 0
+( -4612.2875976562 78.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4616.2875976562 71.5027313232 200 ) common/clip 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
+}
 }
 {
 "classname" "light"
@@ -36347,8 +36363,8 @@ trak5x/base-pipe1a
 "targetname" "door_a1"
 {
 ( -3608 336 184 ) ( -3608 320 184 ) ( -3616 336 184 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -3608 336 184 ) ( -3616 336 184 ) ( -3608 336 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
-( -3616 320 176 ) ( -3616 320 184 ) ( -3608 320 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
+( -3608 334 184 ) ( -3616 334 184 ) ( -3608 334 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
+( -3616 322 176 ) ( -3616 322 184 ) ( -3608 322 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
 ( -3616 320 176 ) ( -3616 336 176 ) ( -3616 320 184 ) common/caulk 0 32 0 0.5 0.5 134217728 0 0
 ( -3600 64 192 ) ( -3608 64 184 ) ( -3600 -64 192 ) trak5x/trim-basictrim1b 0 128 90 0.125 0.125 134217728 0 0
 }
@@ -46600,10 +46616,6 @@ exx/trim-vert01
 "angle" "7.999371"
 }
 {
-"classname" "item_bullets"
-"origin" "-2408.000000 -360.000000 472.000000"
-}
-{
 "classname" "item_shells"
 "origin" "-2456.000000 -360.000000 472.000000"
 "angle" "90.000000"
@@ -46652,14 +46664,6 @@ exx/trim-vert01
 "_color" "1 0.75 0.75"
 }
 {
-"classname" "weapon_nex"
-"origin" "-2800.000000 448.000000 416.000000"
-}
-{
-"classname" "item_cells"
-"origin" "-2800.000000 -448.000000 416.000000"
-}
-{
 "classname" "item_health_small"
 "origin" "-1808.000000 0.000000 480.000000"
 }
@@ -46676,10 +46680,6 @@ exx/trim-vert01
 "origin" "640.000000 -224.000000 48.000000"
 }
 {
-"classname" "weapon_hagar"
-"origin" "-2660.000000 1176.000000 120.000000"
-}
-{
 "classname" "misc_gamemodel"
 "origin" "-2888.000000 -1040.000000 396.000000"
 "model" "models/fans/bigfan01.md3"
@@ -47107,3 +47107,19 @@ exx/trim-vert01
 "classname" "weapon_grenadelauncher"
 "origin" "-3584.000000 0.000000 80.000000"
 }
+{
+"classname" "weapon_seeker"
+"origin" "-2660.000000 1176.000000 120.000000"
+}
+{
+"classname" "weapon_campingrifle"
+"origin" "-2800.000000 448.000000 416.000000"
+}
+{
+"classname" "item_bullets"
+"origin" "-2800.000000 -448.000000 416.000000"
+}
+{
+"classname" "item_cells"
+"origin" "-2408.000000 -360.000000 472.000000"
+}

diff --git a/maps/red-planet.mapinfo b/maps/red-planet.mapinfo
index 8a0d986f2be0b2a783753524b5c29da61a8585c9..6fd9740f37d700ed83732ac66a6eeee24f523dbc 100644 (file)
--- a/maps/red-planet.mapinfo
+++ b/maps/red-planet.mapinfo
@@ -1,7 +1,7 @@
 title Red Planet
 description A large facility on a red dusty planet
 author Mircea Kitsune, Cuinnton, FruitieX
-cdtrack 1
+cdtrack 7
 has weapons
 gametype dm
 gametype tdm

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 47db21048ffe4f2a51bb32f01896612008454611..252562ff0cdab814f9bfe7a77f3eb1479499d097 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -4457,7 +4457,7 @@ map_space-elevator/beam-purple
 ( 32 -3584 -48 ) ( -32 -3584 -48 ) ( 32 -3584 -80 ) exx/floor-wrn01-red 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 -48 ) ( 32 -3488 -80 ) ( 32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -128 ) ( 32 -3616 -128 ) ( -32 -3488 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -80 ) ( -32 -3488 -80 ) ( -32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -4502,7 +4502,7 @@ map_space-elevator/beam-purple
 ( 32 -3632 0 ) ( 32 -3600 -128 ) ( 32 -3600 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3600 -128 ) ( 32 -3632 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 0 ) ( 64 -3600 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4510,7 +4510,7 @@ map_space-elevator/beam-purple
 ( -32 -3600 0 ) ( -32 -3600 -128 ) ( -32 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -32 -3632 -128 ) ( -64 -3600 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -64 -3600 -128 ) ( -64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4518,7 +4518,7 @@ map_space-elevator/beam-purple
 ( 32 -3632 64 ) ( 32 -3600 -64 ) ( 32 -3600 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3600 -64 ) ( 32 -3632 -64 ) ( 64 -3632 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 64 ) ( 64 -3600 -64 ) ( 64 -3632 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 64 ) ( 64 -3648 -64 ) ( 32 -3616 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 64 ) ( 64 -3648 -64 ) ( 32 -3616 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 32 64 0 ) ( 48 64 -16 ) ( 32 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4540,7 +4540,7 @@ map_space-elevator/beam-purple
 ( 32 -3584 16 ) ( -32 -3584 16 ) ( 32 -3584 -16 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 16 ) ( 32 -3488 -16 ) ( 32 -3616 16 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -64 ) ( 32 -3616 -64 ) ( -32 -3488 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -16 ) ( -32 -3616 16 ) ( 32 -3616 -16 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -16 ) ( -32 -3616 16 ) ( 32 -3616 -16 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -16 ) ( -32 -3488 -16 ) ( -32 -3616 16 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 0 ) ( -64 -3616 0 ) ( 64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -12991,7 +12991,7 @@ trak5x/base-pipe1b
 }
 {
 ( 72 -3840 656 ) ( 72 -3856 656 ) ( -56 -3840 656 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 64 -3840 624 ) ( -64 -3840 624 ) ( 64 -3840 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 64 -3840 624 ) ( -64 -3840 624 ) ( 64 -3840 512 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3840 624 ) ( 64 -3840 512 ) ( 64 -3856 624 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -64 -3856 512 ) ( 64 -3856 512 ) ( -64 -3840 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -64 -3842 512 ) ( -64 -3842 624 ) ( 64 -3842 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -13099,14 +13099,14 @@ trak5x/base-pipe1b
 ( -32 -3600 64 ) ( -32 -3600 -64 ) ( -32 -3632 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -64 ) ( -32 -3632 -64 ) ( -64 -3600 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -64 ) ( -64 -3600 -64 ) ( -64 -3632 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -64 ) ( -64 -3648 -64 ) ( -32 -3616 64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -64 ) ( -64 -3648 -64 ) ( -32 -3616 64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -64 0 ) ( -48 64 -16 ) ( -32 64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 32 -3488 -64 ) ( 32 -3616 -64 ) ( -32 -3488 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 32 -3584 -48 ) ( -32 -3584 -48 ) ( 32 -3584 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 -48 ) ( 32 -3488 -80 ) ( 32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -80 ) ( -32 -3488 -80 ) ( -32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -13115,7 +13115,7 @@ trak5x/base-pipe1b
 ( 32 -3584 -128 ) ( 64 -3584 0 ) ( 32 -3584 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 32 -3632 0 ) ( 32 -3600 -128 ) ( 32 -3600 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 0 ) ( 64 -3600 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -13123,7 +13123,7 @@ trak5x/base-pipe1b
 ( -32 -3584 0 ) ( -64 -3584 0 ) ( -32 -3584 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -32 -3600 0 ) ( -32 -3600 -128 ) ( -32 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -64 -3600 -128 ) ( -64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -18722,7 +18722,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3584 -48 ) ( 32 3584 -48 ) ( -32 3584 -80 ) exx/floor-wrn01-blue 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 -48 ) ( -32 3488 -80 ) ( -32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -128 ) ( -32 3616 -128 ) ( 32 3488 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
-( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -80 ) ( 32 3488 -80 ) ( 32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -18767,7 +18767,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3632 0 ) ( -32 3600 -128 ) ( -32 3600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3600 -128 ) ( -32 3632 -128 ) ( -64 3632 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -64 3632 0 ) ( -64 3600 -128 ) ( -64 3632 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18775,7 +18775,7 @@ proceduralx/wall-fruitconcrete
 ( 32 3600 0 ) ( 32 3600 -128 ) ( 32 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 32 3632 -128 ) ( 64 3600 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 64 3600 -128 ) ( 64 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18783,7 +18783,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3632 64 ) ( -32 3600 -64 ) ( -32 3600 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3600 -64 ) ( -32 3632 -64 ) ( -64 3632 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -64 3632 64 ) ( -64 3600 -64 ) ( -64 3632 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 64 ) ( -64 3648 -64 ) ( -32 3616 -64 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 64 ) ( -64 3648 -64 ) ( -32 3616 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -32 -64 0 ) ( -48 -64 -16 ) ( -32 64 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18805,7 +18805,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3584 16 ) ( 32 3584 16 ) ( -32 3584 -16 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 16 ) ( -32 3488 -16 ) ( -32 3616 16 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -64 ) ( -32 3616 -64 ) ( 32 3488 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
-( 32 3616 -16 ) ( 32 3616 16 ) ( -32 3616 -16 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -16 ) ( 32 3616 16 ) ( -32 3616 -16 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -16 ) ( 32 3488 -16 ) ( 32 3616 16 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 0 ) ( 64 3616 0 ) ( -64 3632 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -27267,7 +27267,7 @@ trak5x/base-pipe1c
 }
 {
 ( -72 3840 656 ) ( -72 3856 656 ) ( 56 3840 656 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
-( -64 3840 624 ) ( 64 3840 624 ) ( -64 3840 512 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -64 3840 624 ) ( 64 3840 624 ) ( -64 3840 512 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3840 624 ) ( -64 3840 512 ) ( -64 3856 624 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( 64 3856 512 ) ( -64 3856 512 ) ( 64 3840 512 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
 ( 64 3842 512 ) ( 64 3842 624 ) ( -64 3842 512 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
@@ -27375,14 +27375,14 @@ trak5x/base-pipe1c
 ( 32 3600 64 ) ( 32 3600 -64 ) ( 32 3632 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -64 ) ( 32 3632 -64 ) ( 64 3600 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( 64 3632 -64 ) ( 64 3600 -64 ) ( 64 3632 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -64 ) ( 64 3648 -64 ) ( 32 3616 64 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -64 ) ( 64 3648 -64 ) ( 32 3616 64 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 64 0 ) ( 48 -64 -16 ) ( 32 -64 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
 ( -32 3488 -64 ) ( -32 3616 -64 ) ( 32 3488 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -32 3584 -48 ) ( 32 3584 -48 ) ( -32 3584 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 -48 ) ( -32 3488 -80 ) ( -32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -80 ) ( 32 3488 -80 ) ( 32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -27391,7 +27391,7 @@ trak5x/base-pipe1c
 ( -32 3584 -128 ) ( -64 3584 0 ) ( -32 3584 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( -32 3632 0 ) ( -32 3600 -128 ) ( -32 3600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 0 ) ( -64 3600 -128 ) ( -64 3632 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -27399,7 +27399,7 @@ trak5x/base-pipe1c
 ( 32 3584 0 ) ( 64 3584 0 ) ( 32 3584 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( 32 3600 0 ) ( 32 3600 -128 ) ( 32 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 64 3600 -128 ) ( 64 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -33151,3 +33151,31 @@ effects_jumppad/jumppadfx1_a
 "origin" "0.000000 0.000000 704.000000"
 "height" "64"
 }
+{
+"classname" "misc_model"
+"origin" "0.000000 -3778.000000 576.000000"
+"model" "models/effects_warpzone/rededge.md3"
+"angle" "89.999992"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 -3678.000000 -64.000000"
+"model" "models/effects_warpzone/rededge.md3"
+"angle" "-90.000000"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 3778.000000 576.000000"
+"model" "models/effects_warpzone/blueedge.md3"
+"angle" "89.999992"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 3678.000000 -64.000000"
+"model" "models/effects_warpzone/blueedge.md3"
+"angle" "-90.000000"
+"modelscale_vec" "1 3 4"
+}

diff --git a/maps/space-elevator.mapinfo b/maps/space-elevator.mapinfo
index 0498f818ae06478f5ba9b473c682c0864b7b34f3..f31852ae5dbd518b551b11ca28bdf6f2a19b2ef5 100644 (file)
--- a/maps/space-elevator.mapinfo
+++ b/maps/space-elevator.mapinfo
@@ -1,11 +1,6 @@
 title Space Elevator
-description <DESCRIPTION>
-author FruitieX & Cuinnton
+description Medium sized CTF space floater
+author FruitieX, Cuinnton
 has weapons
-type ctf 300 20 10 0
+type ctf
 cdtrack jumpinginspace
-// 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
-// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden

diff --git a/maps/space-elevator.tga b/maps/space-elevator.tga
new file mode 100644 (file)
index 0000000..09999db
Binary files /dev/null and b/maps/space-elevator.tga differ

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 2e385dac8f13b0032893b13c71d81df5bd4cef49..cf8ffce1dc6dec86901f66ba45c4317d21089e0e 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -12131,15 +12131,15 @@ patchDef2
 effects_jumppad/jumppadfx1_b
 ( 9 3 0 0 0 )
 (
-( ( 960 1296 -32 0 0 ) ( 960 1296 -8 -0 -0.5 ) ( 960 1296 16 -0 -1 ) )
-( ( 976 1296 -32 -0.125 0 ) ( 976 1296 -8 -0.125 -0.5 ) ( 976 1296 16 -0.125 -1 ) )
-( ( 976 1312 -32 -0.25 0 ) ( 976 1312 -8 -0.25 -0.5 ) ( 976 1312 16 -0.25 -1 ) )
-( ( 976 1328 -32 -0.375 0 ) ( 976 1328 -8 -0.375 -0.5 ) ( 976 1328 16 -0.375 -1 ) )
-( ( 960 1328 -32 -0.5 0 ) ( 960 1328 -8 -0.5 -0.5 ) ( 960 1328 16 -0.5 -1 ) )
-( ( 944 1328 -32 -0.625 0 ) ( 944 1328 -8 -0.625 -0.5 ) ( 944 1328 16 -0.625 -1 ) )
-( ( 944 1312 -32 -0.75 0 ) ( 944 1312 -8 -0.75 -0.5 ) ( 944 1312 16 -0.75 -1 ) )
-( ( 944 1296 -32 -0.875 0 ) ( 944 1296 -8 -0.875 -0.5 ) ( 944 1296 16 -0.875 -1 ) )
-( ( 960 1296 -32 -1 0 ) ( 960 1296 -8 -1 -0.5 ) ( 960 1296 16 -1 -1 ) )
+( ( 976 1296 -32 0 0 ) ( 976 1296 -8 -0 -0.5 ) ( 976 1296 16 -0 -1 ) )
+( ( 992 1296 -32 -0.125 0 ) ( 992 1296 -8 -0.125 -0.5 ) ( 992 1296 16 -0.125 -1 ) )
+( ( 992 1312 -32 -0.25 0 ) ( 992 1312 -8 -0.25 -0.5 ) ( 992 1312 16 -0.25 -1 ) )
+( ( 992 1328 -32 -0.375 0 ) ( 992 1328 -8 -0.375 -0.5 ) ( 992 1328 16 -0.375 -1 ) )
+( ( 976 1328 -32 -0.5 0 ) ( 976 1328 -8 -0.5 -0.5 ) ( 976 1328 16 -0.5 -1 ) )
+( ( 960 1328 -32 -0.625 0 ) ( 960 1328 -8 -0.625 -0.5 ) ( 960 1328 16 -0.625 -1 ) )
+( ( 960 1312 -32 -0.75 0 ) ( 960 1312 -8 -0.75 -0.5 ) ( 960 1312 16 -0.75 -1 ) )
+( ( 960 1296 -32 -0.875 0 ) ( 960 1296 -8 -0.875 -0.5 ) ( 960 1296 16 -0.875 -1 ) )
+( ( 976 1296 -32 -1 0 ) ( 976 1296 -8 -1 -0.5 ) ( 976 1296 16 -1 -1 ) )
 )
 }
 }
@@ -12280,9 +12280,9 @@ effects_jumppad/jumppadfx1_b
 ( 32 1472 -34 ) ( 32 1152 -34 ) ( -384 1472 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( 32 1408 -32 ) ( -384 1408 -32 ) ( 32 1408 -64 ) exx/base-metal03 128 192 0 0.25 0.25 134217728 0 0
 ( -256 1472 -32 ) ( -256 1472 -64 ) ( -256 1152 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -48 ) ( 32 1152 -48 ) ( -384 1472 -48 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -40 ) ( 32 1152 -40 ) ( -384 1472 -40 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
 ( -384 1152 -64 ) ( -384 1152 -32 ) ( 32 1152 -64 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( -384 1152 -64 ) ( -384 1472 -64 ) ( -384 1152 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
+( -384 1152 -56 ) ( -384 1472 -56 ) ( -384 1152 -24 ) common/caulk 0 32 0 0.25 0.25 134217728 0 0
 }
 {
 ( -576 448 -64 ) ( -576 432 -64 ) ( -1088 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -12521,9 +12521,9 @@ effects_jumppad/jumppadfx1_b
 ( -256 1152 -34 ) ( -256 1024 -34 ) ( -528 1152 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -528 1152 -32 ) ( -256 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -256 1152 -32 ) ( -256 1152 -64 ) ( -256 1024 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -528 1024 -48 ) ( -256 1024 -48 ) ( -528 1152 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -528 1024 -40 ) ( -256 1024 -40 ) ( -528 1152 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -528 1024 -64 ) ( -528 1024 -32 ) ( -256 1024 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1024 -66 ) ( -832 1152 -66 ) ( -832 1024 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
+( -832 1024 -58 ) ( -832 1152 -58 ) ( -832 1024 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
 }
 {
 ( -840 448 -32 ) ( -840 432 -32 ) ( -896 448 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -13002,8 +13002,8 @@ exx/base-metal03
 {
 ( -320 1600 -34 ) ( -320 1472 -34 ) ( -592 1600 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
 ( -320 1152 -32 ) ( -592 1152 -32 ) ( -320 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1600 -34 ) ( -832 1600 -66 ) ( -832 1472 -34 ) common/caulk 0 248 0 0.25 0.25 134217728 0 0
-( -592 1472 -48 ) ( -320 1472 -48 ) ( -592 1600 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -832 1600 -26 ) ( -832 1600 -58 ) ( -832 1472 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
+( -592 1472 -40 ) ( -320 1472 -40 ) ( -592 1600 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -592 448 -64 ) ( -592 448 -32 ) ( -320 448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -896 1472 -64 ) ( -896 1600 -64 ) ( -896 1472 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 }
@@ -13411,6 +13411,14 @@ exx/base-metal03
 ( 832 832 512 ) ( 912 960 512 ) ( 960 832 512 ) common/caulk 156.4449462891 213.3328857422 -90 0.1875 -0.1875 134217728 0 0
 ( 864 64 576 ) ( 976 64 464 ) ( 864 -64 576 ) map_stormkeep/rock 512 0 0 0.25 0.25 134217728 0 0
 }
+{
+( -256 1552 128 ) ( -256 1472 128 ) ( -384 1552 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 1600 128 ) ( -384 1600 128 ) ( -256 1600 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -224 1552 128 ) ( -224 1552 96 ) ( -224 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -256 1472 96 ) ( -384 1552 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -384 1472 96 ) ( -384 1472 128 ) ( -256 1472 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -416 1472 96 ) ( -416 1552 96 ) ( -416 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"
@@ -23198,7 +23206,7 @@ exx/base-metal03
 }
 {
 "classname" "misc_model"
-"origin" "960.000000 1312.000000 -32.000000"
+"origin" "976.000000 1312.000000 -32.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
 "_receiveshadows" "1"
 "_castshadows" "1"

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index f26dd789f28fc7b7e35d0999545b8e8b6fbce4b4..70a18670dd9f5522e03438ab9d166db94d29585f 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -1,5 +1,5 @@
 title Stormkeep
-description <DESCRIPTION>
+description Medium sized indoors map, well suited for team games.
 author ..., FruitieX
 has weapons
 gametype dm

diff --git a/models/xonotic_jumppad01/jumppad2lod_blue_glow.tga b/models/xonotic_jumppad01/jumppad2lod_blue_glow.tga
new file mode 100644 (file)
index 0000000..2417f34
Binary files /dev/null and b/models/xonotic_jumppad01/jumppad2lod_blue_glow.tga differ

diff --git a/models/xonotic_jumppad01/jumppad2lod_red_glow.tga b/models/xonotic_jumppad01/jumppad2lod_red_glow.tga
new file mode 100644 (file)
index 0000000..9a83ff3
Binary files /dev/null and b/models/xonotic_jumppad01/jumppad2lod_red_glow.tga differ

diff --git a/models/xonotic_jumppad01/launchpad2lod_blue.tga b/models/xonotic_jumppad01/launchpad2lod_blue.tga
index 006689b2656d3b932c805977268bb480174fcd32..4dd3cce3a0fccdd596f79f519e2722e268384766 100644 (file)
Binary files a/models/xonotic_jumppad01/launchpad2lod_blue.tga and b/models/xonotic_jumppad01/launchpad2lod_blue.tga differ

diff --git a/models/xonotic_jumppad01/launchpad2lod_blue_glow.tga b/models/xonotic_jumppad01/launchpad2lod_blue_glow.tga
new file mode 100644 (file)
index 0000000..781668e
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_blue_glow.tga differ

diff --git a/models/xonotic_jumppad01/launchpad2lod_red.tga b/models/xonotic_jumppad01/launchpad2lod_red.tga
index 4bfc667afdee7a6054722c5e61407710cad95f40..f98671786784d7a63a990d0fd85725fee83c6a77 100644 (file)
Binary files a/models/xonotic_jumppad01/launchpad2lod_red.tga and b/models/xonotic_jumppad01/launchpad2lod_red.tga differ

diff --git a/models/xonotic_jumppad01/launchpad2lod_red_glow.tga b/models/xonotic_jumppad01/launchpad2lod_red_glow.tga
new file mode 100644 (file)
index 0000000..94e7ed2
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_red_glow.tga differ

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
index 616d31a4379468a7868f88a738dfa6e3aa7919e7..18ae4dca85a97e3659a56d00660975c290d0e84b 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
@@ -1 +1,2 @@
+mesh,models/xonotic_jumppad01/launchpad2lod_red
 mesh2,models/xonotic_jumppad01/launchpad2lod_red

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
index 290120ba7282611d6e34d2938587fe860b96077f..3abdf50a497a36d56afe7c1a294acf7a3352395a 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
@@ -1 +1,2 @@
+mesh,models/xonotic_jumppad01/launchpad2lod_blue
 mesh2,models/xonotic_jumppad01/launchpad2lod_blue

diff --git a/scripts/effects_forcefield.shader b/scripts/effects_forcefield.shader
index 890d25cb30ceeb75c555c14ce96158813c41e4bf..7728ffc87f626d96414bdc1052252e7c5c3abe41 100644 (file)
--- a/scripts/effects_forcefield.shader
+++ b/scripts/effects_forcefield.shader
@@ -18,6 +18,30 @@ textures/effects_forcefield/forcefield1_a
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 red glowy, less turb
+textures/effects_forcefield/forcefield1_a_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_a.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_a.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
+
+
+
 //Forcefield1 blue
 textures/effects_forcefield/forcefield1_b
 {
@@ -37,6 +61,28 @@ textures/effects_forcefield/forcefield1_b
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 blue glowy, less turb
+textures/effects_forcefield/forcefield1_b_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_b.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_b.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
+
 //Forcefield1 yellow
 textures/effects_forcefield/forcefield1_c
 {
@@ -56,6 +102,29 @@ textures/effects_forcefield/forcefield1_c
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 yellow less turb, glowy
+textures/effects_forcefield/forcefield1_c_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_c.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_c.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
+
+
 //Forcefield1 green
 textures/effects_forcefield/forcefield1_d
 {
@@ -75,3 +144,24 @@ textures/effects_forcefield/forcefield1_d
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 green glowy, less turb
+textures/effects_forcefield/forcefield1_d_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_d.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_d.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
\ No newline at end of file