From: Matthias Krüger Date: Sat, 13 Jul 2013 05:29:04 +0000 (+0200) Subject: respawnrings: ensure backwards compatibility for maps which are still using the old... X-Git-Tag: xonotic-v0.8.0~39^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=abf2f4a693d841a5f5835a86cb70c7d46df8217c;p=xonotic%2Fxonotic-maps.pk3dir.git respawnrings: ensure backwards compatibility for maps which are still using the old ones, rename the new respawnrings to -highres. --- diff --git a/scripts/effects_item.shader b/scripts/effects_item.shader index 2659a742..233dfe74 100644 --- a/scripts/effects_item.shader +++ b/scripts/effects_item.shader @@ -4,7 +4,7 @@ textures/effects_item/respawnring-red surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-red.png + map textures/effects_item/respawnring-red.jpg blendfunc add rgbGen identity } @@ -16,67 +16,91 @@ textures/effects_item/respawnring-blue surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-blue.png + map textures/effects_item/respawnring-blue.jpg blendfunc add rgbGen identity } } -textures/effects_item/respawnring-yellow +textures/effects_item/respawnring-red-highres { surfaceparm nolightmap surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-yellow.png + map textures/effects_item/respawnring-red-highres.png blendfunc add rgbGen identity } } -textures/effects_item/respawnring-black +textures/effects_item/respawnring-blue-highres { surfaceparm nolightmap surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-black.png + map textures/effects_item/respawnring-blue-highres.png blendfunc add rgbGen identity } } -textures/effects_item/respawnring-green +textures/effects_item/respawnring-yellow-highres { surfaceparm nolightmap surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-green.png + map textures/effects_item/respawnring-yellow-highres.png blendfunc add rgbGen identity } } -textures/effects_item/respawnring-purple +textures/effects_item/respawnring-black-highres { surfaceparm nolightmap surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-purple.png + map textures/effects_item/respawnring-black-highres.png blendfunc add rgbGen identity } } -textures/effects_item/respawnring-white +textures/effects_item/respawnring-green-highres { surfaceparm nolightmap surfaceparm nomarks surfaceparm trans { - map textures/effects_item/respawnring-white.png + map textures/effects_item/respawnring-green-highres.png + blendfunc add + rgbGen identity + } +} + +textures/effects_item/respawnring-purple-highres +{ + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm trans + { + map textures/effects_item/respawnring-purple-highres.png + blendfunc add + rgbGen identity + } +} + +textures/effects_item/respawnring-white-highres +{ + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm trans + { + map textures/effects_item/respawnring-white-highres.png blendfunc add rgbGen identity } diff --git a/textures/effects_item/respawnring-black-highres.png b/textures/effects_item/respawnring-black-highres.png new file mode 100644 index 00000000..2e82ed06 Binary files /dev/null and b/textures/effects_item/respawnring-black-highres.png differ diff --git a/textures/effects_item/respawnring-black.png b/textures/effects_item/respawnring-black.png deleted file mode 100644 index 2e82ed06..00000000 Binary files a/textures/effects_item/respawnring-black.png and /dev/null differ diff --git a/textures/effects_item/respawnring-blue-highres.png b/textures/effects_item/respawnring-blue-highres.png new file mode 100644 index 00000000..44de8f78 Binary files /dev/null and b/textures/effects_item/respawnring-blue-highres.png differ diff --git a/textures/effects_item/respawnring-blue.jpg b/textures/effects_item/respawnring-blue.jpg new file mode 100644 index 00000000..52a63850 Binary files /dev/null and b/textures/effects_item/respawnring-blue.jpg differ diff --git a/textures/effects_item/respawnring-blue.png b/textures/effects_item/respawnring-blue.png deleted file mode 100644 index 44de8f78..00000000 Binary files a/textures/effects_item/respawnring-blue.png and /dev/null differ diff --git a/textures/effects_item/respawnring-green-highres.png b/textures/effects_item/respawnring-green-highres.png new file mode 100644 index 00000000..3ada50e4 Binary files /dev/null and b/textures/effects_item/respawnring-green-highres.png differ diff --git a/textures/effects_item/respawnring-green.png b/textures/effects_item/respawnring-green.png deleted file mode 100644 index 3ada50e4..00000000 Binary files a/textures/effects_item/respawnring-green.png and /dev/null differ diff --git a/textures/effects_item/respawnring-purple-highres.png b/textures/effects_item/respawnring-purple-highres.png new file mode 100644 index 00000000..b79bb24b Binary files /dev/null and b/textures/effects_item/respawnring-purple-highres.png differ diff --git a/textures/effects_item/respawnring-purple.png b/textures/effects_item/respawnring-purple.png deleted file mode 100644 index b79bb24b..00000000 Binary files a/textures/effects_item/respawnring-purple.png and /dev/null differ diff --git a/textures/effects_item/respawnring-red-highres.png b/textures/effects_item/respawnring-red-highres.png new file mode 100644 index 00000000..89575835 Binary files /dev/null and b/textures/effects_item/respawnring-red-highres.png differ diff --git a/textures/effects_item/respawnring-red.jpg b/textures/effects_item/respawnring-red.jpg new file mode 100644 index 00000000..eb1562e9 Binary files /dev/null and b/textures/effects_item/respawnring-red.jpg differ diff --git a/textures/effects_item/respawnring-red.png b/textures/effects_item/respawnring-red.png deleted file mode 100644 index 89575835..00000000 Binary files a/textures/effects_item/respawnring-red.png and /dev/null differ diff --git a/textures/effects_item/respawnring-white-highres.png b/textures/effects_item/respawnring-white-highres.png new file mode 100644 index 00000000..7590cd5c Binary files /dev/null and b/textures/effects_item/respawnring-white-highres.png differ diff --git a/textures/effects_item/respawnring-white.png b/textures/effects_item/respawnring-white.png deleted file mode 100644 index 7590cd5c..00000000 Binary files a/textures/effects_item/respawnring-white.png and /dev/null differ diff --git a/textures/effects_item/respawnring-yellow-highres.png b/textures/effects_item/respawnring-yellow-highres.png new file mode 100644 index 00000000..65388369 Binary files /dev/null and b/textures/effects_item/respawnring-yellow-highres.png differ diff --git a/textures/effects_item/respawnring-yellow.png b/textures/effects_item/respawnring-yellow.png deleted file mode 100644 index 65388369..00000000 Binary files a/textures/effects_item/respawnring-yellow.png and /dev/null differ