Merge commit '145caec5a836be05bfd091f175605bed237516e3'

diff --git a/maps/darkzone.map.options b/maps/darkzone.map.options
index f0cebd0667c5bfac12cbe84566083bf8c11ea1b0..72dc23f47879ca7de9efa7a9a845d22b404efdd4 100644 (file)
--- a/maps/darkzone.map.options
+++ b/maps/darkzone.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8
+Version: 9

diff --git a/maps/g-23.map.options b/maps/g-23.map.options
index 7762aa5095789e362bfbb84c2739c5470d3ea962..288ca90d7d271190709113aced80cbdb64f3fbb6 100644 (file)
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8 // ten times golden section
+Version: 9

diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options
index 121c7ba94af234380bc0cb616d693b64947aa27b..5bf9f6d1950178900b35def33b3d8d829e9a9aba 100644 (file)
--- a/maps/glowplant.map.options
+++ b/maps/glowplant.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 12
\ No newline at end of file
+Version: 13

diff --git a/maps/lightspeed.map.options b/maps/lightspeed.map.options
index d40f3823f2791aa5fed9f3cd96e0824e761686c6..6813573bab9d2df12d3e7b93bd04097f97592cf4 100644 (file)
--- a/maps/lightspeed.map.options
+++ b/maps/lightspeed.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6
\ No newline at end of file
+Version: 7

diff --git a/maps/solarium.map.options b/maps/solarium.map.options
index 7acca23e087d1acaa52a264be62573b47c676b52..1e60fc0d0008c4c0678e8f5556f3cf49219c5227 100644 (file)
--- a/maps/solarium.map.options
+++ b/maps/solarium.map.options
@@ -2,4 +2,4 @@
 -vis +
 -light + -bounce 1 -dirty -dirtscale 1 -bouncescale 1 -areascale 0.10
 -minimap +
-Version: 4.1
\ No newline at end of file
+Version: 5

diff --git a/models/map_lightspeed/vines.ase b/models/map_lightspeed/vines.ase
index 30b8307ac283729159f1cab206da224226e26553..aeaf81439d55141b002649d9116e060ca17884f8 100644 (file)
--- a/models/map_lightspeed/vines.ase
+++ b/models/map_lightspeed/vines.ase
@@ -42,7 +42,7 @@
                }\r
        }\r
        *MATERIAL       2       {\r
-               *MATERIAL_NAME  "models/model_lightspeed/vines_long"\r
+               *MATERIAL_NAME  "models/desertfactory/textures/misc/vines01.tga"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_DIFFUSE       0.666268        1.000000        0.139158\r
                *MATERIAL_SHADING Phong\r

diff --git a/models/map_lightspeed/vines/vines01.tga b/models/map_lightspeed/vines/vines01.tga
deleted file mode 100644 (file)
index 14903d5..0000000
Binary files a/models/map_lightspeed/vines/vines01.tga and /dev/null differ

diff --git a/scripts/map_darkzone.shader b/scripts/map_darkzone.shader
index 9f03698e797e34a611cd082087f34f25b298481c..7e05b61af6875d78197c13e33e5b24dbece9439f 100644 (file)
--- a/scripts/map_darkzone.shader
+++ b/scripts/map_darkzone.shader
@@ -1,6 +1,6 @@
 textures/map_darkzone/bluelight
 {
-       qer_editorimage textures/map_darkzone/light/dz_bluelight.tga
+       qer_editorimage textures/ex2x/light/light_beam_blue.tga
        
        q3map_bounceScale  0.75
        dpoffsetmapping - 0.5 match8 99
@@ -9,7 +9,7 @@ textures/map_darkzone/bluelight
 
 
        {
-               map textures/map_darkzone/light/dz_bluelight.tga
+               map textures/ex2x/light/light_beam_blue.tga
                
 
        }
@@ -19,4 +19,4 @@ textures/map_darkzone/bluelight
                tcGen lightmap
                blendfunc filter
        }
-}
\ No newline at end of file
+}

diff --git a/scripts/map_g-23.shader b/scripts/map_g-23.shader
index ff784273f4900b3ab1e6e467e22e32311b493dbf..18c5371e434c5ce96c3d4c31786998a2aebefdb3 100644 (file)
--- a/scripts/map_g-23.shader
+++ b/scripts/map_g-23.shader
@@ -1,6 +1,6 @@
 textures/map_g-23/conveyor_belt
 {
-       qer_editorimage textures/map_g-23/conveyorbelt/conveyorbelt.tga
+       qer_editorimage textures/exx/trim/trim_psimple05.tga
        surfaceparm metalsteps
        surfaceparm nomarks // decals on tcmod = stupid
        q3map_bounceScale  1.5
@@ -9,7 +9,7 @@ textures/map_g-23/conveyor_belt
        dpglossexponentmod  4
        
        {
-               map textures/map_g-23/conveyorbelt/conveyorbelt.tga
+               map textures/exx/trim/trim_psimple05.tga
                tcMod scroll 0 0.25
        }
 }

diff --git a/scripts/map_glowplant.shader b/scripts/map_glowplant.shader
index 088e05dac328b391824e6c8301159cbb921103bb..e455e6a2f2cec6824aa12d6f844f56c53196f6f1 100644 (file)
--- a/scripts/map_glowplant.shader
+++ b/scripts/map_glowplant.shader
@@ -178,13 +178,13 @@ textures/map_glowplant/distort_glass
 
 textures/map_glowplant/gradient_light
 {
-       qer_editorimage textures/map_glowplant/gradient_light.tga
+       qer_editorimage textures/effects_lightning/gradient_white.tga
        surfaceparm noimpact
        surfaceparm nonsolid
        surfaceparm trans
        cull none
        {
-               map textures/map_glowplant/gradient_light.tga
+               map textures/effects_lightning/gradient_white.tga
                blendfunc blend
        }
 }

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index 5688108b6c8af0ed68ae2a36e46e8594b459248f..dfa6dbf08a98ba07d774e626f7b40669549d471f 100644 (file)
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -53,7 +53,7 @@ models/map_lightspeed/lcd_map
 
 textures/map_lightspeed/light_nonglow
 {
-       qer_editorimage textures/map_lightspeed/light/light_1.tga
+       qer_editorimage textures/ex2x/light/light_1.tga
        
        q3map_bounceScale  0.75
        dpoffsetmapping - 0.5
@@ -62,7 +62,7 @@ textures/map_lightspeed/light_nonglow
 
 
        {
-               map textures/map_lightspeed/light/light_1.tga
+               map textures/ex2x/light/light_1.tga
                
 
        }
@@ -76,7 +76,7 @@ textures/map_lightspeed/light_nonglow
 
 textures/map_lightspeed/vines
 {
-       qer_editorimage models/map_lightspeed/vines/vines01.tga
+       qer_editorimage models/desertfactory/textures/misc/vines01.tga
        surfaceparm nonsolid
        surfaceparm nodlight
        surfaceparm nolightmap
@@ -88,7 +88,7 @@ textures/map_lightspeed/vines
        
        
        {
-               map models/map_lightspeed/vines/vines01.tga
+               map models/desertfactory/textures/misc/vines01.tga
                blendfunc filter
                alphaFunc GT0
                rgbGen identity

diff --git a/scripts/map_solarium.shader b/scripts/map_solarium.shader
index a498374be72fe188ecaff620efbc21ed6b310d4f..107730c869affc254a7df0bd3bb029104b416f92 100644 (file)
--- a/scripts/map_solarium.shader
+++ b/scripts/map_solarium.shader
@@ -1,12 +1,12 @@
 textures/map_solarium/waterfall
 {
-       qer_editorimage textures/map_solarium/waterfall/water2.tga
+       qer_editorimage textures/liquids_water/water2.tga
        qer_trans 20
        cull disable
        surfaceparm trans
 
        {
-               map textures/map_solarium/waterfall/water2.tga  
+               map textures/liquids_water/water2.tga
                tcMod scroll 0 -1.9
                blendfunc blend
        

diff --git a/scripts/model_lightspeed.shader b/scripts/model_lightspeed.shader
index 8ee73d1abdb893b4cc7f9d177d813249afc8f6ed..b4836053a356b57b5f54df2a5783b5de15ad34ad 100644 (file)
--- a/scripts/model_lightspeed.shader
+++ b/scripts/model_lightspeed.shader
@@ -1,13 +1,13 @@
 models/model_lightspeed/vines_long
 {
-       qer_editorimage models/map_lightspeed/vines/vines01.tga
+       qer_editorimage models/desertfactory/textures/misc/vines01.tga
        surfaceparm nomarks
        surfaceparm trans
        surfaceparm alphashadow
        deformVertexes wave 75 sin 0 2 0.1 0.1
        cull none
        {
-               map models/map_lightspeed/vines/vines01.tga
+               map models/desertfactory/textures/misc/vines01.tga
                alphaFunc GT0
                rgbGen vertex
        
@@ -26,4 +26,4 @@ models/model_lightspeed/vines_leaves
                alphaFunc GT0
                rgbGen vertex
        }
-}
\ No newline at end of file
+}

diff --git a/textures/map_darkzone/light/dz_bluelight.tga b/textures/map_darkzone/light/dz_bluelight.tga
deleted file mode 100644 (file)
index a5fbe6f..0000000
Binary files a/textures/map_darkzone/light/dz_bluelight.tga and /dev/null differ

diff --git a/textures/map_darkzone/light/dz_bluelight_gloss.tga b/textures/map_darkzone/light/dz_bluelight_gloss.tga
deleted file mode 100644 (file)
index b5e08cf..0000000
Binary files a/textures/map_darkzone/light/dz_bluelight_gloss.tga and /dev/null differ

diff --git a/textures/map_darkzone/light/dz_bluelight_norm.tga b/textures/map_darkzone/light/dz_bluelight_norm.tga
deleted file mode 100644 (file)
index f179cb6..0000000
Binary files a/textures/map_darkzone/light/dz_bluelight_norm.tga and /dev/null differ

diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt.tga b/textures/map_g-23/conveyorbelt/conveyorbelt.tga
deleted file mode 100644 (file)
index 0ec7bf1..0000000
Binary files a/textures/map_g-23/conveyorbelt/conveyorbelt.tga and /dev/null differ

diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga
deleted file mode 100644 (file)
index 75fcbaa..0000000
Binary files a/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga and /dev/null differ

diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga
deleted file mode 100644 (file)
index 5a2d8ea..0000000
Binary files a/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga and /dev/null differ

diff --git a/textures/map_glowplant/gradient_light.tga b/textures/map_glowplant/gradient_light.tga
deleted file mode 100644 (file)
index beda4b6..0000000
Binary files a/textures/map_glowplant/gradient_light.tga and /dev/null differ

diff --git a/textures/map_lightspeed/light/light_1.tga b/textures/map_lightspeed/light/light_1.tga
deleted file mode 100644 (file)
index 1960527..0000000
Binary files a/textures/map_lightspeed/light/light_1.tga and /dev/null differ

diff --git a/textures/map_lightspeed/light/light_1_gloss.tga b/textures/map_lightspeed/light/light_1_gloss.tga
deleted file mode 100644 (file)
index dc8636c..0000000
Binary files a/textures/map_lightspeed/light/light_1_gloss.tga and /dev/null differ

diff --git a/textures/map_lightspeed/light/light_1_norm.tga b/textures/map_lightspeed/light/light_1_norm.tga
deleted file mode 100644 (file)
index 5083dda..0000000
Binary files a/textures/map_lightspeed/light/light_1_norm.tga and /dev/null differ

diff --git a/textures/map_solarium/waterfall/water2.tga b/textures/map_solarium/waterfall/water2.tga
deleted file mode 100644 (file)
index 233e397..0000000
Binary files a/textures/map_solarium/waterfall/water2.tga and /dev/null differ

diff --git a/textures/map_solarium/waterfall/water2_norm.tga b/textures/map_solarium/waterfall/water2_norm.tga
deleted file mode 100644 (file)
index fb4fb22..0000000
Binary files a/textures/map_solarium/waterfall/water2_norm.tga and /dev/null differ