From: otta8634 Date: Sat, 15 Feb 2025 20:04:12 +0000 (+0800) Subject: Create and use neutral domination icons X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F1475%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Create and use neutral domination icons Previously the blue team highlighted hud icon and the neutral team highlighted hud icon looked identical in domination. Added icons so they can be differentiated. Sources - luma: there was already a file for this in mediasource, which just wasn't used in the game for some reason. - luminos: edited the TGA, since there was no source in mediasource. - old: edited the TGA, since there was no source in mediasource. --- diff --git a/gfx/hud/luma/dom_icon_neutral-highlighted.tga b/gfx/hud/luma/dom_icon_neutral-highlighted.tga new file mode 100644 index 000000000..1e5a41fbc Binary files /dev/null and b/gfx/hud/luma/dom_icon_neutral-highlighted.tga differ diff --git a/gfx/hud/luminos/dom_icon_neutral-highlighted.tga b/gfx/hud/luminos/dom_icon_neutral-highlighted.tga new file mode 100644 index 000000000..613ece82f Binary files /dev/null and b/gfx/hud/luminos/dom_icon_neutral-highlighted.tga differ diff --git a/gfx/hud/old/dom_icon_neutral-highlighted.tga b/gfx/hud/old/dom_icon_neutral-highlighted.tga new file mode 100644 index 000000000..21ff50773 Binary files /dev/null and b/gfx/hud/old/dom_icon_neutral-highlighted.tga differ diff --git a/qcsrc/common/mutators/mutator/waypoints/all.inc b/qcsrc/common/mutators/mutator/waypoints/all.inc index da31fcb64..90bc6e15f 100644 --- a/qcsrc/common/mutators/mutator/waypoints/all.inc +++ b/qcsrc/common/mutators/mutator/waypoints/all.inc @@ -39,7 +39,7 @@ REGISTER_WAYPOINT(FlagCarrierEnemyYellow, _("Enemy carrier"), "flag_yellow_carr REGISTER_WAYPOINT(FlagCarrierEnemyPink, _("Enemy carrier"), "flag_pink_carrying", '0.8 0.8 0', 1); REGISTER_WAYPOINT(FlagReturn, _("Return flag here"), "", '0 0.8 0.8', 1); -REGISTER_WAYPOINT(DomNeut, _("Control point"), "dom_icon_blue-highlighted", '0 1 1', 1); +REGISTER_WAYPOINT(DomNeut, _("Control point"), "dom_icon_neutral-highlighted", '0 1 1', 1); REGISTER_WAYPOINT(DomRed, _("Control point"), "dom_icon_red-highlighted", '0 1 1', 1); REGISTER_WAYPOINT(DomBlue, _("Control point"), "dom_icon_blue-highlighted", '0 1 1', 1); REGISTER_WAYPOINT(DomYellow, _("Control point"), "dom_icon_yellow-highlighted", '0 1 1', 1);