From: terencehill Date: Sat, 15 Oct 2022 10:08:45 +0000 (+0200) Subject: Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards... X-Git-Tag: xonotic-v0.8.6~324 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b299b9bcb82c12791406f3540305919414d745a7;p=xonotic%2Fxonotic-data.pk3dir.git Revert "Merge branch 'Mario/ctf_colormaps' into 'master'" because it breaks backwards-compatibility. It will be merged back when we are close to a release. This reverts commit 07bbfa46e816c94bd63a2af533c4a2a31e0078a5, reversing changes made to 0db0001bd383b6d57f9583120d0868feb70290e7. --- diff --git a/models/ctf/banner.tga b/models/ctf/banner.tga deleted file mode 100644 index 718d40b53..000000000 Binary files a/models/ctf/banner.tga and /dev/null differ diff --git a/models/ctf/banner_blue.tga b/models/ctf/banner_blue.tga new file mode 100644 index 000000000..8b9558975 Binary files /dev/null and b/models/ctf/banner_blue.tga differ diff --git a/models/ctf/banner_gloss.tga b/models/ctf/banner_gloss.tga deleted file mode 100644 index 77168a8a8..000000000 Binary files a/models/ctf/banner_gloss.tga and /dev/null differ diff --git a/models/ctf/banner_neutral.tga b/models/ctf/banner_neutral.tga new file mode 100644 index 000000000..5c3de9461 Binary files /dev/null and b/models/ctf/banner_neutral.tga differ diff --git a/models/ctf/banner_neutral_gloss.tga b/models/ctf/banner_neutral_gloss.tga new file mode 100644 index 000000000..77168a8a8 Binary files /dev/null and b/models/ctf/banner_neutral_gloss.tga differ diff --git a/models/ctf/banner_pink.tga b/models/ctf/banner_pink.tga new file mode 100644 index 000000000..68e65b6de Binary files /dev/null and b/models/ctf/banner_pink.tga differ diff --git a/models/ctf/banner_pink_gloss.tga b/models/ctf/banner_pink_gloss.tga new file mode 100644 index 000000000..77168a8a8 Binary files /dev/null and b/models/ctf/banner_pink_gloss.tga differ diff --git a/models/ctf/banner_red.tga b/models/ctf/banner_red.tga new file mode 100644 index 000000000..a64aa36ce Binary files /dev/null and b/models/ctf/banner_red.tga differ diff --git a/models/ctf/banner_red_gloss.tga b/models/ctf/banner_red_gloss.tga new file mode 100644 index 000000000..77168a8a8 Binary files /dev/null and b/models/ctf/banner_red_gloss.tga differ diff --git a/models/ctf/banner_shirt.tga b/models/ctf/banner_shirt.tga deleted file mode 100644 index 8c0b7092a..000000000 Binary files a/models/ctf/banner_shirt.tga and /dev/null differ diff --git a/models/ctf/banner_yellow.tga b/models/ctf/banner_yellow.tga new file mode 100644 index 000000000..b398e880b Binary files /dev/null and b/models/ctf/banner_yellow.tga differ diff --git a/models/ctf/banner_yellow_gloss.tga b/models/ctf/banner_yellow_gloss.tga new file mode 100644 index 000000000..77168a8a8 Binary files /dev/null and b/models/ctf/banner_yellow_gloss.tga differ diff --git a/models/ctf/flag.tga b/models/ctf/flag.tga deleted file mode 100644 index 9e67747b5..000000000 Binary files a/models/ctf/flag.tga and /dev/null differ diff --git a/models/ctf/flag_blue.tga b/models/ctf/flag_blue.tga new file mode 100644 index 000000000..63feddd4e Binary files /dev/null and b/models/ctf/flag_blue.tga differ diff --git a/models/ctf/flag_blue_gloss.tga b/models/ctf/flag_blue_gloss.tga new file mode 100644 index 000000000..3e92985b8 Binary files /dev/null and b/models/ctf/flag_blue_gloss.tga differ diff --git a/models/ctf/flag_blue_glow.tga b/models/ctf/flag_blue_glow.tga new file mode 100644 index 000000000..8605da159 Binary files /dev/null and b/models/ctf/flag_blue_glow.tga differ diff --git a/models/ctf/flag_blue_norm.tga b/models/ctf/flag_blue_norm.tga new file mode 100644 index 000000000..07d5e17aa Binary files /dev/null and b/models/ctf/flag_blue_norm.tga differ diff --git a/models/ctf/flag_gloss.tga b/models/ctf/flag_gloss.tga deleted file mode 100644 index 3e92985b8..000000000 Binary files a/models/ctf/flag_gloss.tga and /dev/null differ diff --git a/models/ctf/flag_glow.tga b/models/ctf/flag_glow.tga deleted file mode 100644 index bb5dfae42..000000000 Binary files a/models/ctf/flag_glow.tga and /dev/null differ diff --git a/models/ctf/flag_neutral.tga b/models/ctf/flag_neutral.tga new file mode 100644 index 000000000..63feddd4e Binary files /dev/null and b/models/ctf/flag_neutral.tga differ diff --git a/models/ctf/flag_neutral_gloss.tga b/models/ctf/flag_neutral_gloss.tga new file mode 100644 index 000000000..3e92985b8 Binary files /dev/null and b/models/ctf/flag_neutral_gloss.tga differ diff --git a/models/ctf/flag_neutral_glow.tga b/models/ctf/flag_neutral_glow.tga new file mode 100644 index 000000000..77191aba0 Binary files /dev/null and b/models/ctf/flag_neutral_glow.tga differ diff --git a/models/ctf/flag_neutral_norm.tga b/models/ctf/flag_neutral_norm.tga new file mode 100644 index 000000000..07d5e17aa Binary files /dev/null and b/models/ctf/flag_neutral_norm.tga differ diff --git a/models/ctf/flag_norm.tga b/models/ctf/flag_norm.tga deleted file mode 100644 index 07d5e17aa..000000000 Binary files a/models/ctf/flag_norm.tga and /dev/null differ diff --git a/models/ctf/flag_pink.tga b/models/ctf/flag_pink.tga new file mode 100644 index 000000000..63feddd4e Binary files /dev/null and b/models/ctf/flag_pink.tga differ diff --git a/models/ctf/flag_pink_gloss.tga b/models/ctf/flag_pink_gloss.tga new file mode 100644 index 000000000..3e92985b8 Binary files /dev/null and b/models/ctf/flag_pink_gloss.tga differ diff --git a/models/ctf/flag_pink_glow.tga b/models/ctf/flag_pink_glow.tga new file mode 100644 index 000000000..ba70c0854 Binary files /dev/null and b/models/ctf/flag_pink_glow.tga differ diff --git a/models/ctf/flag_pink_norm.tga b/models/ctf/flag_pink_norm.tga new file mode 100644 index 000000000..07d5e17aa Binary files /dev/null and b/models/ctf/flag_pink_norm.tga differ diff --git a/models/ctf/flag_red.tga b/models/ctf/flag_red.tga new file mode 100644 index 000000000..63feddd4e Binary files /dev/null and b/models/ctf/flag_red.tga differ diff --git a/models/ctf/flag_red_gloss.tga b/models/ctf/flag_red_gloss.tga new file mode 100644 index 000000000..3e92985b8 Binary files /dev/null and b/models/ctf/flag_red_gloss.tga differ diff --git a/models/ctf/flag_red_glow.tga b/models/ctf/flag_red_glow.tga new file mode 100644 index 000000000..dfe90a42d Binary files /dev/null and b/models/ctf/flag_red_glow.tga differ diff --git a/models/ctf/flag_red_norm.tga b/models/ctf/flag_red_norm.tga new file mode 100644 index 000000000..07d5e17aa Binary files /dev/null and b/models/ctf/flag_red_norm.tga differ diff --git a/models/ctf/flag_yellow.tga b/models/ctf/flag_yellow.tga new file mode 100644 index 000000000..63feddd4e Binary files /dev/null and b/models/ctf/flag_yellow.tga differ diff --git a/models/ctf/flag_yellow_gloss.tga b/models/ctf/flag_yellow_gloss.tga new file mode 100644 index 000000000..3e92985b8 Binary files /dev/null and b/models/ctf/flag_yellow_gloss.tga differ diff --git a/models/ctf/flag_yellow_glow.tga b/models/ctf/flag_yellow_glow.tga new file mode 100644 index 000000000..0af88a942 Binary files /dev/null and b/models/ctf/flag_yellow_glow.tga differ diff --git a/models/ctf/flag_yellow_norm.tga b/models/ctf/flag_yellow_norm.tga new file mode 100644 index 000000000..07d5e17aa Binary files /dev/null and b/models/ctf/flag_yellow_norm.tga differ diff --git a/models/ctf/flags.md3_0.skin b/models/ctf/flags.md3_0.skin index 86a69eb30..489df22f4 100644 --- a/models/ctf/flags.md3_0.skin +++ b/models/ctf/flags.md3_0.skin @@ -1,3 +1,3 @@ -mesh,models/ctf/flag.tga -mesh2,models/ctf/banner.tga -mesh3,models/ctf/glow.tga \ No newline at end of file +mesh,models/ctf/flag_red.tga +mesh2,models/ctf/banner_red.tga +mesh3,models/ctf/glow_red.tga \ No newline at end of file diff --git a/models/ctf/flags.md3_1.skin b/models/ctf/flags.md3_1.skin new file mode 100644 index 000000000..47c5aeb71 --- /dev/null +++ b/models/ctf/flags.md3_1.skin @@ -0,0 +1,3 @@ +mesh,models/ctf/flag_blue.tga +mesh2,models/ctf/banner_blue.tga +mesh3,models/ctf/glow_blue.tga \ No newline at end of file diff --git a/models/ctf/flags.md3_2.skin b/models/ctf/flags.md3_2.skin new file mode 100644 index 000000000..44fb67d27 --- /dev/null +++ b/models/ctf/flags.md3_2.skin @@ -0,0 +1,3 @@ +mesh,models/ctf/flag_yellow.tga +mesh2,models/ctf/banner_yellow.tga +mesh3,models/ctf/glow_yellow.tga \ No newline at end of file diff --git a/models/ctf/flags.md3_3.skin b/models/ctf/flags.md3_3.skin new file mode 100644 index 000000000..22d77d224 --- /dev/null +++ b/models/ctf/flags.md3_3.skin @@ -0,0 +1,3 @@ +mesh,models/ctf/flag_pink.tga +mesh2,models/ctf/banner_pink.tga +mesh3,models/ctf/glow_pink.tga \ No newline at end of file diff --git a/models/ctf/flags.md3_4.skin b/models/ctf/flags.md3_4.skin new file mode 100644 index 000000000..ba35e26c6 --- /dev/null +++ b/models/ctf/flags.md3_4.skin @@ -0,0 +1,3 @@ +mesh,models/ctf/flag_neutral.tga +mesh2,models/ctf/banner_neutral.tga +mesh3,models/ctf/glow_neutral.tga \ No newline at end of file diff --git a/models/ctf/glow.tga b/models/ctf/glow.tga deleted file mode 100644 index 7bb6358dd..000000000 Binary files a/models/ctf/glow.tga and /dev/null differ diff --git a/models/ctf/glow_blue.tga b/models/ctf/glow_blue.tga new file mode 100644 index 000000000..6968dc28a Binary files /dev/null and b/models/ctf/glow_blue.tga differ diff --git a/models/ctf/glow_blue_glow.tga b/models/ctf/glow_blue_glow.tga new file mode 100644 index 000000000..6968dc28a Binary files /dev/null and b/models/ctf/glow_blue_glow.tga differ diff --git a/models/ctf/glow_glow.tga b/models/ctf/glow_glow.tga deleted file mode 100644 index 5ffa098e3..000000000 Binary files a/models/ctf/glow_glow.tga and /dev/null differ diff --git a/models/ctf/glow_neutral.tga b/models/ctf/glow_neutral.tga new file mode 100644 index 000000000..5ffa098e3 Binary files /dev/null and b/models/ctf/glow_neutral.tga differ diff --git a/models/ctf/glow_neutral_glow.tga b/models/ctf/glow_neutral_glow.tga new file mode 100644 index 000000000..5ffa098e3 Binary files /dev/null and b/models/ctf/glow_neutral_glow.tga differ diff --git a/models/ctf/glow_pink.tga b/models/ctf/glow_pink.tga new file mode 100644 index 000000000..6a3bb8c06 Binary files /dev/null and b/models/ctf/glow_pink.tga differ diff --git a/models/ctf/glow_pink_glow.tga b/models/ctf/glow_pink_glow.tga new file mode 100644 index 000000000..8da95a975 Binary files /dev/null and b/models/ctf/glow_pink_glow.tga differ diff --git a/models/ctf/glow_red.tga b/models/ctf/glow_red.tga new file mode 100644 index 000000000..9702b0b1c Binary files /dev/null and b/models/ctf/glow_red.tga differ diff --git a/models/ctf/glow_red_glow.tga b/models/ctf/glow_red_glow.tga new file mode 100644 index 000000000..9702b0b1c Binary files /dev/null and b/models/ctf/glow_red_glow.tga differ diff --git a/models/ctf/glow_yellow.tga b/models/ctf/glow_yellow.tga new file mode 100644 index 000000000..8562caadd Binary files /dev/null and b/models/ctf/glow_yellow.tga differ diff --git a/models/ctf/glow_yellow_glow.tga b/models/ctf/glow_yellow_glow.tga new file mode 100644 index 000000000..8562caadd Binary files /dev/null and b/models/ctf/glow_yellow_glow.tga differ diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc index 5fbb2b2a6..670b00fa4 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc @@ -1304,11 +1304,6 @@ void ctf_FlagSetup(int teamnum, entity flag) // called when spawning a flag enti flag.nextthink = time + FLAG_THINKRATE; flag.ctf_status = FLAG_BASE; - // set correct team colors - flag.glowmod = Team_ColorRGB(teamnum); - flag.colormap = (teamnum) ? (teamnum - 1) * 0x11 : 0x00; - flag.colormap |= BIT(10); // RENDER_COLORMAPPED - // crudely force them all to 0 if(autocvar_g_ctf_score_ignore_fields) flag.cnt = flag.score_assist = flag.score_team_capture = flag.score_capture = flag.score_drop = flag.score_pickup = flag.score_return = 0; diff --git a/scripts/ctf.shader b/scripts/ctf.shader index 8cb101f12..827d7c5a7 100644 --- a/scripts/ctf.shader +++ b/scripts/ctf.shader @@ -1,7 +1,43 @@ -models/ctf/glow +models/ctf/glow_red { { - map models/ctf/glow.tga + map models/ctf/glow_red.tga + tcMod scale 0.03 0.03 + tcMod scroll 0.1 -0.04 + tcMod rotate 0.1 + } +} +models/ctf/glow_blue +{ + { + map models/ctf/glow_blue.tga + tcMod scale 0.03 0.03 + 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 + } +} +models/ctf/glow_neutral +{ + { + map models/ctf/glow_neutral.tga tcMod scale 0.03 0.03 tcMod scroll 0.1 -0.04 tcMod rotate 0.1