Add new crosshairs to the menu. The old crosshairs remain accessible through the...

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

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

diff --git a/gfx/crosshair31.tga b/gfx/crosshair31.tga
index c7d59e3871baef29f05006690226656a25bd6365..d9779a13924b864652a915db624859bb178c1871 100644 (file)
Binary files a/gfx/crosshair31.tga and b/gfx/crosshair31.tga differ

diff --git a/gfx/crosshair32.tga b/gfx/crosshair32.tga
index 0dae288c7a32192a2318b370e6738014fc5897dc..c50055477b1c217031b553f18d554605dfad374d 100644 (file)
Binary files a/gfx/crosshair32.tga and b/gfx/crosshair32.tga differ

diff --git a/gfx/crosshair33.tga b/gfx/crosshair33.tga
index b3cc2359750da66867591c16715aa46eebc25d98..39843b41694de4cbaaa63e5e12fb2e8f6a83ca45 100644 (file)
Binary files a/gfx/crosshair33.tga and b/gfx/crosshair33.tga differ

diff --git a/gfx/crosshair34.tga b/gfx/crosshair34.tga
index 9a2257b6297e30f2e08cafaabd8e01ba64e6d9c5..b8d74789db81ca91f2505506bec6b1f0e5cce6d7 100644 (file)
Binary files a/gfx/crosshair34.tga and b/gfx/crosshair34.tga differ

diff --git a/gfx/crosshair35.tga b/gfx/crosshair35.tga
index aaa8c851c0548befcc4d4b09ccc8b7f53b29dccf..c88e5609228c46bd43356e44a73ec4a35ff56286 100644 (file)
Binary files a/gfx/crosshair35.tga and b/gfx/crosshair35.tga differ

diff --git a/gfx/crosshair36.tga b/gfx/crosshair36.tga
index 87f01f262a2cad8d9c11f8b103adc0cc6fef58ae..dae534fa158740462f144c981c7e888be782166f 100644 (file)
Binary files a/gfx/crosshair36.tga and b/gfx/crosshair36.tga differ

diff --git a/gfx/crosshair37.tga b/gfx/crosshair37.tga
index 50ae94bc97bb24979c3f98be1b18e1906256a7d2..06eb4fc700689e6ace8397047d684acef4c52fa5 100644 (file)
Binary files a/gfx/crosshair37.tga and b/gfx/crosshair37.tga differ

diff --git a/gfx/crosshair38.tga b/gfx/crosshair38.tga
index 08e3436c2661ee773da7d0f18fa86b2f0437a431..68d2b54fd0e7cabd6f10fab73faa8b896484eeb8 100644 (file)
Binary files a/gfx/crosshair38.tga and b/gfx/crosshair38.tga differ

diff --git a/gfx/crosshair39.tga b/gfx/crosshair39.tga
index 6a90b620c7c708d8f2563a9f4ba29da8fe547a65..ff1f4fb8b4037660430d71035f91d19e229a1151 100644 (file)
Binary files a/gfx/crosshair39.tga and b/gfx/crosshair39.tga differ

diff --git a/gfx/crosshair40.tga b/gfx/crosshair40.tga
index d15801cf989ef2120d29e4f5b25b009e2cfdffcf..96e11b04363e5908578ae7b3ccb6c2080e86e609 100644 (file)
Binary files a/gfx/crosshair40.tga and b/gfx/crosshair40.tga differ

diff --git a/gfx/crosshair41.tga b/gfx/crosshair41.tga
index 5e11a3c4f585870828bb3b466d32259c50441989..0b610b270d8517e1225af2f14b8c4c6afea5faa3 100644 (file)
Binary files a/gfx/crosshair41.tga and b/gfx/crosshair41.tga differ

diff --git a/gfx/crosshair42.tga b/gfx/crosshair42.tga
index a78503adcdbdd538b9473ff9088e856df3a722af..9401c6a80d76305b284ffabc398814ad4bb4c096 100644 (file)
Binary files a/gfx/crosshair42.tga and b/gfx/crosshair42.tga differ

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/gfx/crosshairdot.tga b/gfx/crosshairdot.tga
index 143a372f8c4ea9dec113759d80f93147d577f518..eef0af18d7f3e2b791faf141b129c5e01a83bff2 100644 (file)
Binary files a/gfx/crosshairdot.tga and b/gfx/crosshairdot.tga differ

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

diff --git a/gfx/crosshairtuba.tga b/gfx/crosshairtuba.tga
index 6386052d5ebd1a2dd98f5e112528564eecd20a6c..fcd0337ce9e913cd773bf92fb4efb2b6dd7b4b91 100644 (file)
Binary files a/gfx/crosshairtuba.tga and b/gfx/crosshairtuba.tga differ

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
index 0aa38e85af2d472be53c18f53c6d32003c946c86..28cf3708f3af0833b98028ef9b42e433a934292c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
@@ -40,8 +40,8 @@ void XonoticGameCrosshairSettingsTab_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticRadioButton(3, "crosshair_enabled", "2", _("Custom")));
        me.TR(me);
                me.TDempty(me, 0.1);
-               for(i = 1; i <= 14; ++i) {
-                       me.TDNoMargin(me, 1, 2 / 14, e = makeXonoticCrosshairButton(4, i), '1 1 0');
+               for(i = 31; i <= 42; ++i) {
+                       me.TDNoMargin(me, 1, 2 / 12, e = makeXonoticCrosshairButton(4, i), '1 1 0');
                                setDependentAND(e, "crosshair_per_weapon", 0, 0, "crosshair_enabled", 1, 2);
                }
                // show a larger preview of the selected crosshair
@@ -50,14 +50,14 @@ 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 = 15; i <= 28; ++i) {
-                       me.TDNoMargin(me, 1, 2 / 14, e = makeXonoticCrosshairButton(4, i), '1 1 0');
+               for(i = 43; i <= 54; ++i) {
+                       me.TDNoMargin(me, 1, 2 / 12, 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);
-               for(i = 29; i <= 42; ++i) {
-                       me.TDNoMargin(me, 1, 2 / 14, e = makeXonoticCrosshairButton(4, i), '1 1 0');
+               for(i = 55; i <= 66; ++i) {
+                       me.TDNoMargin(me, 1, 2 / 12, e = makeXonoticCrosshairButton(4, i), '1 1 0');
                                setDependentAND(e, "crosshair_per_weapon", 0, 0, "crosshair_enabled", 1, 2);
                }
        me.TR(me);