From: Severin Meyer Date: Tue, 3 Feb 2015 10:08:41 +0000 (+0100) Subject: Add new crosshairs to the menu. The old crosshairs remain accessible through the... X-Git-Tag: xonotic-v0.8.1~127^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ef775b555751b01609216a28c636df530befea4;p=xonotic%2Fxonotic-data.pk3dir.git Add new crosshairs to the menu. The old crosshairs remain accessible through the crosshair cvar. --- diff --git a/gfx/crosshair29.tga b/gfx/crosshair29.tga deleted file mode 100644 index c1037517f..000000000 Binary files a/gfx/crosshair29.tga and /dev/null differ diff --git a/gfx/crosshair30.tga b/gfx/crosshair30.tga deleted file mode 100644 index 093bff294..000000000 Binary files a/gfx/crosshair30.tga and /dev/null differ diff --git a/gfx/crosshair31.tga b/gfx/crosshair31.tga index c7d59e387..d9779a139 100644 Binary files a/gfx/crosshair31.tga and b/gfx/crosshair31.tga differ diff --git a/gfx/crosshair32.tga b/gfx/crosshair32.tga index 0dae288c7..c50055477 100644 Binary files a/gfx/crosshair32.tga and b/gfx/crosshair32.tga differ diff --git a/gfx/crosshair33.tga b/gfx/crosshair33.tga index b3cc23597..39843b416 100644 Binary files a/gfx/crosshair33.tga and b/gfx/crosshair33.tga differ diff --git a/gfx/crosshair34.tga b/gfx/crosshair34.tga index 9a2257b62..b8d74789d 100644 Binary files a/gfx/crosshair34.tga and b/gfx/crosshair34.tga differ diff --git a/gfx/crosshair35.tga b/gfx/crosshair35.tga index aaa8c851c..c88e56092 100644 Binary files a/gfx/crosshair35.tga and b/gfx/crosshair35.tga differ diff --git a/gfx/crosshair36.tga b/gfx/crosshair36.tga index 87f01f262..dae534fa1 100644 Binary files a/gfx/crosshair36.tga and b/gfx/crosshair36.tga differ diff --git a/gfx/crosshair37.tga b/gfx/crosshair37.tga index 50ae94bc9..06eb4fc70 100644 Binary files a/gfx/crosshair37.tga and b/gfx/crosshair37.tga differ diff --git a/gfx/crosshair38.tga b/gfx/crosshair38.tga index 08e3436c2..68d2b54fd 100644 Binary files a/gfx/crosshair38.tga and b/gfx/crosshair38.tga differ diff --git a/gfx/crosshair39.tga b/gfx/crosshair39.tga index 6a90b620c..ff1f4fb8b 100644 Binary files a/gfx/crosshair39.tga and b/gfx/crosshair39.tga differ diff --git a/gfx/crosshair40.tga b/gfx/crosshair40.tga index d15801cf9..96e11b043 100644 Binary files a/gfx/crosshair40.tga and b/gfx/crosshair40.tga differ diff --git a/gfx/crosshair41.tga b/gfx/crosshair41.tga index 5e11a3c4f..0b610b270 100644 Binary files a/gfx/crosshair41.tga and b/gfx/crosshair41.tga differ diff --git a/gfx/crosshair42.tga b/gfx/crosshair42.tga index a78503adc..9401c6a80 100644 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 index 000000000..183d25775 Binary files /dev/null and b/gfx/crosshair43.tga differ diff --git a/gfx/crosshair44.tga b/gfx/crosshair44.tga new file mode 100644 index 000000000..83716cf4c Binary files /dev/null and b/gfx/crosshair44.tga differ diff --git a/gfx/crosshair45.tga b/gfx/crosshair45.tga new file mode 100644 index 000000000..41425582d Binary files /dev/null and b/gfx/crosshair45.tga differ diff --git a/gfx/crosshair46.tga b/gfx/crosshair46.tga new file mode 100644 index 000000000..34f9ffdad Binary files /dev/null and b/gfx/crosshair46.tga differ diff --git a/gfx/crosshair47.tga b/gfx/crosshair47.tga new file mode 100644 index 000000000..222188749 Binary files /dev/null and b/gfx/crosshair47.tga differ diff --git a/gfx/crosshair48.tga b/gfx/crosshair48.tga new file mode 100644 index 000000000..31d58dbbe Binary files /dev/null and b/gfx/crosshair48.tga differ diff --git a/gfx/crosshair49.tga b/gfx/crosshair49.tga new file mode 100644 index 000000000..ee6b1457f Binary files /dev/null and b/gfx/crosshair49.tga differ diff --git a/gfx/crosshair50.tga b/gfx/crosshair50.tga new file mode 100644 index 000000000..0785a4d7b Binary files /dev/null and b/gfx/crosshair50.tga differ diff --git a/gfx/crosshair51.tga b/gfx/crosshair51.tga new file mode 100644 index 000000000..7da16bc38 Binary files /dev/null and b/gfx/crosshair51.tga differ diff --git a/gfx/crosshair52.tga b/gfx/crosshair52.tga new file mode 100644 index 000000000..944947818 Binary files /dev/null and b/gfx/crosshair52.tga differ diff --git a/gfx/crosshair53.tga b/gfx/crosshair53.tga new file mode 100644 index 000000000..eb74110fc Binary files /dev/null and b/gfx/crosshair53.tga differ diff --git a/gfx/crosshair54.tga b/gfx/crosshair54.tga new file mode 100644 index 000000000..46d046408 Binary files /dev/null and b/gfx/crosshair54.tga differ diff --git a/gfx/crosshair55.tga b/gfx/crosshair55.tga new file mode 100644 index 000000000..adf195049 Binary files /dev/null and b/gfx/crosshair55.tga differ diff --git a/gfx/crosshair56.tga b/gfx/crosshair56.tga new file mode 100644 index 000000000..61adf9a6e Binary files /dev/null and b/gfx/crosshair56.tga differ diff --git a/gfx/crosshair57.tga b/gfx/crosshair57.tga new file mode 100644 index 000000000..d0d922084 Binary files /dev/null and b/gfx/crosshair57.tga differ diff --git a/gfx/crosshair58.tga b/gfx/crosshair58.tga new file mode 100644 index 000000000..0bdb7f996 Binary files /dev/null and b/gfx/crosshair58.tga differ diff --git a/gfx/crosshair59.tga b/gfx/crosshair59.tga new file mode 100644 index 000000000..8e48aa2b1 Binary files /dev/null and b/gfx/crosshair59.tga differ diff --git a/gfx/crosshair60.tga b/gfx/crosshair60.tga new file mode 100644 index 000000000..c03e19d2a Binary files /dev/null and b/gfx/crosshair60.tga differ diff --git a/gfx/crosshair61.tga b/gfx/crosshair61.tga new file mode 100644 index 000000000..507853f77 Binary files /dev/null and b/gfx/crosshair61.tga differ diff --git a/gfx/crosshair62.tga b/gfx/crosshair62.tga new file mode 100644 index 000000000..54031b1dc Binary files /dev/null and b/gfx/crosshair62.tga differ diff --git a/gfx/crosshair63.tga b/gfx/crosshair63.tga new file mode 100644 index 000000000..1aa5d55d2 Binary files /dev/null and b/gfx/crosshair63.tga differ diff --git a/gfx/crosshair64.tga b/gfx/crosshair64.tga new file mode 100644 index 000000000..06893f807 Binary files /dev/null and b/gfx/crosshair64.tga differ diff --git a/gfx/crosshair65.tga b/gfx/crosshair65.tga new file mode 100644 index 000000000..ebf77c35b Binary files /dev/null and b/gfx/crosshair65.tga differ diff --git a/gfx/crosshair66.tga b/gfx/crosshair66.tga new file mode 100644 index 000000000..ccba58dba Binary files /dev/null and b/gfx/crosshair66.tga differ diff --git a/gfx/crosshaircalibrate.tga b/gfx/crosshaircalibrate.tga new file mode 100644 index 000000000..3abd29eeb Binary files /dev/null and b/gfx/crosshaircalibrate.tga differ diff --git a/gfx/crosshairdot.tga b/gfx/crosshairdot.tga index 143a372f8..eef0af18d 100644 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 index 000000000..0d2129f58 Binary files /dev/null and b/gfx/crosshairmoustache.tga differ diff --git a/gfx/crosshairtuba.tga b/gfx/crosshairtuba.tga index 6386052d5..fcd0337ce 100644 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 0aa38e85a..28cf3708f 100644 --- 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);