From: Mario Date: Wed, 14 Aug 2013 03:07:07 +0000 (+1000) Subject: Add new icons & banners for yellow/pink flags by forseti X-Git-Tag: xonotic-v0.8.1~29^2~47 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f678c9fc7d5a33e7deadd7f447f963669b24ddb;p=xonotic%2Fxonotic-data.pk3dir.git Add new icons & banners for yellow/pink flags by forseti --- diff --git a/gfx/hud/default/flag_pink_carrying.tga b/gfx/hud/default/flag_pink_carrying.tga index 2753969345..920adfdd65 100644 Binary files a/gfx/hud/default/flag_pink_carrying.tga and b/gfx/hud/default/flag_pink_carrying.tga differ diff --git a/gfx/hud/default/flag_pink_lost.tga b/gfx/hud/default/flag_pink_lost.tga index 7b48ee5367..87d114151b 100644 Binary files a/gfx/hud/default/flag_pink_lost.tga and b/gfx/hud/default/flag_pink_lost.tga differ diff --git a/gfx/hud/default/flag_pink_shielded.tga b/gfx/hud/default/flag_pink_shielded.tga index 3c185f6d98..5f9241675e 100644 Binary files a/gfx/hud/default/flag_pink_shielded.tga and b/gfx/hud/default/flag_pink_shielded.tga differ diff --git a/gfx/hud/default/flag_pink_taken.tga b/gfx/hud/default/flag_pink_taken.tga index 3bbfaac8ce..4f8bab32ae 100644 Binary files a/gfx/hud/default/flag_pink_taken.tga and b/gfx/hud/default/flag_pink_taken.tga differ diff --git a/gfx/hud/default/flag_yellow_carrying.tga b/gfx/hud/default/flag_yellow_carrying.tga index 158482185b..48ed501759 100644 Binary files a/gfx/hud/default/flag_yellow_carrying.tga and b/gfx/hud/default/flag_yellow_carrying.tga differ diff --git a/gfx/hud/default/flag_yellow_lost.tga b/gfx/hud/default/flag_yellow_lost.tga index f5a02e9a80..f930414ef4 100644 Binary files a/gfx/hud/default/flag_yellow_lost.tga and b/gfx/hud/default/flag_yellow_lost.tga differ diff --git a/gfx/hud/default/flag_yellow_shielded.tga b/gfx/hud/default/flag_yellow_shielded.tga index c904cf4abb..92ee3b1db0 100644 Binary files a/gfx/hud/default/flag_yellow_shielded.tga and b/gfx/hud/default/flag_yellow_shielded.tga differ diff --git a/gfx/hud/default/flag_yellow_taken.tga b/gfx/hud/default/flag_yellow_taken.tga index 16e7b2ad6e..274e4ceb90 100644 Binary files a/gfx/hud/default/flag_yellow_taken.tga and b/gfx/hud/default/flag_yellow_taken.tga differ diff --git a/models/ctf/banner_pink.tga b/models/ctf/banner_pink.tga index cc2610c802..68e65b6de7 100644 Binary files a/models/ctf/banner_pink.tga and b/models/ctf/banner_pink.tga differ diff --git a/models/ctf/banner_yellow.tga b/models/ctf/banner_yellow.tga index 4f1fbbd787..b398e880b1 100644 Binary files a/models/ctf/banner_yellow.tga and b/models/ctf/banner_yellow.tga differ diff --git a/models/ctf/glow_yellow.tga b/models/ctf/glow_yellow.tga index 0d98b143c3..8562caadd9 100644 Binary files a/models/ctf/glow_yellow.tga and b/models/ctf/glow_yellow.tga differ diff --git a/models/ctf/glow_yellow_glow.tga b/models/ctf/glow_yellow_glow.tga index 5dca40c3d0..8562caadd9 100644 Binary files a/models/ctf/glow_yellow_glow.tga and b/models/ctf/glow_yellow_glow.tga differ diff --git a/scripts/ctf.shader b/scripts/ctf.shader index 2eceff38dd..e597938dc6 100644 --- a/scripts/ctf.shader +++ b/scripts/ctf.shader @@ -15,4 +15,22 @@ models/ctf/glow_blue tcMod scroll 0.1 -0.04 tcMod rotate 0.1 } +} +models/ctf/glow_yellow +{ + { + map models/ctf/glow_yellow.tga + tcMod scale 0.03 0.03 + tcMod scroll 0.1 -0.04 + tcMod rotate 0.1 + } +} +models/ctf/glow_pink +{ + { + map models/ctf/glow_pink.tga + tcMod scale 0.03 0.03 + tcMod scroll 0.1 -0.04 + tcMod rotate 0.1 + } } \ No newline at end of file