Merge branch 'sev/more_crosshairs' into 'master'

A few additional crosshairs

This is more a merge suggestion than a request (sorry for the recent avalanche).

Some time ago I created a few crosshairs that I feel are missing in the default set:
simple traditional design, unobtrusive, high-contrast.

Now I've noticed that the new menu has an empty row in the crosshair settings.

Add one and one together and you get this branch.

![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/14dc267bef/crosshairs.png)

See merge request !94

diff --git a/gfx/crosshair29.tga b/gfx/crosshair29.tga
new file mode 100644 (file)
index 0000000..c103751
Binary files /dev/null and b/gfx/crosshair29.tga differ

diff --git a/gfx/crosshair30.tga b/gfx/crosshair30.tga
new file mode 100644 (file)
index 0000000..093bff2
Binary files /dev/null and b/gfx/crosshair30.tga differ

diff --git a/gfx/crosshair31.tga b/gfx/crosshair31.tga
new file mode 100644 (file)
index 0000000..c7d59e3
Binary files /dev/null and b/gfx/crosshair31.tga differ

diff --git a/gfx/crosshair32.tga b/gfx/crosshair32.tga
new file mode 100644 (file)
index 0000000..0dae288
Binary files /dev/null and b/gfx/crosshair32.tga differ

diff --git a/gfx/crosshair33.tga b/gfx/crosshair33.tga
new file mode 100644 (file)
index 0000000..b3cc235
Binary files /dev/null and b/gfx/crosshair33.tga differ

diff --git a/gfx/crosshair34.tga b/gfx/crosshair34.tga
new file mode 100644 (file)
index 0000000..9a2257b
Binary files /dev/null and b/gfx/crosshair34.tga differ

diff --git a/gfx/crosshair35.tga b/gfx/crosshair35.tga
new file mode 100644 (file)
index 0000000..aaa8c85
Binary files /dev/null and b/gfx/crosshair35.tga differ

diff --git a/gfx/crosshair36.tga b/gfx/crosshair36.tga
new file mode 100644 (file)
index 0000000..87f01f2
Binary files /dev/null and b/gfx/crosshair36.tga differ

diff --git a/gfx/crosshair37.tga b/gfx/crosshair37.tga
new file mode 100644 (file)
index 0000000..50ae94b
Binary files /dev/null and b/gfx/crosshair37.tga differ

diff --git a/gfx/crosshair38.tga b/gfx/crosshair38.tga
new file mode 100644 (file)
index 0000000..08e3436
Binary files /dev/null and b/gfx/crosshair38.tga differ

diff --git a/gfx/crosshair39.tga b/gfx/crosshair39.tga
new file mode 100644 (file)
index 0000000..6a90b62
Binary files /dev/null and b/gfx/crosshair39.tga differ

diff --git a/gfx/crosshair40.tga b/gfx/crosshair40.tga
new file mode 100644 (file)
index 0000000..d15801c
Binary files /dev/null and b/gfx/crosshair40.tga differ

diff --git a/gfx/crosshair41.tga b/gfx/crosshair41.tga
new file mode 100644 (file)
index 0000000..5e11a3c
Binary files /dev/null and b/gfx/crosshair41.tga differ

diff --git a/gfx/crosshair42.tga b/gfx/crosshair42.tga
new file mode 100644 (file)
index 0000000..a78503a
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 3e164c11fe8f2e5aca1e62d931039cab7cac7816..c226fbcc41d25e5944cf35970a5b6709471d3ca3 100644 (file)
--- 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:")));