adding 'northern lights' to the skybox, cdtrack, texture fixes, 50A->100A, mapimage

diff --git a/maps/aurora.map b/maps/aurora.map
index 9110e1d28cbb0a626e043449787cc6ed8d2cc07a..53de495311722e64c3ea995ef9e3c253c744a3f8 100644 (file)
--- a/maps/aurora.map
+++ b/maps/aurora.map
@@ -4237,23 +4237,23 @@ exx/floor-wrn01
 ( 3359.0581054688 -3113.7153930664 -2048 ) ( 9513.715423584 3040.9419250488 -2048 ) ( -3157.637878418 3402.9805908203 -2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 1823.0581054688 -4393.7153930664 -1280 ) ( -4693.637878418 2122.9805908203 -1280 ) ( 1823.0581054688 -4393.7153930664 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 5435.4517822266 8249.2442321777 2560 ) ( -719.2055358887 2094.5869140625 2816 ) ( 5435.4517822266 8249.2442321777 2816 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 280 64 2048 ) ( 544 64 2048 ) ( 280 -64 2048 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
+( 280 64 5632 ) ( 544 64 5632 ) ( 280 -64 5632 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 5344.9421081543 8339.75390625 -1024 ) ( -809.7152099609 2185.0965881348 -1024 ) ( 5344.9421081543 8339.75390625 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
+( 5344.9421081543 8339.75390625 2560 ) ( -809.7152099609 2185.0965881348 2560 ) ( 5344.9421081543 8339.75390625 2304 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 4021.0194396973 11093.6379089355 -1024 ) ( 4021.0194396973 11093.6379089355 -1280 ) ( 10537.715423584 4576.9419250488 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 3359.0581054688 -3113.7153930664 -2048 ) ( 9513.715423584 3040.9419250488 -2048 ) ( -3157.637878418 3402.9805908203 -2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 1161.0967712402 -1683.7540588379 -1280 ) ( 1161.0967712402 -1683.7540588379 -1024 ) ( 7315.7540893555 4470.9032592773 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 10447.2057495117 4486.4322509766 -1024 ) ( 3930.509765625 11003.1282348633 -1280 ) ( 3930.509765625 11003.1282348633 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 280 64 2048 ) ( 544 64 2048 ) ( 280 -64 2048 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
+( 10447.2057495117 4486.4322509766 2560 ) ( 3930.509765625 11003.1282348633 2304 ) ( 3930.509765625 11003.1282348633 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
+( 280 64 5632 ) ( 544 64 5632 ) ( 280 -64 5632 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 4021.0194396973 11093.6379089355 -1024 ) ( 4021.0194396973 11093.6379089355 -1280 ) ( 10537.715423584 4576.9419250488 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 3359.0581054688 -3113.7153930664 -2048 ) ( 9513.715423584 3040.9419250488 -2048 ) ( -3157.637878418 3402.9805908203 -2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 1161.0967712402 -1683.7540588379 -1280 ) ( 1161.0967712402 -1683.7540588379 -1024 ) ( 7315.7540893555 4470.9032592773 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 1823.0581054688 -4393.7153930664 -1280 ) ( -4693.637878418 2122.9805908203 -1280 ) ( 1823.0581054688 -4393.7153930664 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 7225.2444152832 4561.4129333496 -1280 ) ( 1070.587097168 -1593.2443847656 -1024 ) ( 1070.587097168 -1593.2443847656 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 280 64 2048 ) ( 544 64 2048 ) ( 280 -64 2048 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
+( 1823.0581054688 -4393.7153930664 2304 ) ( -4693.637878418 2122.9805908203 2304 ) ( 1823.0581054688 -4393.7153930664 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
+( 7225.2444152832 4561.4129333496 2304 ) ( 1070.587097168 -1593.2443847656 2560 ) ( 1070.587097168 -1593.2443847656 2304 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
+( 280 64 5632 ) ( 544 64 5632 ) ( 280 -64 5632 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 5344.9421081543 8339.75390625 -1024 ) ( -809.7152099609 2185.0965881348 -1024 ) ( 5344.9421081543 8339.75390625 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
@@ -4261,7 +4261,7 @@ exx/floor-wrn01
 ( 1161.0967712402 -1683.7540588379 2560 ) ( 1161.0967712402 -1683.7540588379 2816 ) ( 7315.7540893555 4470.9032592773 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 1823.0581054688 -4393.7153930664 -1280 ) ( -4693.637878418 2122.9805908203 -1280 ) ( 1823.0581054688 -4393.7153930664 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 1913.567779541 -4303.2057189941 2816 ) ( -4603.1282043457 2213.4902648926 2560 ) ( 1913.567779541 -4303.2057189941 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( 280 64 2048 ) ( 544 64 2048 ) ( 280 -64 2048 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
+( 280 64 5632 ) ( 544 64 5632 ) ( 280 -64 5632 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 3184 3104 -928 ) ( 3204 3124 -928 ) ( 3456 2832 -928 ) narmorx/base-wood02 0 0 0 0.25 0.25 0 0 0
@@ -4290,8 +4290,8 @@ exx/floor-wrn01
 ( 2912 64 -1608 ) ( 2904 64 -1608 ) ( 2912 -64 -1608 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 2741.0194396973 9557.6379089355 2176 ) ( 9257.715423584 3040.9419250488 2176 ) ( -3413.637878418 3402.9805908203 2176 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
-( -3413.637878418 3402.9805908203 2048 ) ( 9257.715423584 3040.9419250488 2048 ) ( 2741.0194396973 9557.6379089355 2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
+( 2741.0194396973 9557.6379089355 5632 ) ( 9257.715423584 3040.9419250488 5632 ) ( -3413.637878418 3402.9805908203 5632 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
+( -3413.637878418 3402.9805908203 5504 ) ( 9257.715423584 3040.9419250488 5504 ) ( 2741.0194396973 9557.6379089355 5504 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 5435.4517822266 8249.2442321777 128 ) ( -719.2055358887 2094.5869140625 128 ) ( 5435.4517822266 8249.2442321777 -128 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 3930.509765625 11003.1282348633 -3712 ) ( 3930.509765625 11003.1282348633 -3968 ) ( 10447.2057495117 4486.4322509766 -3712 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
 ( 1070.587097168 -1593.2443847656 -3968 ) ( 1070.587097168 -1593.2443847656 -3712 ) ( 7225.2444152832 4561.4129333496 -3968 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0
@@ -8468,7 +8468,7 @@ trak5x/floor-floor2c
 {
 ( 2144 2336 -1712 ) ( 2912 3104 -1712 ) ( 2008 2472 -1712 ) common/caulk 0 0 180 0.25 0.25 0 0 0
 ( 2776 3240 -1712 ) ( 2912 3104 -1600 ) ( 2776 3240 -1600 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 2144 2336 -1600 ) ( 2776 3240 -1600 ) ( 2912 3104 -1600 ) trak5x/base-thread1 384 384 180 0.5 0.5 0 0 0
+( 2144 2336 -1600 ) ( 2776 3240 -1600 ) ( 2912 3104 -1600 ) trak5x/base-thread1 0 0 0 0.5 0.5 0 0 0
 ( 2912 3104 -1600 ) ( 2144 2336 -1712 ) ( 2144 2336 -1600 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 2848 3096 -64 ) ( 2848 3088 -64 ) ( 2848 3096 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 2704 3136 -64 ) ( 2712 3144 -64 ) ( 2704 3136 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -8477,7 +8477,7 @@ trak5x/floor-floor2c
 {
 ( 2280 2200 -1712 ) ( 2912 3104 -1712 ) ( 2144 2336 -1712 ) common/caulk 0 0 180 0.25 0.25 0 0 0
 ( 3048 2968 -1600 ) ( 2912 3104 -1600 ) ( 3048 2968 -1712 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 2912 3104 -1600 ) ( 3048 2968 -1600 ) ( 2144 2336 -1600 ) trak5x/base-thread1 384 384 180 0.5 0.5 0 0 0
+( 2912 3104 -1600 ) ( 3048 2968 -1600 ) ( 2144 2336 -1600 ) trak5x/base-thread1 0 0 0 0.5 0.5 0 0 0
 ( 2144 2336 -1600 ) ( 2144 2336 -1712 ) ( 2912 3104 -1600 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 2864 3040 -64 ) ( 2872 3040 -64 ) ( 2864 3040 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 3008 2960 -64 ) ( 3000 2952 -64 ) ( 3008 2960 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -12656,7 +12656,7 @@ exx/floor-wrn01
 ( 16 1312 -576 ) ( 16 1328 -576 ) ( 16 1312 -288 ) exx/floor-wrn01 256 0 0 -0.25 0.25 134217728 0 0
 }
 {
-( 2640 3104 -928 ) ( 2620 3084 -928 ) ( 2368 3376 -928 ) narmorx/base-wood02 768 768 180 0.25 0.25 0 0 0
+( 2640 3104 -928 ) ( 2620 3084 -928 ) ( 2368 3376 -928 ) narmorx/base-wood02 0 0 0 0.25 0.25 0 0 0
 ( 2368 3376 -1264 ) ( 2620 3084 -1264 ) ( 2640 3104 -1264 ) trak5x/base-base1a 256 256 180 0.25 0.25 0 0 0
 ( 2504 3512 -1264 ) ( 2776 3240 -928 ) ( 2504 3512 -928 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 2768 2960 -64 ) ( 2760 2952 -64 ) ( 2768 2960 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -12665,7 +12665,7 @@ exx/floor-wrn01
 ( 2480 3256 -64 ) ( 2472 3264 -64 ) ( 2480 3256 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( 3184 2560 -928 ) ( 2892 2812 -928 ) ( 2912 2832 -928 ) narmorx/base-wood02 768 768 180 0.25 0.25 0 0 0
+( 3184 2560 -928 ) ( 2892 2812 -928 ) ( 2912 2832 -928 ) narmorx/base-wood02 0 0 0 0.25 0.25 0 0 0
 ( 2912 2832 -1264 ) ( 2892 2812 -1264 ) ( 3184 2560 -1264 ) trak5x/base-base1a 256 256 180 0.25 0.25 0 0 0
 ( 2772 2964 -928 ) ( 2772 2964 -1264 ) ( 2792 2984 -928 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 3320 2696 -928 ) ( 3048 2968 -928 ) ( 3320 2696 -1264 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -16792,6 +16792,31 @@ trak5x/floor-floor2c
 ( -864 -248 -352 ) ( -864 -248 -304 ) ( -896 -248 -352 ) trak6x/panel-panel1 0 0 0 -0.03125 0.03125 0 0 0
 ( -864 -248 -368 ) ( -864 -280 -368 ) ( -864 -248 -320 ) trak6x/panel-panel1 256 0 0 -0.03125 0.03125 0 0 0
 }
+{
+patchDef2
+{
+map_aurora/northern_lights
+( 5 5 0 0 0 )
+(
+( ( -2479.7470703125 248 1056 0 0 ) ( -2242.9233398438 91.17578125 1016 0 0.25 ) ( -1174.0991210938 -1017.6481933594 1016 0 0.5 ) ( -105.2750244141 -2046.4721679688 1016 0 0.75 ) ( 203.5490722656 -2355.2963867188 1176 0 1 ) )
+( ( -2354.9233398438 372.82421875 1056 0.25 0 ) ( -1966.0991210938 328 5440 0.25 0.25 ) ( -897.2749023438 -780.8239746094 5440 0.25 0.5 ) ( 171.5490722656 -1809.6481933594 5440 0.25 0.75 ) ( 528.373046875 -2030.4721679688 1176 0.25 1 ) )
+( ( 1641.9011230469 4329.6484375 1056 0.5 0 ) ( 2030.7250976563 4284.82421875 5440 0.5 0.25 ) ( 3099.5493164063 3176 5440 0.5 0.5 ) ( 4168.373046875 2147.1760253906 5440 0.5 0.75 ) ( 4525.197265625 1926.3518066406 1176 0.5 1 ) )
+( ( 5486.7250976563 8166.47265625 1056 0.75 0 ) ( 5875.548828125 8121.6484375 5440 0.75 0.25 ) ( 6944.373046875 7012.82421875 5440 0.75 0.5 ) ( 8013.197265625 5984 5440 0.75 0.75 ) ( 8370.021484375 5763.17578125 1176 0.75 1 ) )
+( ( 6107.5493164063 8779.296875 1304 1 0 ) ( 6320.373046875 8558.47265625 1304 1 0.25 ) ( 7389.197265625 7449.6484375 1304 1 0.5 ) ( 8458.021484375 6420.82421875 1304 1 0.75 ) ( 8622.845703125 6144 1304 1 1 ) )
+)
+}
+}
+{
+( 7680 7808 1024 ) ( 7680 512 1024 ) ( 0 7808 1024 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 7680 7808 1024 ) ( 0 7808 1024 ) ( 7680 7808 896 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 7168 7808 1024 ) ( 7168 7808 896 ) ( 7168 512 1024 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 0 512 -1792 ) ( 7680 512 -1792 ) ( 0 7808 -1792 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( -1280 256 896 ) ( -1280 7552 896 ) ( -1280 256 1024 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( -1024 1536 -64 ) ( -896 1664 -64 ) ( -1024 1536 64 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 7168 4864 -64 ) ( 7040 4736 -64 ) ( 7168 4864 64 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( -768 -1280 -64 ) ( -896 -1152 -64 ) ( -768 -1280 64 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+( 512 -1152 -64 ) ( 384 -1152 -64 ) ( 512 -1152 64 ) common/lightgrid 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "light"
@@ -17241,10 +17266,6 @@ trak5x/floor-floor2c
 "origin" "4416.000000 5504.000000 -768.000000"
 }
 {
-"classname" "item_armor_big"
-"origin" "5256.000000 5968.000000 -1296.000000"
-}
-{
 "classname" "weapon_hagar"
 "origin" "4768.000000 5216.000000 -784.000000"
 }
@@ -17759,11 +17780,6 @@ trak5x/floor-floor2c
 "angle" "-179.999985"
 }
 {
-"classname" "item_armor_big"
-"origin" "568.000000 240.000000 -1296.000000"
-"angle" "-179.999985"
-}
-{
 "classname" "weapon_hagar"
 "origin" "1056.000000 992.000000 -784.000000"
 "angle" "-179.999985"
@@ -18062,3 +18078,11 @@ trak5x/floor-floor2c
 "origin" "5952 6208 -320"
 "angle" "180"
 }
+{
+"classname" "item_armor_large"
+"origin" "568.000000 240.000000 -1296.000000"
+}
+{
+"classname" "item_armor_large"
+"origin" "5256.000000 5968.000000 -1296.000000"
+}

diff --git a/maps/aurora.map.options b/maps/aurora.map.options
index 0d1ab9a80b544a33f672bc750b7245c9f66464cf..a5e527cce7e788e8cf16576e545913ebe46381ab 100644 (file)
--- a/maps/aurora.map.options
+++ b/maps/aurora.map.options
@@ -2,5 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 1
+Version: 2
 

diff --git a/maps/aurora.mapinfo b/maps/aurora.mapinfo
index c3202a524116d7bc8fb77ef6d8070067bf4099f3..2095e2d8399d21f5efff7479404c17e92c0fc85e 100644 (file)
--- a/maps/aurora.mapinfo
+++ b/maps/aurora.mapinfo
@@ -1,5 +1,6 @@
-title Aurora
+title Aurora CTF
 description A small sized space ctf map
 author dublpaws, Debugger
 has weapons
+cdtrack 7
 gametype ctf

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

diff --git a/scripts/map_aurora.shader b/scripts/map_aurora.shader
new file mode 100644 (file)
index 0000000..b49b107
--- /dev/null
+++ b/scripts/map_aurora.shader
@@ -0,0 +1,27 @@
+textures/map_aurora/northern-lights
+{              
+  qer_editorimage textures/map_aurora/northern_lights.tga
+    surfaceparm trans
+    qer_trans .01
+    surfaceparm nonsolid
+    surfaceparm lava
+    surfaceparm nomarks
+    // deformVertexes wave div func base amplitude phase freq
+    deformVertexes wave 750.0 sin 7 150 0.25 .2
+    Q3map_TessSize 128
+    q3map_surfacelight1000
+    cull none  
+
+    {
+    map textures/map_aurora/northern_lights.tga
+      rgbGen identity
+      depthWrite
+      alphaFunc GE128
+    }
+    {
+    blendfunc filter   
+      map $lightmap    
+      blendfunc filter
+      tcGen lightmap
+    }
+}

diff --git a/textures/map_aurora/northern_lights.tga b/textures/map_aurora/northern_lights.tga
new file mode 100644 (file)
index 0000000..764dabc
Binary files /dev/null and b/textures/map_aurora/northern_lights.tga differ

diff --git a/textures/map_aurora/northern_lights_glow.tga b/textures/map_aurora/northern_lights_glow.tga
new file mode 100644 (file)
index 0000000..3e16a83
Binary files /dev/null and b/textures/map_aurora/northern_lights_glow.tga differ