Recompile Soylent with correct skybox path

diff --git a/data/gfx/soylent_radar.tga b/data/gfx/soylent_radar.tga
index 4e3caeffae95ee5694fc89a6545a40588f19c47c..42c19aeb56f264c3da9024e226cd16a359735415 100644 (file)
Binary files a/data/gfx/soylent_radar.tga and b/data/gfx/soylent_radar.tga differ

diff --git a/data/maps/soylent.bsp b/data/maps/soylent.bsp
index 99fdc6bfc27eed3adec2311ba1e811656b577384..2cc65328450b20ef8be5b607f3152bc387f0034c 100644 (file)
Binary files a/data/maps/soylent.bsp and b/data/maps/soylent.bsp differ

diff --git a/data/maps/soylent.map b/data/maps/soylent.map
index 87893740b6a86b700a154082fa597b5842d583f6..8c82fac5272c910ee4cae149cd9b5f62a082d276 100644 (file)
--- a/data/maps/soylent.map
+++ b/data/maps/soylent.map
@@ -2943,7 +2943,7 @@ evil3_metals/mtldrk1
 ( 608 960 1280 ) ( -1056 960 1280 ) ( -1056 960 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 864 1296 ) ( -1056 -288 1296 ) ( -1056 -288 1264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -32 960 -1536 ) ( -224 960 -1536 ) ( -224 -1984 -1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 608 960 1280 ) ( -1056 960 1280 ) ( -1056 960 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 864 1296 ) ( -1056 -288 1296 ) ( -1056 -288 1264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -32 960 -1536 ) ( -224 960 -1536 ) ( -224 -1984 -1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

-( -256 960 -1472 ) ( -64 960 -1472 ) ( -256 -1984 -1472 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( -256 960 -1472 ) ( -64 960 -1472 ) ( -256 -1984 -1472 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 }\r
 // brush 327\r
 {\r
 }\r
 // brush 327\r
 {\r


@@ -2952,7 +2952,7 @@ evil3_metals/mtldrk1
 ( 544 960 1280 ) ( -1120 960 1280 ) ( -1120 960 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1120 928 1280 ) ( -1120 -224 1280 ) ( -1120 -224 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -128 960 -1472 ) ( -320 960 -1472 ) ( -320 -1984 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 544 960 1280 ) ( -1120 960 1280 ) ( -1120 960 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1120 928 1280 ) ( -1120 -224 1280 ) ( -1120 -224 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -128 960 -1472 ) ( -320 960 -1472 ) ( -320 -1984 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

-( -1056 -224 1504 ) ( -1056 928 1504 ) ( -1056 -224 1472 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( -1056 -224 1504 ) ( -1056 928 1504 ) ( -1056 -224 1472 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 }\r
 // brush 328\r
 {\r
 }\r
 // brush 328\r
 {\r


@@ -2961,7 +2961,7 @@ evil3_metals/mtldrk1
 ( 608 1024 1280 ) ( -1056 1024 1280 ) ( -1056 1024 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 992 1472 ) ( -1056 -160 1472 ) ( -1056 -160 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 0 1024 -1472 ) ( -192 1024 -1472 ) ( -192 -1920 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 608 1024 1280 ) ( -1056 1024 1280 ) ( -1056 1024 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 992 1472 ) ( -1056 -160 1472 ) ( -1056 -160 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 0 1024 -1472 ) ( -192 1024 -1472 ) ( -192 -1920 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

-( -928 960 1280 ) ( 736 960 1280 ) ( -928 960 1248 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( -928 960 1280 ) ( 736 960 1280 ) ( -928 960 1248 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 }\r
 // brush 329\r
 {\r
 }\r
 // brush 329\r
 {\r


@@ -2970,7 +2970,7 @@ evil3_metals/mtldrk1
 ( 1888 -1952 1280 ) ( 1888 -800 1280 ) ( 1888 -800 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 800 960 1280 ) ( -864 960 1280 ) ( -864 960 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 128 896 -1472 ) ( -64 896 -1472 ) ( -64 -2048 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1888 -1952 1280 ) ( 1888 -800 1280 ) ( 1888 -800 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 800 960 1280 ) ( -864 960 1280 ) ( -864 960 1248 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 128 896 -1472 ) ( -64 896 -1472 ) ( -64 -2048 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

-( 1824 -800 1472 ) ( 1824 -1952 1472 ) ( 1824 -800 1440 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( 1824 -800 1472 ) ( 1824 -1952 1472 ) ( 1824 -800 1440 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 }\r
 // brush 330\r
 {\r
 }\r
 // brush 330\r
 {\r


@@ -2979,7 +2979,7 @@ evil3_metals/mtldrk1
 ( 1824 -2016 1408 ) ( 1824 -864 1408 ) ( 1824 -864 1376 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 864 1472 ) ( -1056 -288 1472 ) ( -1056 -288 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -64 896 -1472 ) ( -256 896 -1472 ) ( -256 -2048 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1824 -2016 1408 ) ( 1824 -864 1408 ) ( 1824 -864 1376 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 864 1472 ) ( -1056 -288 1472 ) ( -1056 -288 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -64 896 -1472 ) ( -256 896 -1472 ) ( -256 -2048 -1472 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

-( 1792 -1984 1280 ) ( 128 -1984 1280 ) ( 1792 -1984 1248 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( 1792 -1984 1280 ) ( 128 -1984 1280 ) ( 1792 -1984 1248 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 }\r
 // brush 331\r
 {\r
 }\r
 // brush 331\r
 {\r


@@ -2988,7 +2988,7 @@ evil3_metals/mtldrk1
 ( 1824 -1888 1472 ) ( 1824 -736 1472 ) ( 1824 -736 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 800 960 1472 ) ( -864 960 1472 ) ( -864 960 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 864 1488 ) ( -1056 -288 1488 ) ( -1056 -288 1456 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1824 -1888 1472 ) ( 1824 -736 1472 ) ( 1824 -736 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 800 960 1472 ) ( -864 960 1472 ) ( -864 960 1440 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -1056 864 1488 ) ( -1056 -288 1488 ) ( -1056 -288 1456 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

-( -1024 928 1408 ) ( -1024 -224 1408 ) ( 640 928 1408 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( -1024 928 1408 ) ( -1024 -224 1408 ) ( 640 928 1408 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 }\r
 // brush 332\r
 {\r
 }\r
 // brush 332\r
 {\r


@@ -3633,7 +3633,7 @@ evil3_metals/mtldrk1
 }\r
 // brush 395\r
 {\r
 }\r
 // brush 395\r
 {\r

-( 1184 -552 -1288 ) ( 1312 -552 -1288 ) ( 1184 -680 -1288 ) newskies/asteroids 0 -16 0 0.5 0.5 0 0 0\r
+( 1184 -552 -1288 ) ( 1312 -552 -1288 ) ( 1184 -680 -1288 ) skies/asteroids 0 -16 0 0.5 0.5 0 0 0\r

 ( 1216 -552 -1224 ) ( 1216 -680 -1224 ) ( 1216 -680 -3272 ) common/caulk 16 48 0 0.5 0.5 0 0 0\r
 ( 1344 -536 -1224 ) ( 1216 -536 -1224 ) ( 1216 -536 -3272 ) common/caulk 0 48 0 0.5 0.5 0 0 0\r
 ( 1352 -680 -1224 ) ( 1352 -552 -1224 ) ( 1352 -552 -3272 ) common/caulk 16 48 0 0.5 0.5 0 0 0\r
 ( 1216 -552 -1224 ) ( 1216 -680 -1224 ) ( 1216 -680 -3272 ) common/caulk 16 48 0 0.5 0.5 0 0 0\r
 ( 1344 -536 -1224 ) ( 1216 -536 -1224 ) ( 1216 -536 -3272 ) common/caulk 0 48 0 0.5 0.5 0 0 0\r
 ( 1352 -680 -1224 ) ( 1352 -552 -1224 ) ( 1352 -552 -3272 ) common/caulk 16 48 0 0.5 0.5 0 0 0\r


@@ -3642,7 +3642,7 @@ evil3_metals/mtldrk1
 }\r
 // brush 396\r
 {\r
 }\r
 // brush 396\r
 {\r

-( 1216 -680 -1224 ) ( 1216 -552 -1224 ) ( 1216 -680 -3272 ) newskies/asteroids 16 0 0 0.5 0.5 0 0 0\r
+( 1216 -680 -1224 ) ( 1216 -552 -1224 ) ( 1216 -680 -3272 ) skies/asteroids 16 0 0 0.5 0.5 0 0 0\r

 ( 1208 -552 -1208 ) ( 1208 -680 -1208 ) ( 1208 -680 -3256 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1344 -536 -1216 ) ( 1216 -536 -1216 ) ( 1216 -536 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1216 -672 -1216 ) ( 1344 -672 -1216 ) ( 1344 -672 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1208 -552 -1208 ) ( 1208 -680 -1208 ) ( 1208 -680 -3256 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1344 -536 -1216 ) ( 1216 -536 -1216 ) ( 1216 -536 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1216 -672 -1216 ) ( 1344 -672 -1216 ) ( 1344 -672 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r


@@ -3651,7 +3651,7 @@ evil3_metals/mtldrk1
 }\r
 // brush 397\r
 {\r
 }\r
 // brush 397\r
 {\r

-( 1217 -536 -1224 ) ( 1345 -536 -1224 ) ( 1217 -536 -3272 ) newskies/asteroids 0 -16 0 0.5 0.5 0 0 0\r
+( 1217 -536 -1224 ) ( 1345 -536 -1224 ) ( 1217 -536 -3272 ) skies/asteroids 0 -16 0 0.5 0.5 0 0 0\r

 ( 1216 -528 -1224 ) ( 1216 -656 -1224 ) ( 1216 -656 -3272 ) common/caulk 32 48 0 0.5 0.5 0 0 0\r
 ( 1344 -528 -1224 ) ( 1216 -528 -1224 ) ( 1216 -528 -3272 ) common/caulk 0 48 0 0.5 0.5 0 0 0\r
 ( 1352 -656 -1224 ) ( 1352 -528 -1224 ) ( 1352 -528 -3272 ) common/caulk 32 48 0 0.5 0.5 0 0 0\r
 ( 1216 -528 -1224 ) ( 1216 -656 -1224 ) ( 1216 -656 -3272 ) common/caulk 32 48 0 0.5 0.5 0 0 0\r
 ( 1344 -528 -1224 ) ( 1216 -528 -1224 ) ( 1216 -528 -3272 ) common/caulk 0 48 0 0.5 0.5 0 0 0\r
 ( 1352 -656 -1224 ) ( 1352 -528 -1224 ) ( 1352 -528 -3272 ) common/caulk 32 48 0 0.5 0.5 0 0 0\r


@@ -3660,7 +3660,7 @@ evil3_metals/mtldrk1
 }\r
 // brush 398\r
 {\r
 }\r
 // brush 398\r
 {\r

-( 1224 -528 -1152 ) ( 1224 -656 -1152 ) ( 1352 -528 -1152 ) newskies/asteroids 0 -16 0 0.5 0.5 0 0 0\r
+( 1224 -528 -1152 ) ( 1224 -656 -1152 ) ( 1352 -528 -1152 ) skies/asteroids 0 -16 0 0.5 0.5 0 0 0\r

 ( 1216 -552 -1216 ) ( 1216 -680 -1216 ) ( 1216 -680 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1344 -536 -1216 ) ( 1216 -536 -1216 ) ( 1216 -536 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1352 -680 -1216 ) ( 1352 -552 -1216 ) ( 1352 -552 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1216 -552 -1216 ) ( 1216 -680 -1216 ) ( 1216 -680 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1344 -536 -1216 ) ( 1216 -536 -1216 ) ( 1216 -536 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1352 -680 -1216 ) ( 1352 -552 -1216 ) ( 1352 -552 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r


@@ -3669,7 +3669,7 @@ evil3_metals/mtldrk1
 }\r
 // brush 399\r
 {\r
 }\r
 // brush 399\r
 {\r

-( 1352 -552 -1216 ) ( 1352 -680 -1216 ) ( 1352 -552 -3264 ) newskies/asteroids 16 0 0 0.5 0.5 0 0 0\r
+( 1352 -552 -1216 ) ( 1352 -680 -1216 ) ( 1352 -552 -3264 ) skies/asteroids 16 0 0 0.5 0.5 0 0 0\r

 ( 1352 -536 -1216 ) ( 1224 -536 -1216 ) ( 1224 -536 -3264 ) common/caulk -16 0 0 0.5 0.5 0 0 0\r
 ( 1360 -680 -1216 ) ( 1360 -552 -1216 ) ( 1360 -552 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1224 -672 -1216 ) ( 1352 -672 -1216 ) ( 1352 -672 -3264 ) common/caulk -16 0 0 0.5 0.5 0 0 0\r
 ( 1352 -536 -1216 ) ( 1224 -536 -1216 ) ( 1224 -536 -3264 ) common/caulk -16 0 0 0.5 0.5 0 0 0\r
 ( 1360 -680 -1216 ) ( 1360 -552 -1216 ) ( 1360 -552 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1224 -672 -1216 ) ( 1352 -672 -1216 ) ( 1352 -672 -3264 ) common/caulk -16 0 0 0.5 0.5 0 0 0\r


@@ -3678,7 +3678,7 @@ evil3_metals/mtldrk1
 }\r
 // brush 400\r
 {\r
 }\r
 // brush 400\r
 {\r

-( 1344 -672 -1216 ) ( 1216 -672 -1216 ) ( 1344 -672 -3264 ) newskies/asteroids 0 0 0 0.5 0.5 0 0 0\r
+( 1344 -672 -1216 ) ( 1216 -672 -1216 ) ( 1344 -672 -3264 ) skies/asteroids 0 0 0 0.5 0.5 0 0 0\r

 ( 1216 -552 -1224 ) ( 1216 -680 -1224 ) ( 1216 -680 -3272 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1352 -680 -1216 ) ( 1352 -552 -1216 ) ( 1352 -552 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1216 -680 -1216 ) ( 1344 -680 -1216 ) ( 1344 -680 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( 1216 -552 -1224 ) ( 1216 -680 -1224 ) ( 1216 -680 -3272 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1352 -680 -1216 ) ( 1352 -552 -1216 ) ( 1352 -552 -3264 ) common/caulk 16 0 0 0.5 0.5 0 0 0\r
 ( 1216 -680 -1216 ) ( 1344 -680 -1216 ) ( 1344 -680 -3264 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r

diff --git a/data/maps/soylent.waypoints.cache b/data/maps/soylent.waypoints.cache
index e6d002420046289046e531d501a2d88655e5253a..2305a3bdbe87d18f2ff2c922bc112a99b7400c33 100644 (file)
--- a/data/maps/soylent.waypoints.cache
+++ b/data/maps/soylent.waypoints.cache
@@ -367,7 +367,6 @@
 '718.6  64.0 664.0'*'1232.6 -479.4 152.1'\r
 '718.6  64.0 664.0'*'-225.0  58.1 664.1'\r
 '718.6  64.0 664.0'*'1316.8 -460.6 152.1'\r
 '718.6  64.0 664.0'*'1232.6 -479.4 152.1'\r
 '718.6  64.0 664.0'*'-225.0  58.1 664.1'\r
 '718.6  64.0 664.0'*'1316.8 -460.6 152.1'\r

-'1210.0  64.0 142.0'*'718.6  64.0 664.0'\r

 ' 32.0 -992.0 672.0'*'272.0 -1024.0 664.0'\r
 ' 32.0 -992.0 672.0'*' 31.0 -641.5 664.1'\r
 ' 32.0 -992.0 672.0'*'-311.1 -970.1 456.1'\r
 ' 32.0 -992.0 672.0'*'272.0 -1024.0 664.0'\r
 ' 32.0 -992.0 672.0'*' 31.0 -641.5 664.1'\r
 ' 32.0 -992.0 672.0'*'-311.1 -970.1 456.1'\r


@@ -591,3 +590,4 @@
 '1040.0 -464.0 408.0'*'976.0 -1056.0 408.0'\r
 '1040.0 -464.0 408.0'*'917.7 -1293.1 408.1'\r
 '1040.0 -464.0 408.0'*'996.2 -1344.2 408.1'\r
 '1040.0 -464.0 408.0'*'976.0 -1056.0 408.0'\r
 '1040.0 -464.0 408.0'*'917.7 -1293.1 408.1'\r
 '1040.0 -464.0 408.0'*'996.2 -1344.2 408.1'\r

+'1210.0  64.0 142.0'*'718.6  64.0 664.0'\r

diff --git a/data/maps/soylent/lm_0000.tga b/data/maps/soylent/lm_0000.tga
index 26b954f5dcb69047903a3510ca89c728815dcf1e..5457009376bf3c062553ee4d30287e54a2293db5 100644 (file)
Binary files a/data/maps/soylent/lm_0000.tga and b/data/maps/soylent/lm_0000.tga differ

diff --git a/data/maps/soylent/lm_0001.tga b/data/maps/soylent/lm_0001.tga
index 0be09d2041e4aa4ed3903eda6fffc6a79acc2745..9627a57e6c6e593d252388abedf7086930b296af 100644 (file)
Binary files a/data/maps/soylent/lm_0001.tga and b/data/maps/soylent/lm_0001.tga differ

diff --git a/data/maps/soylent/lm_0002.tga b/data/maps/soylent/lm_0002.tga
index a2303782888a1dde1ec1827d89c6bb352b90dacc..dc548b3b125b945fe0b0fbbc59d28ee756d5b67b 100644 (file)
Binary files a/data/maps/soylent/lm_0002.tga and b/data/maps/soylent/lm_0002.tga differ

diff --git a/data/maps/soylent/lm_0003.tga b/data/maps/soylent/lm_0003.tga
index 491d334c5f799063b8a83d1cb8a5f642d4da9663..29ec11eed13d46639f0348725f1f716eabd3b51b 100644 (file)
Binary files a/data/maps/soylent/lm_0003.tga and b/data/maps/soylent/lm_0003.tga differ

diff --git a/data/maps/soylent/lm_0004.tga b/data/maps/soylent/lm_0004.tga
index a0dcdc1e95b67cba56e77214ee6df0cac6da7b98..db31762d5dbe5374c678dd679d5c43660038a473 100644 (file)
Binary files a/data/maps/soylent/lm_0004.tga and b/data/maps/soylent/lm_0004.tga differ

diff --git a/data/maps/soylent/lm_0005.tga b/data/maps/soylent/lm_0005.tga
index f36ec6f50f32333cb02288cbfd6c8fc93571a7cc..27449082f66f668257e4053278996a7d0a315830 100644 (file)
Binary files a/data/maps/soylent/lm_0005.tga and b/data/maps/soylent/lm_0005.tga differ