From: Severin Meyer Date: Sat, 24 Jan 2015 18:11:56 +0000 (+0100) Subject: Add a new row of traditional, unobtrusive, high-contrast crosshairs to the crosshair... X-Git-Tag: xonotic-v0.8.1~146^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d1b37bdd57f1910d7dafaf69e2ba3e85d365c541;p=xonotic%2Fxonotic-data.pk3dir.git Add a new row of traditional, unobtrusive, high-contrast crosshairs to the crosshair settings --- diff --git a/gfx/crosshair29.tga b/gfx/crosshair29.tga new file mode 100644 index 000000000..c1037517f Binary files /dev/null and b/gfx/crosshair29.tga differ diff --git a/gfx/crosshair30.tga b/gfx/crosshair30.tga new file mode 100644 index 000000000..093bff294 Binary files /dev/null and b/gfx/crosshair30.tga differ diff --git a/gfx/crosshair31.tga b/gfx/crosshair31.tga new file mode 100644 index 000000000..c7d59e387 Binary files /dev/null and b/gfx/crosshair31.tga differ diff --git a/gfx/crosshair32.tga b/gfx/crosshair32.tga new file mode 100644 index 000000000..0dae288c7 Binary files /dev/null and b/gfx/crosshair32.tga differ diff --git a/gfx/crosshair33.tga b/gfx/crosshair33.tga new file mode 100644 index 000000000..b3cc23597 Binary files /dev/null and b/gfx/crosshair33.tga differ diff --git a/gfx/crosshair34.tga b/gfx/crosshair34.tga new file mode 100644 index 000000000..9a2257b62 Binary files /dev/null and b/gfx/crosshair34.tga differ diff --git a/gfx/crosshair35.tga b/gfx/crosshair35.tga new file mode 100644 index 000000000..aaa8c851c Binary files /dev/null and b/gfx/crosshair35.tga differ diff --git a/gfx/crosshair36.tga b/gfx/crosshair36.tga new file mode 100644 index 000000000..87f01f262 Binary files /dev/null and b/gfx/crosshair36.tga differ diff --git a/gfx/crosshair37.tga b/gfx/crosshair37.tga new file mode 100644 index 000000000..50ae94bc9 Binary files /dev/null and b/gfx/crosshair37.tga differ diff --git a/gfx/crosshair38.tga b/gfx/crosshair38.tga new file mode 100644 index 000000000..08e3436c2 Binary files /dev/null and b/gfx/crosshair38.tga differ diff --git a/gfx/crosshair39.tga b/gfx/crosshair39.tga new file mode 100644 index 000000000..6a90b620c Binary files /dev/null and b/gfx/crosshair39.tga differ diff --git a/gfx/crosshair40.tga b/gfx/crosshair40.tga new file mode 100644 index 000000000..d15801cf9 Binary files /dev/null and b/gfx/crosshair40.tga differ diff --git a/gfx/crosshair41.tga b/gfx/crosshair41.tga new file mode 100644 index 000000000..5e11a3c4f Binary files /dev/null and b/gfx/crosshair41.tga differ diff --git a/gfx/crosshair42.tga b/gfx/crosshair42.tga new file mode 100644 index 000000000..a78503adc Binary files /dev/null and b/gfx/crosshair42.tga differ diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c index 3e164c11f..c226fbcc4 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c @@ -55,6 +55,11 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) setDependentAND(e, "crosshair_per_weapon", 0, 0, "crosshair_enabled", 1, 2); } me.TR(me); + me.TDempty(me, 0.1); + for(i = 29; i <= 42; ++i) { + me.TDNoMargin(me, 1, 2 / 14, e = makeXonoticCrosshairButton(4, i), '1 1 0'); + setDependentAND(e, "crosshair_per_weapon", 0, 0, "crosshair_enabled", 1, 2); + } me.TR(me); me.TDempty(me, 0.1); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Crosshair size:")));