From: cbrutail Date: Sun, 5 Feb 2012 19:10:57 +0000 (+0100) Subject: Fixing the screen, it was never ok. X-Git-Tag: xonotic-v0.6.0~8^2~6 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=aa0b87453b4a9185e40cedd2691b3c2fe24bd30f Fixing the screen, it was never ok. --- diff --git a/maps/lightspeed.map b/maps/lightspeed.map index 066fff2c..5669f204 100644 --- a/maps/lightspeed.map +++ b/maps/lightspeed.map @@ -6799,22 +6799,6 @@ facility114x/base-basegray } } { -( -779 -444 168 ) ( -779 -540 168 ) ( -787 -444 168 ) map_lightspeed/lightspeedscrn 748 80 0 0.25 0.25 134217728 0 0 -( -783 -400 140 ) ( -791 -400 140 ) ( -783 -400 76 ) map_lightspeed/lightspeedscrn 764 48 0 0.25 0.25 134217728 0 0 -( -784 -393 228 ) ( -784 -393 164 ) ( -784 -489 228 ) map_lightspeed/lightspeedscrn 228 144 0 0.25 0.25 134217728 0 0 -( -791 -540 76 ) ( -783 -540 76 ) ( -791 -444 76 ) map_lightspeed/lightspeedscrn 764 80 0 0.25 0.25 134217728 0 0 -( -775 -528 76 ) ( -775 -528 140 ) ( -767 -528 76 ) map_lightspeed/lightspeedscrn 188 48 0 0.25 0.25 134217728 0 0 -( -785 -544 126 ) ( -785 -448 126 ) ( -785 -544 190 ) map_lightspeed/lightspeedscrn 672 422.9565124512 0 -0.1666666716 0.1796875 134217728 0 0 -} -{ -( -778 -444 168 ) ( -778 -540 168 ) ( -786 -444 168 ) common/nodrawnonsolid 232 80 0 0.25 0.25 134217728 0 0 -( -782 -400 140 ) ( -790 -400 140 ) ( -782 -400 76 ) common/nodrawnonsolid 248 48 0 0.25 0.25 134217728 0 0 -( -780 -392 228 ) ( -780 -392 164 ) ( -780 -488 228 ) common/nodrawnonsolid 224 144 0 0.25 0.25 134217728 0 0 -( -790 -540 76 ) ( -782 -540 76 ) ( -790 -444 76 ) common/nodrawnonsolid 248 80 0 0.25 0.25 134217728 0 0 -( -774 -528 76 ) ( -774 -528 140 ) ( -766 -528 76 ) common/nodrawnonsolid 184 48 0 0.25 0.25 134217728 0 0 -( -784 -544 126 ) ( -784 -448 126 ) ( -784 -544 190 ) map_lightspeed/lightspeedscrn_t 672 422.9565124512 0 -0.1666666716 0.1796875 134217728 0 0 -} -{ ( 48 160 65 ) ( 48 -160 65 ) ( -80 160 65 ) decals/scorch01 0 511.9999389648 0 0.2187499851 0.2187499851 134217728 0 0 ( 0 208 -63 ) ( 0 192 -63 ) ( 0 208 65 ) common/nodrawnonsolid 0 4 0 0.25 0.25 134217728 0 0 ( 80 0 65 ) ( 32 0 -63 ) ( 80 0 -63 ) common/nodrawnonsolid 0 24.5714111328 0 0.2187499851 0.2187499851 134217728 0 0 @@ -9061,6 +9045,22 @@ terrain01x/ground-drylake01 ( -992 -160 320 ) ( -640 -160 288 ) ( -992 -160 288 ) common/clip 0 0 0 0.25 0.25 0 0 0 ( -992 -160 288 ) ( -992 160 288 ) ( -992 -160 320 ) common/clip 0 0 0 0.25 0.25 0 0 0 } +{ +( -779 -444 168 ) ( -779 -540 168 ) ( -787 -444 168 ) common/nodrawnonsolid 748 80 0 0.25 0.25 134217728 0 0 +( -783 -400 140 ) ( -791 -400 140 ) ( -783 -400 76 ) common/nodrawnonsolid 764 48 0 0.25 0.25 134217728 0 0 +( -784 -393 228 ) ( -784 -393 164 ) ( -784 -489 228 ) map_lightspeed/lightspeedscrn 228 144 0 0.25 0.25 134217728 0 0 +( -791 -540 76 ) ( -783 -540 76 ) ( -791 -444 76 ) common/nodrawnonsolid 764 80 0 0.25 0.25 134217728 0 0 +( -775 -528 76 ) ( -775 -528 140 ) ( -767 -528 76 ) common/nodrawnonsolid 188 48 0 0.25 0.25 134217728 0 0 +( -785 -544 126 ) ( -785 -448 126 ) ( -785 -544 190 ) map_lightspeed/lightspeedscrn 672 422.9565124512 0 -0.1666666716 0.1796875 134217728 0 0 +} +{ +( -778 -444 168 ) ( -778 -540 168 ) ( -786 -444 168 ) common/nodrawnonsolid 232 80 0 0.25 0.25 134217728 0 0 +( -782 -400 140 ) ( -790 -400 140 ) ( -782 -400 76 ) common/nodrawnonsolid 248 48 0 0.25 0.25 134217728 0 0 +( -780 -392 228 ) ( -780 -392 164 ) ( -780 -488 228 ) common/nodrawnonsolid 224 144 0 0.25 0.25 134217728 0 0 +( -790 -540 76 ) ( -782 -540 76 ) ( -790 -444 76 ) common/nodrawnonsolid 248 80 0 0.25 0.25 134217728 0 0 +( -774 -528 76 ) ( -774 -528 140 ) ( -766 -528 76 ) common/nodrawnonsolid 184 48 0 0.25 0.25 134217728 0 0 +( -784 -544 126 ) ( -784 -448 126 ) ( -784 -544 190 ) map_lightspeed/lightspeedscrn_t 672 422.9565124512 0 -0.1666666716 0.1796875 134217728 0 0 +} } { "classname" "item_health_mega" diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader index 7565ff72..e82fef16 100644 --- a/scripts/map_lightspeed.shader +++ b/scripts/map_lightspeed.shader @@ -4,8 +4,8 @@ textures/map_lightspeed/lightspeedscrn surfaceparm trans surfaceparm nonsolid - surfaceparm nodlight - surfaceparm nolightmap +// surfaceparm nodlight +// surfaceparm nolightmap qer_trans 0.6 polygonOffset @@ -14,8 +14,8 @@ textures/map_lightspeed/lightspeedscrn { map textures/map_lightspeed/screens/lightspeedscrn.tga - rgbgen identity - blendfunc add +// rgbgen identity + blendfunc blend tcMod scroll 0 -0.25 } } @@ -23,15 +23,15 @@ textures/map_lightspeed/lightspeedscrn textures/map_lightspeed/lightspeedscrn_t { qer_editorimage textures/map_lightspeed/screens/lightspeedscrn1.tga - surfaceparm nolightmap - surfaceparm nodlight +// surfaceparm nolightmap +// surfaceparm nodlight surfaceparm trans cull none qer_trans 0.6 { animMap 18 textures/map_lightspeed/screens/lightspeedscrn1.tga textures/map_lightspeed/screens/lightspeedscrn2.tga textures/map_lightspeed/screens/lightspeedscrn3.tga textures/map_lightspeed/screens/lightspeedscrn4.tga textures/map_lightspeed/screens/lightspeedscrn5.tga textures/map_lightspeed/screens/lightspeedscrn4.tga textures/map_lightspeed/screens/lightspeedscrn3.tga textures/map_lightspeed/screens/lightspeedscrn2.tga - blendfunc add + blendfunc blend } } diff --git a/textures/map_lightspeed/screens/lightspeedscrn.tga b/textures/map_lightspeed/screens/lightspeedscrn.tga index b853d4cc..a1fb110a 100644 Binary files a/textures/map_lightspeed/screens/lightspeedscrn.tga and b/textures/map_lightspeed/screens/lightspeedscrn.tga differ