]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'sev/luma_supplement' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 30 Jan 2015 10:26:16 +0000 (10:26 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 30 Jan 2015 10:26:16 +0000 (10:26 +0000)
Luma Supplement

This branch adds Luma (!76) variants of the chatbubble and the teambubble.
The current images will be replaced, hence the separate branch.

See merge request !87

534 files changed:
_hud_descriptions.cfg
crosshairs.cfg
defaultXonotic.cfg
gfx/crosshair29.tga [new file with mode: 0644]
gfx/crosshair30.tga [new file with mode: 0644]
gfx/crosshair31.tga [new file with mode: 0644]
gfx/crosshair32.tga [new file with mode: 0644]
gfx/crosshair33.tga [new file with mode: 0644]
gfx/crosshair34.tga [new file with mode: 0644]
gfx/crosshair35.tga [new file with mode: 0644]
gfx/crosshair36.tga [new file with mode: 0644]
gfx/crosshair37.tga [new file with mode: 0644]
gfx/crosshair38.tga [new file with mode: 0644]
gfx/crosshair39.tga [new file with mode: 0644]
gfx/crosshair40.tga [new file with mode: 0644]
gfx/crosshair41.tga [new file with mode: 0644]
gfx/crosshair42.tga [new file with mode: 0644]
gfx/hud/default/kh_blue.tga [deleted file]
gfx/hud/default/kh_blue_carrying.tga [new file with mode: 0644]
gfx/hud/default/kh_blue_taken.tga [new file with mode: 0644]
gfx/hud/default/kh_bluearrow.tga [deleted file]
gfx/hud/default/kh_dropped.tga [new file with mode: 0644]
gfx/hud/default/kh_pink.tga [deleted file]
gfx/hud/default/kh_pink_carrying.tga [new file with mode: 0644]
gfx/hud/default/kh_pink_taken.tga [new file with mode: 0644]
gfx/hud/default/kh_pinkarrow.tga [deleted file]
gfx/hud/default/kh_red.tga [deleted file]
gfx/hud/default/kh_red_carrying.tga [new file with mode: 0644]
gfx/hud/default/kh_red_taken.tga [new file with mode: 0644]
gfx/hud/default/kh_redarrow.tga [deleted file]
gfx/hud/default/kh_yellow.tga [deleted file]
gfx/hud/default/kh_yellow_carrying.tga [new file with mode: 0644]
gfx/hud/default/kh_yellow_taken.tga [new file with mode: 0644]
gfx/hud/default/kh_yellowarrow.tga [deleted file]
gfx/hud/luma/accelbar.tga [new file with mode: 0644]
gfx/hud/luma/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/luma/ammo_cells.tga [new file with mode: 0644]
gfx/hud/luma/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/luma/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/luma/ammo_plasma.tga [new file with mode: 0644]
gfx/hud/luma/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/luma/ammo_shells.tga [new file with mode: 0644]
gfx/hud/luma/ammo_supercells.tga [new file with mode: 0644]
gfx/hud/luma/armor.tga [new file with mode: 0644]
gfx/hud/luma/border_corner_northeast.tga [new file with mode: 0644]
gfx/hud/luma/border_corner_northwest.tga [new file with mode: 0644]
gfx/hud/luma/border_corner_southeast.tga [new file with mode: 0644]
gfx/hud/luma/border_corner_southwest.tga [new file with mode: 0644]
gfx/hud/luma/border_default.tga [new file with mode: 0644]
gfx/hud/luma/border_default_east.tga [new file with mode: 0644]
gfx/hud/luma/border_default_north.tga [new file with mode: 0644]
gfx/hud/luma/border_default_south.tga [new file with mode: 0644]
gfx/hud/luma/border_default_west.tga [new file with mode: 0644]
gfx/hud/luma/border_fading_east.tga [new file with mode: 0644]
gfx/hud/luma/border_fading_north.tga [new file with mode: 0644]
gfx/hud/luma/border_fading_south.tga [new file with mode: 0644]
gfx/hud/luma/border_fading_west.tga [new file with mode: 0644]
gfx/hud/luma/border_highlighted.tga [new file with mode: 0644]
gfx/hud/luma/border_highlighted2.tga [new file with mode: 0644]
gfx/hud/luma/border_plain.tga [new file with mode: 0644]
gfx/hud/luma/border_plain_east.tga [new file with mode: 0644]
gfx/hud/luma/border_plain_north.tga [new file with mode: 0644]
gfx/hud/luma/border_plain_south.tga [new file with mode: 0644]
gfx/hud/luma/border_plain_west.tga [new file with mode: 0644]
gfx/hud/luma/border_tab_east.tga [new file with mode: 0644]
gfx/hud/luma/border_tab_north.tga [new file with mode: 0644]
gfx/hud/luma/border_tab_south.tga [new file with mode: 0644]
gfx/hud/luma/border_tab_west.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_blue-highlighted.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_blue.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_pink-highlighted.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_pink.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_red-highlighted.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_red.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_yellow-highlighted.tga [new file with mode: 0644]
gfx/hud/luma/dom_icon_yellow.tga [new file with mode: 0644]
gfx/hud/luma/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luma/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/luma/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/luma/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/luma/flag_neutral_carrying.tga [new file with mode: 0644]
gfx/hud/luma/flag_neutral_lost.tga [new file with mode: 0644]
gfx/hud/luma/flag_neutral_shielded.tga [new file with mode: 0644]
gfx/hud/luma/flag_neutral_taken.tga [new file with mode: 0644]
gfx/hud/luma/flag_pink_carrying.tga [new file with mode: 0644]
gfx/hud/luma/flag_pink_lost.tga [new file with mode: 0644]
gfx/hud/luma/flag_pink_shielded.tga [new file with mode: 0644]
gfx/hud/luma/flag_pink_taken.tga [new file with mode: 0644]
gfx/hud/luma/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/luma/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/luma/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/luma/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/luma/flag_yellow_carrying.tga [new file with mode: 0644]
gfx/hud/luma/flag_yellow_lost.tga [new file with mode: 0644]
gfx/hud/luma/flag_yellow_shielded.tga [new file with mode: 0644]
gfx/hud/luma/flag_yellow_taken.tga [new file with mode: 0644]
gfx/hud/luma/health.tga [new file with mode: 0644]
gfx/hud/luma/keepawayball_carrying.tga [new file with mode: 0644]
gfx/hud/luma/key_atck.tga [new file with mode: 0644]
gfx/hud/luma/key_atck2.tga [new file with mode: 0644]
gfx/hud/luma/key_atck2_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_atck_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_backward.tga [new file with mode: 0644]
gfx/hud/luma/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_crouch.tga [new file with mode: 0644]
gfx/hud/luma/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_forward.tga [new file with mode: 0644]
gfx/hud/luma/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_jump.tga [new file with mode: 0644]
gfx/hud/luma/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_left.tga [new file with mode: 0644]
gfx/hud/luma/key_left_inv.tga [new file with mode: 0644]
gfx/hud/luma/key_right.tga [new file with mode: 0644]
gfx/hud/luma/key_right_inv.tga [new file with mode: 0644]
gfx/hud/luma/kh_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luma/kh_blue_taken.tga [new file with mode: 0644]
gfx/hud/luma/kh_dropped.tga [new file with mode: 0644]
gfx/hud/luma/kh_pink_carrying.tga [new file with mode: 0644]
gfx/hud/luma/kh_pink_taken.tga [new file with mode: 0644]
gfx/hud/luma/kh_red_carrying.tga [new file with mode: 0644]
gfx/hud/luma/kh_red_taken.tga [new file with mode: 0644]
gfx/hud/luma/kh_yellow_carrying.tga [new file with mode: 0644]
gfx/hud/luma/kh_yellow_taken.tga [new file with mode: 0644]
gfx/hud/luma/nade_bg.tga [new file with mode: 0644]
gfx/hud/luma/nade_nbg.tga [new file with mode: 0644]
gfx/hud/luma/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/luma/notify_balldropped.tga [new file with mode: 0644]
gfx/hud/luma/notify_ballpickedup.tga [new file with mode: 0644]
gfx/hud/luma/notify_blue_captured.tga [new file with mode: 0644]
gfx/hud/luma/notify_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luma/notify_blue_lost.tga [new file with mode: 0644]
gfx/hud/luma/notify_blue_returned.tga [new file with mode: 0644]
gfx/hud/luma/notify_blue_shielded.tga [new file with mode: 0644]
gfx/hud/luma/notify_blue_taken.tga [new file with mode: 0644]
gfx/hud/luma/notify_camping.tga [new file with mode: 0644]
gfx/hud/luma/notify_death.tga [new file with mode: 0644]
gfx/hud/luma/notify_fall.tga [new file with mode: 0644]
gfx/hud/luma/notify_lava.tga [new file with mode: 0644]
gfx/hud/luma/notify_melee_shotgun.tga [new file with mode: 0644]
gfx/hud/luma/notify_nade.tga [new file with mode: 0644]
gfx/hud/luma/notify_nade_heal.tga [new file with mode: 0644]
gfx/hud/luma/notify_nade_ice.tga [new file with mode: 0644]
gfx/hud/luma/notify_nade_napalm.tga [new file with mode: 0644]
gfx/hud/luma/notify_neutral_carrying.tga [new file with mode: 0644]
gfx/hud/luma/notify_neutral_lost.tga [new file with mode: 0644]
gfx/hud/luma/notify_neutral_shielded.tga [new file with mode: 0644]
gfx/hud/luma/notify_neutral_taken.tga [new file with mode: 0644]
gfx/hud/luma/notify_outofammo.tga [new file with mode: 0644]
gfx/hud/luma/notify_pink_captured.tga [new file with mode: 0644]
gfx/hud/luma/notify_pink_carrying.tga [new file with mode: 0644]
gfx/hud/luma/notify_pink_lost.tga [new file with mode: 0644]
gfx/hud/luma/notify_pink_returned.tga [new file with mode: 0644]
gfx/hud/luma/notify_pink_shielded.tga [new file with mode: 0644]
gfx/hud/luma/notify_pink_taken.tga [new file with mode: 0644]
gfx/hud/luma/notify_red_captured.tga [new file with mode: 0644]
gfx/hud/luma/notify_red_carrying.tga [new file with mode: 0644]
gfx/hud/luma/notify_red_lost.tga [new file with mode: 0644]
gfx/hud/luma/notify_red_returned.tga [new file with mode: 0644]
gfx/hud/luma/notify_red_shielded.tga [new file with mode: 0644]
gfx/hud/luma/notify_red_taken.tga [new file with mode: 0644]
gfx/hud/luma/notify_selfkill.tga [new file with mode: 0644]
gfx/hud/luma/notify_shootingstar.tga [new file with mode: 0644]
gfx/hud/luma/notify_slime.tga [new file with mode: 0644]
gfx/hud/luma/notify_teamkill_blue.tga [new file with mode: 0644]
gfx/hud/luma/notify_teamkill_neutral.tga [new file with mode: 0644]
gfx/hud/luma/notify_teamkill_pink.tga [new file with mode: 0644]
gfx/hud/luma/notify_teamkill_red.tga [new file with mode: 0644]
gfx/hud/luma/notify_teamkill_yellow.tga [new file with mode: 0644]
gfx/hud/luma/notify_telefrag.tga [new file with mode: 0644]
gfx/hud/luma/notify_void.tga [new file with mode: 0644]
gfx/hud/luma/notify_water.tga [new file with mode: 0644]
gfx/hud/luma/notify_yellow_captured.tga [new file with mode: 0644]
gfx/hud/luma/notify_yellow_carrying.tga [new file with mode: 0644]
gfx/hud/luma/notify_yellow_lost.tga [new file with mode: 0644]
gfx/hud/luma/notify_yellow_returned.tga [new file with mode: 0644]
gfx/hud/luma/notify_yellow_shielded.tga [new file with mode: 0644]
gfx/hud/luma/notify_yellow_taken.tga [new file with mode: 0644]
gfx/hud/luma/num_leading.tga [new file with mode: 0644]
gfx/hud/luma/ok_weapon_rail.tga [new file with mode: 0644]
gfx/hud/luma/ok_weapon_shotgun.tga [new file with mode: 0644]
gfx/hud/luma/ok_weapon_smg.tga [new file with mode: 0644]
gfx/hud/luma/player_blue.tga [new file with mode: 0644]
gfx/hud/luma/player_neutral.tga [new file with mode: 0644]
gfx/hud/luma/player_pink.tga [new file with mode: 0644]
gfx/hud/luma/player_red.tga [new file with mode: 0644]
gfx/hud/luma/player_yellow.tga [new file with mode: 0644]
gfx/hud/luma/powerup_detonator.tga [new file with mode: 0644]
gfx/hud/luma/powerup_invisibility.tga [new file with mode: 0644]
gfx/hud/luma/powerup_resurrection.tga [new file with mode: 0644]
gfx/hud/luma/powerup_speed.tga [new file with mode: 0644]
gfx/hud/luma/powerup_ultrahealing.tga [new file with mode: 0644]
gfx/hud/luma/powerup_xray.tga [new file with mode: 0644]
gfx/hud/luma/progressbar.tga [new file with mode: 0644]
gfx/hud/luma/progressbar_vertical.tga [new file with mode: 0644]
gfx/hud/luma/race_newfail.tga [new file with mode: 0644]
gfx/hud/luma/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/luma/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/luma/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/luma/race_newtime.tga [new file with mode: 0644]
gfx/hud/luma/shield.tga [new file with mode: 0644]
gfx/hud/luma/strength.tga [new file with mode: 0644]
gfx/hud/luma/superweapons.tga [new file with mode: 0644]
gfx/hud/luma/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/luma/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/luma/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/luma/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/luma/weapon_accuracy_north.tga [new file with mode: 0644]
gfx/hud/luma/weapon_accuracy_south.tga [new file with mode: 0644]
gfx/hud/luma/weapon_accuracy_west.tga [new file with mode: 0644]
gfx/hud/luma/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/luma/weapon_complainbubble.tga [new file with mode: 0644]
gfx/hud/luma/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/luma/weapon_current_bg_north.tga [new file with mode: 0644]
gfx/hud/luma/weapon_current_bg_south.tga [new file with mode: 0644]
gfx/hud/luma/weapon_current_bg_west.tga [new file with mode: 0644]
gfx/hud/luma/weaponarc.tga [new file with mode: 0644]
gfx/hud/luma/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/luma/weaponelectro.tga [new file with mode: 0644]
gfx/hud/luma/weaponfireball.tga [new file with mode: 0644]
gfx/hud/luma/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/luma/weaponhagar.tga [new file with mode: 0644]
gfx/hud/luma/weaponhlac.tga [new file with mode: 0644]
gfx/hud/luma/weaponhmg.tga [new file with mode: 0644]
gfx/hud/luma/weaponhook.tga [new file with mode: 0644]
gfx/hud/luma/weaponlaser.tga [new file with mode: 0644]
gfx/hud/luma/weaponminelayer.tga [new file with mode: 0644]
gfx/hud/luma/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/luma/weaponnex.tga [new file with mode: 0644]
gfx/hud/luma/weaponporto.tga [new file with mode: 0644]
gfx/hud/luma/weaponrifle.tga [new file with mode: 0644]
gfx/hud/luma/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/luma/weaponrpc.tga [new file with mode: 0644]
gfx/hud/luma/weaponseeker.tga [new file with mode: 0644]
gfx/hud/luma/weaponshockwave.tga [new file with mode: 0644]
gfx/hud/luma/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/luma/weapontuba.tga [new file with mode: 0644]
gfx/hud/luma/weaponuzi.tga [new file with mode: 0644]
gfx/hud/old/kh_blue.tga [deleted file]
gfx/hud/old/kh_bluearrow.tga [deleted file]
gfx/hud/old/kh_pink.tga [deleted file]
gfx/hud/old/kh_pinkarrow.tga [deleted file]
gfx/hud/old/kh_red.tga [deleted file]
gfx/hud/old/kh_redarrow.tga [deleted file]
gfx/hud/old/kh_yellow.tga [deleted file]
gfx/hud/old/kh_yellowarrow.tga [deleted file]
gfx/menu/luma/background.tga [new file with mode: 0644]
gfx/menu/luma/background_ingame.tga [new file with mode: 0644]
gfx/menu/luma/background_ingame_l2.tga [new file with mode: 0644]
gfx/menu/luma/background_l2.tga [new file with mode: 0644]
gfx/menu/luma/bigbutton_c.tga [new file with mode: 0644]
gfx/menu/luma/bigbutton_d.tga [new file with mode: 0644]
gfx/menu/luma/bigbutton_f.tga [new file with mode: 0644]
gfx/menu/luma/bigbutton_n.tga [new file with mode: 0644]
gfx/menu/luma/bigbuttongray_c.tga [new file with mode: 0644]
gfx/menu/luma/bigbuttongray_d.tga [new file with mode: 0644]
gfx/menu/luma/bigbuttongray_f.tga [new file with mode: 0644]
gfx/menu/luma/bigbuttongray_n.tga [new file with mode: 0644]
gfx/menu/luma/border.tga [new file with mode: 0644]
gfx/menu/luma/button_c.tga [new file with mode: 0644]
gfx/menu/luma/button_d.tga [new file with mode: 0644]
gfx/menu/luma/button_f.tga [new file with mode: 0644]
gfx/menu/luma/button_n.tga [new file with mode: 0644]
gfx/menu/luma/buttongray_c.tga [new file with mode: 0644]
gfx/menu/luma/buttongray_d.tga [new file with mode: 0644]
gfx/menu/luma/buttongray_f.tga [new file with mode: 0644]
gfx/menu/luma/buttongray_n.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_c0.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_c1.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_d0.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_d1.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_f0.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_f1.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_n0.tga [new file with mode: 0644]
gfx/menu/luma/checkbox_n1.tga [new file with mode: 0644]
gfx/menu/luma/checkmark.tga [new file with mode: 0644]
gfx/menu/luma/clearbutton_c.tga [new file with mode: 0644]
gfx/menu/luma/clearbutton_f.tga [new file with mode: 0644]
gfx/menu/luma/clearbutton_n.tga [new file with mode: 0644]
gfx/menu/luma/closebutton_c.tga [new file with mode: 0644]
gfx/menu/luma/closebutton_f.tga [new file with mode: 0644]
gfx/menu/luma/closebutton_n.tga [new file with mode: 0644]
gfx/menu/luma/colorbutton_c.tga [new file with mode: 0644]
gfx/menu/luma/colorbutton_f.tga [new file with mode: 0644]
gfx/menu/luma/colorbutton_n.tga [new file with mode: 0644]
gfx/menu/luma/colorpicker.tga [new file with mode: 0755]
gfx/menu/luma/colorpicker_m.tga [new file with mode: 0644]
gfx/menu/luma/colorpicker_selected.tga [new file with mode: 0644]
gfx/menu/luma/crosshairbutton_c.tga [new file with mode: 0644]
gfx/menu/luma/crosshairbutton_d.tga [new file with mode: 0644]
gfx/menu/luma/crosshairbutton_f.tga [new file with mode: 0644]
gfx/menu/luma/crosshairbutton_n.tga [new file with mode: 0644]
gfx/menu/luma/cursor.tga [new file with mode: 0644]
gfx/menu/luma/cursor_move.tga [new file with mode: 0644]
gfx/menu/luma/cursor_resize.tga [new file with mode: 0644]
gfx/menu/luma/cursor_resize2.tga [new file with mode: 0644]
gfx/menu/luma/gametype_as.tga [new file with mode: 0644]
gfx/menu/luma/gametype_ca.tga [new file with mode: 0644]
gfx/menu/luma/gametype_ctf.tga [new file with mode: 0644]
gfx/menu/luma/gametype_cts.tga [new file with mode: 0644]
gfx/menu/luma/gametype_dm.tga [new file with mode: 0644]
gfx/menu/luma/gametype_dom.tga [new file with mode: 0644]
gfx/menu/luma/gametype_duel.tga [new file with mode: 0644]
gfx/menu/luma/gametype_ft.tga [new file with mode: 0644]
gfx/menu/luma/gametype_inf.tga [new file with mode: 0644]
gfx/menu/luma/gametype_inv.tga [new file with mode: 0644]
gfx/menu/luma/gametype_jb.tga [new file with mode: 0644]
gfx/menu/luma/gametype_ka.tga [new file with mode: 0644]
gfx/menu/luma/gametype_kh.tga [new file with mode: 0644]
gfx/menu/luma/gametype_lms.tga [new file with mode: 0644]
gfx/menu/luma/gametype_nb.tga [new file with mode: 0644]
gfx/menu/luma/gametype_ons.tga [new file with mode: 0644]
gfx/menu/luma/gametype_rc.tga [new file with mode: 0644]
gfx/menu/luma/gametype_tdm.tga [new file with mode: 0644]
gfx/menu/luma/gametype_vip.tga [new file with mode: 0644]
gfx/menu/luma/icon_aeslevel1.tga [new file with mode: 0644]
gfx/menu/luma/icon_aeslevel2.tga [new file with mode: 0644]
gfx/menu/luma/icon_aeslevel3.tga [new file with mode: 0644]
gfx/menu/luma/icon_aeslevel4.tga [new file with mode: 0644]
gfx/menu/luma/icon_aeslevel5.tga [new file with mode: 0644]
gfx/menu/luma/icon_mod_.tga [new file with mode: 0644]
gfx/menu/luma/icon_mod_MinstaGib.tga [new file with mode: 0644]
gfx/menu/luma/icon_mod_NewToys.tga [new file with mode: 0644]
gfx/menu/luma/icon_mod_Overkill.tga [new file with mode: 0644]
gfx/menu/luma/icon_mod_XDF.tga [new file with mode: 0644]
gfx/menu/luma/icon_pure1.tga [new file with mode: 0644]
gfx/menu/luma/icon_stats1.tga [new file with mode: 0644]
gfx/menu/luma/inputbox_f.tga [new file with mode: 0644]
gfx/menu/luma/inputbox_n.tga [new file with mode: 0644]
gfx/menu/luma/nopreview_map.tga [new file with mode: 0644]
gfx/menu/luma/nopreview_menuskin.tga [new file with mode: 0644]
gfx/menu/luma/nopreview_player.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_c0.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_c1.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_d0.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_d1.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_f0.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_f1.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_n0.tga [new file with mode: 0644]
gfx/menu/luma/radiobutton_n1.tga [new file with mode: 0644]
gfx/menu/luma/scrollbar_c.tga [new file with mode: 0644]
gfx/menu/luma/scrollbar_f.tga [new file with mode: 0644]
gfx/menu/luma/scrollbar_n.tga [new file with mode: 0644]
gfx/menu/luma/scrollbar_s.tga [new file with mode: 0644]
gfx/menu/luma/skinpreview.tga [new file with mode: 0644]
gfx/menu/luma/skinvalues.txt [new file with mode: 0644]
gfx/menu/luma/slider_c.tga [new file with mode: 0644]
gfx/menu/luma/slider_d.tga [new file with mode: 0644]
gfx/menu/luma/slider_f.tga [new file with mode: 0644]
gfx/menu/luma/slider_n.tga [new file with mode: 0644]
gfx/menu/luma/slider_s.tga [new file with mode: 0644]
gfx/menu/luma/tooltip.tga [new file with mode: 0644]
gfx/menu/luminos/icon_mod_instagib.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_mod_instagib.tga [new file with mode: 0644]
gfx/menu/xaw/icon_mod_instagib.tga [new file with mode: 0644]
hud_luma.cfg [new file with mode: 0644]
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
models/items/a_bullets_luma.iqm [new file with mode: 0644]
models/items/a_bullets_luma.iqm_0.skin [new file with mode: 0644]
models/items/a_bullets_luma.tga [new file with mode: 0644]
models/items/a_cells_luma.iqm [new file with mode: 0644]
models/items/a_cells_luma.iqm_0.skin [new file with mode: 0644]
models/items/a_cells_luma.tga [new file with mode: 0644]
models/items/a_plasma_luma.iqm [new file with mode: 0644]
models/items/a_plasma_luma.iqm_0.skin [new file with mode: 0644]
models/items/a_plasma_luma.tga [new file with mode: 0644]
models/items/a_rockets_luma.iqm [new file with mode: 0644]
models/items/a_rockets_luma.iqm_0.skin [new file with mode: 0644]
models/items/a_rockets_luma.tga [new file with mode: 0644]
models/items/a_shells_luma.iqm [new file with mode: 0644]
models/items/a_shells_luma.iqm_0.skin [new file with mode: 0644]
models/items/a_shells_luma.tga [new file with mode: 0644]
models/items/g_fuel_luma.iqm [new file with mode: 0644]
models/items/g_fuel_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_fuel_luma.tga [new file with mode: 0644]
models/items/g_fuelregen_luma.iqm [new file with mode: 0644]
models/items/g_fuelregen_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_fuelregen_luma.tga [new file with mode: 0644]
models/items/g_h100_luma.iqm [new file with mode: 0644]
models/items/g_h100_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_h100_luma.tga [new file with mode: 0644]
models/items/g_h1_luma.iqm [new file with mode: 0644]
models/items/g_h1_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_h1_luma.tga [new file with mode: 0644]
models/items/g_h25_luma.iqm [new file with mode: 0644]
models/items/g_h25_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_h25_luma.tga [new file with mode: 0644]
models/items/g_h50_luma.iqm [new file with mode: 0644]
models/items/g_h50_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_h50_luma.tga [new file with mode: 0644]
models/items/g_invincible_luma.iqm [new file with mode: 0644]
models/items/g_invincible_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_invincible_luma.tga [new file with mode: 0644]
models/items/g_jetpack_luma.iqm [new file with mode: 0644]
models/items/g_jetpack_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_jetpack_luma.tga [new file with mode: 0644]
models/items/g_strength_luma.iqm [new file with mode: 0644]
models/items/g_strength_luma.iqm_0.skin [new file with mode: 0644]
models/items/g_strength_luma.tga [new file with mode: 0644]
models/items/item_armor_big_luma.iqm [new file with mode: 0644]
models/items/item_armor_big_luma.iqm_0.skin [new file with mode: 0644]
models/items/item_armor_big_luma.tga [new file with mode: 0644]
models/items/item_armor_large_luma.iqm [new file with mode: 0644]
models/items/item_armor_large_luma.iqm_0.skin [new file with mode: 0644]
models/items/item_armor_large_luma.tga [new file with mode: 0644]
models/items/item_armor_medium_luma.iqm [new file with mode: 0644]
models/items/item_armor_medium_luma.iqm_0.skin [new file with mode: 0644]
models/items/item_armor_medium_luma.tga [new file with mode: 0644]
models/items/item_armor_small_luma.iqm [new file with mode: 0644]
models/items/item_armor_small_luma.iqm_0.skin [new file with mode: 0644]
models/items/item_armor_small_luma.tga [new file with mode: 0644]
models/items/powerup_detonator_luma.tga [new file with mode: 0644]
models/items/powerup_invisibility_luma.tga [new file with mode: 0644]
models/items/powerup_resurrection_luma.tga [new file with mode: 0644]
models/items/powerup_speed_luma.tga [new file with mode: 0644]
models/items/powerup_superweapon_luma.tga [new file with mode: 0644]
models/items/powerup_ultrahealing_luma.tga [new file with mode: 0644]
models/items/powerup_xray_luma.tga [new file with mode: 0644]
models/weapons/g_arc_luma.iqm [new file with mode: 0644]
models/weapons/g_arc_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_arc_luma.tga [new file with mode: 0644]
models/weapons/g_campingrifle_luma.iqm [new file with mode: 0644]
models/weapons/g_campingrifle_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_campingrifle_luma.tga [new file with mode: 0644]
models/weapons/g_crylink_luma.iqm [new file with mode: 0644]
models/weapons/g_crylink_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_crylink_luma.tga [new file with mode: 0644]
models/weapons/g_electro_luma.iqm [new file with mode: 0644]
models/weapons/g_electro_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_electro_luma.tga [new file with mode: 0644]
models/weapons/g_fireball_luma.iqm [new file with mode: 0644]
models/weapons/g_fireball_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_fireball_luma.tga [new file with mode: 0644]
models/weapons/g_gl_luma.iqm [new file with mode: 0644]
models/weapons/g_gl_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_gl_luma.tga [new file with mode: 0644]
models/weapons/g_hagar_luma.iqm [new file with mode: 0644]
models/weapons/g_hagar_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_hagar_luma.tga [new file with mode: 0644]
models/weapons/g_hlac_luma.iqm [new file with mode: 0644]
models/weapons/g_hlac_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_hlac_luma.tga [new file with mode: 0644]
models/weapons/g_hookgun_luma.iqm [new file with mode: 0644]
models/weapons/g_hookgun_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_hookgun_luma.tga [new file with mode: 0644]
models/weapons/g_laser_luma.iqm [new file with mode: 0644]
models/weapons/g_laser_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_laser_luma.tga [new file with mode: 0644]
models/weapons/g_minelayer_luma.iqm [new file with mode: 0644]
models/weapons/g_minelayer_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_minelayer_luma.tga [new file with mode: 0644]
models/weapons/g_minstanex_luma.iqm [new file with mode: 0644]
models/weapons/g_minstanex_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_minstanex_luma.tga [new file with mode: 0644]
models/weapons/g_nex_luma.iqm [new file with mode: 0644]
models/weapons/g_nex_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_nex_luma.tga [new file with mode: 0644]
models/weapons/g_porto_luma.iqm [new file with mode: 0644]
models/weapons/g_porto_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_porto_luma.tga [new file with mode: 0644]
models/weapons/g_rl_luma.iqm [new file with mode: 0644]
models/weapons/g_rl_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_rl_luma.tga [new file with mode: 0644]
models/weapons/g_seeker_luma.iqm [new file with mode: 0644]
models/weapons/g_seeker_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_seeker_luma.tga [new file with mode: 0644]
models/weapons/g_shockwave_luma.iqm [new file with mode: 0644]
models/weapons/g_shockwave_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_shockwave_luma.tga [new file with mode: 0644]
models/weapons/g_shotgun_luma.iqm [new file with mode: 0644]
models/weapons/g_shotgun_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_shotgun_luma.tga [new file with mode: 0644]
models/weapons/g_tuba_luma.iqm [new file with mode: 0644]
models/weapons/g_tuba_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_tuba_luma.tga [new file with mode: 0644]
models/weapons/g_uzi_luma.iqm [new file with mode: 0644]
models/weapons/g_uzi_luma.iqm_0.skin [new file with mode: 0644]
models/weapons/g_uzi_luma.tga [new file with mode: 0644]
notifications.cfg
qcsrc/client/announcer.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/common/weapons/weapons.qc
qcsrc/menu/classes.c
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/item.c
qcsrc/menu/item/button.c
qcsrc/menu/item/checkbox.c
qcsrc/menu/item/dialog.c
qcsrc/menu/item/inputbox.c
qcsrc/menu/item/listbox.c
qcsrc/menu/item/nexposee.c
qcsrc/menu/item/slider.c
qcsrc/menu/menu.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/campaign.c
qcsrc/menu/xonotic/colorpicker.c
qcsrc/menu/xonotic/colorpicker_string.c
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/dialog_settings_game_crosshair.c
qcsrc/menu/xonotic/dialog_singleplayer_winner.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/keybinder.c
qcsrc/menu/xonotic/languagelist.c
qcsrc/menu/xonotic/maplist.c
qcsrc/menu/xonotic/playerlist.c
qcsrc/menu/xonotic/playlist.c
qcsrc/menu/xonotic/screenshotlist.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/skinlist.c
qcsrc/menu/xonotic/soundlist.c
qcsrc/menu/xonotic/statslist.c
qcsrc/menu/xonotic/weaponslist.c
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc
scripts/luma.shader [new file with mode: 0644]
sound/menu/README [new file with mode: 0644]
sound/menu/clear.wav [new file with mode: 0644]
sound/menu/close.wav [new file with mode: 0644]
sound/menu/execute.wav [new file with mode: 0644]
sound/menu/focus.wav [new file with mode: 0644]
sound/menu/open.wav [new file with mode: 0644]
sound/menu/select.wav [new file with mode: 0644]
sound/menu/slide.wav [new file with mode: 0644]
sound/menu/winner.ogg [new file with mode: 0644]
sound/misc/menu1.wav [deleted file]
sound/misc/menu2.wav [deleted file]
sound/misc/mouseclick.wav [deleted file]

index 7d8b0ccf9f02356814b2fb14e3431f8c96dce665..a47884ef05f586d66da20ad330a33b864eb3d017 100644 (file)
@@ -58,6 +58,7 @@ seta hud_panel_weapons_timeout_fadefgmin "" "minimum alpha of the panel foregrou
 seta hud_panel_weapons_timeout_speed_in "" "speed that fading/moving onto the screen occurs"
 seta hud_panel_weapons_timeout_speed_out "" "speed that fading/moving off of the screen occurs"
 seta hud_panel_weapons_label "" "1 = show number of weapon, 2 = show bound key of weapon, 3 = show name of weapon"
+seta hud_panel_weapons_label_scale "" "scale of the weapon text label"
 seta hud_panel_weapons_accuracy "" "show accuracy color as the weapon icon background; colors can be configured with accuracy_color* cvars"
 seta hud_panel_weapons_ammo "" "show ammo as a status bar"
 seta hud_panel_weapons_onlyowned "" "show only owned weapons"
index 52ae30cb5baaf085432fca0cfc6c5a3af41a2ed6..4d44688a28c78a5682fade92d6cfa50afeb67745 100644 (file)
@@ -51,7 +51,7 @@ seta crosshair_per_weapon 1   "when 1, each gun will display a different crosshair
 // =========================
 
 // ring around crosshair, used for various purposes (such as indicating bullets left in clip, vortex charge)
-seta crosshair_ring 1 "main cvar to enable or disable normal crosshair rings"
+seta crosshair_ring 1 "enable normal crosshair rings"
 seta crosshair_ring_inner 0 "allow inner rings to be drawn too"
 seta crosshair_ring_size 2     "ring size"
 seta crosshair_ring_alpha 0.2  "ring alpha"
@@ -67,14 +67,20 @@ seta crosshair_ring_vortex_currentcharge_scale 30
 seta crosshair_ring_vortex_currentcharge_movingavg_rate 0.05
 
 // minelayer ring
-seta crosshair_ring_minelayer 1
+seta crosshair_ring_minelayer 1 "draw a ring showing the current amount of layed mines"
 seta crosshair_ring_minelayer_alpha 0.15
 
 // hagar ring
-seta crosshair_ring_hagar 1
+seta crosshair_ring_hagar 1 "draw a ring showing the current charge of the hagar"
 seta crosshair_ring_hagar_alpha 0.15
 
+// arc ring
+seta crosshair_ring_arc 1 "draw a ring showing arc's overheating"
+seta crosshair_ring_arc_hot_color "1 0 0"
+seta crosshair_ring_arc_cold_alpha 0.2
+seta crosshair_ring_arc_hot_alpha 0.5
+
 // reload ring
-seta crosshair_ring_reload 1 "main cvar to enable or disable ammo crosshair rings"
+seta crosshair_ring_reload 1 "enable ammo crosshair rings"
 seta crosshair_ring_reload_size 2.5    "reload ring size"
 seta crosshair_ring_reload_alpha 0.2   "reload ring alpha"
index df7044ce562a41c915e9d59d7dc9d7ba5996b683..4d259382cd9ef3fb7539c21b3c656f2e3b84ceac 100644 (file)
@@ -55,10 +55,13 @@ _cl_name ""
 _cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
-seta cl_reticle 1 "control for toggling whether ANY zoom reticles are shown"
-seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (breaks image proportions)"
-seta cl_reticle_item_vortex 1 "draw aiming reticle for the vortex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
-seta cl_reticle_item_normal 1 "draw reticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle 1 "enable zoom reticles"
+seta cl_reticle_stretch 0 "stretch reticles so they fit the screen (breaks image proportions)"
+seta cl_reticle_normal 1 "draw an aiminig reticle when zooming with the zoom button"
+seta cl_reticle_normal_alpha 1 "alpha of the normal reticle"
+seta cl_reticle_weapon 1 "draw custom aiming reticle when zooming with certain weapons"
+seta cl_reticle_weapon_alpha 1 "alpha of the custom reticle"
+
 fov 100
 seta cl_velocityzoom_enabled 0 "velocity based zooming of fov"
 seta cl_velocityzoom_factor 0 "factor of fov zooming (negative values zoom out)"
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/gfx/hud/default/kh_blue.tga b/gfx/hud/default/kh_blue.tga
deleted file mode 100644 (file)
index 467b229..0000000
Binary files a/gfx/hud/default/kh_blue.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_blue_carrying.tga b/gfx/hud/default/kh_blue_carrying.tga
new file mode 100644 (file)
index 0000000..a1ad7ae
Binary files /dev/null and b/gfx/hud/default/kh_blue_carrying.tga differ
diff --git a/gfx/hud/default/kh_blue_taken.tga b/gfx/hud/default/kh_blue_taken.tga
new file mode 100644 (file)
index 0000000..bb855cc
Binary files /dev/null and b/gfx/hud/default/kh_blue_taken.tga differ
diff --git a/gfx/hud/default/kh_bluearrow.tga b/gfx/hud/default/kh_bluearrow.tga
deleted file mode 100644 (file)
index b686d1b..0000000
Binary files a/gfx/hud/default/kh_bluearrow.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_dropped.tga b/gfx/hud/default/kh_dropped.tga
new file mode 100644 (file)
index 0000000..a6df016
Binary files /dev/null and b/gfx/hud/default/kh_dropped.tga differ
diff --git a/gfx/hud/default/kh_pink.tga b/gfx/hud/default/kh_pink.tga
deleted file mode 100644 (file)
index b40967a..0000000
Binary files a/gfx/hud/default/kh_pink.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_pink_carrying.tga b/gfx/hud/default/kh_pink_carrying.tga
new file mode 100644 (file)
index 0000000..61053a5
Binary files /dev/null and b/gfx/hud/default/kh_pink_carrying.tga differ
diff --git a/gfx/hud/default/kh_pink_taken.tga b/gfx/hud/default/kh_pink_taken.tga
new file mode 100644 (file)
index 0000000..e7c642f
Binary files /dev/null and b/gfx/hud/default/kh_pink_taken.tga differ
diff --git a/gfx/hud/default/kh_pinkarrow.tga b/gfx/hud/default/kh_pinkarrow.tga
deleted file mode 100644 (file)
index 17427e5..0000000
Binary files a/gfx/hud/default/kh_pinkarrow.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_red.tga b/gfx/hud/default/kh_red.tga
deleted file mode 100644 (file)
index 3201f8a..0000000
Binary files a/gfx/hud/default/kh_red.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_red_carrying.tga b/gfx/hud/default/kh_red_carrying.tga
new file mode 100644 (file)
index 0000000..e52d33d
Binary files /dev/null and b/gfx/hud/default/kh_red_carrying.tga differ
diff --git a/gfx/hud/default/kh_red_taken.tga b/gfx/hud/default/kh_red_taken.tga
new file mode 100644 (file)
index 0000000..66a96a3
Binary files /dev/null and b/gfx/hud/default/kh_red_taken.tga differ
diff --git a/gfx/hud/default/kh_redarrow.tga b/gfx/hud/default/kh_redarrow.tga
deleted file mode 100644 (file)
index edd1fab..0000000
Binary files a/gfx/hud/default/kh_redarrow.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_yellow.tga b/gfx/hud/default/kh_yellow.tga
deleted file mode 100644 (file)
index bb83475..0000000
Binary files a/gfx/hud/default/kh_yellow.tga and /dev/null differ
diff --git a/gfx/hud/default/kh_yellow_carrying.tga b/gfx/hud/default/kh_yellow_carrying.tga
new file mode 100644 (file)
index 0000000..17b051f
Binary files /dev/null and b/gfx/hud/default/kh_yellow_carrying.tga differ
diff --git a/gfx/hud/default/kh_yellow_taken.tga b/gfx/hud/default/kh_yellow_taken.tga
new file mode 100644 (file)
index 0000000..b4a3d32
Binary files /dev/null and b/gfx/hud/default/kh_yellow_taken.tga differ
diff --git a/gfx/hud/default/kh_yellowarrow.tga b/gfx/hud/default/kh_yellowarrow.tga
deleted file mode 100644 (file)
index 8e754cc..0000000
Binary files a/gfx/hud/default/kh_yellowarrow.tga and /dev/null differ
diff --git a/gfx/hud/luma/accelbar.tga b/gfx/hud/luma/accelbar.tga
new file mode 100644 (file)
index 0000000..f70f3a4
Binary files /dev/null and b/gfx/hud/luma/accelbar.tga differ
diff --git a/gfx/hud/luma/ammo_bullets.tga b/gfx/hud/luma/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..4891734
Binary files /dev/null and b/gfx/hud/luma/ammo_bullets.tga differ
diff --git a/gfx/hud/luma/ammo_cells.tga b/gfx/hud/luma/ammo_cells.tga
new file mode 100644 (file)
index 0000000..a5a6178
Binary files /dev/null and b/gfx/hud/luma/ammo_cells.tga differ
diff --git a/gfx/hud/luma/ammo_current_bg.tga b/gfx/hud/luma/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..4e7901e
Binary files /dev/null and b/gfx/hud/luma/ammo_current_bg.tga differ
diff --git a/gfx/hud/luma/ammo_fuel.tga b/gfx/hud/luma/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..8ff3cfe
Binary files /dev/null and b/gfx/hud/luma/ammo_fuel.tga differ
diff --git a/gfx/hud/luma/ammo_plasma.tga b/gfx/hud/luma/ammo_plasma.tga
new file mode 100644 (file)
index 0000000..c47bc6f
Binary files /dev/null and b/gfx/hud/luma/ammo_plasma.tga differ
diff --git a/gfx/hud/luma/ammo_rockets.tga b/gfx/hud/luma/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..41e0914
Binary files /dev/null and b/gfx/hud/luma/ammo_rockets.tga differ
diff --git a/gfx/hud/luma/ammo_shells.tga b/gfx/hud/luma/ammo_shells.tga
new file mode 100644 (file)
index 0000000..fb77174
Binary files /dev/null and b/gfx/hud/luma/ammo_shells.tga differ
diff --git a/gfx/hud/luma/ammo_supercells.tga b/gfx/hud/luma/ammo_supercells.tga
new file mode 100644 (file)
index 0000000..fb6a46e
Binary files /dev/null and b/gfx/hud/luma/ammo_supercells.tga differ
diff --git a/gfx/hud/luma/armor.tga b/gfx/hud/luma/armor.tga
new file mode 100644 (file)
index 0000000..9c58105
Binary files /dev/null and b/gfx/hud/luma/armor.tga differ
diff --git a/gfx/hud/luma/border_corner_northeast.tga b/gfx/hud/luma/border_corner_northeast.tga
new file mode 100644 (file)
index 0000000..24437df
Binary files /dev/null and b/gfx/hud/luma/border_corner_northeast.tga differ
diff --git a/gfx/hud/luma/border_corner_northwest.tga b/gfx/hud/luma/border_corner_northwest.tga
new file mode 100644 (file)
index 0000000..c270d5a
Binary files /dev/null and b/gfx/hud/luma/border_corner_northwest.tga differ
diff --git a/gfx/hud/luma/border_corner_southeast.tga b/gfx/hud/luma/border_corner_southeast.tga
new file mode 100644 (file)
index 0000000..521aceb
Binary files /dev/null and b/gfx/hud/luma/border_corner_southeast.tga differ
diff --git a/gfx/hud/luma/border_corner_southwest.tga b/gfx/hud/luma/border_corner_southwest.tga
new file mode 100644 (file)
index 0000000..99ddc9d
Binary files /dev/null and b/gfx/hud/luma/border_corner_southwest.tga differ
diff --git a/gfx/hud/luma/border_default.tga b/gfx/hud/luma/border_default.tga
new file mode 100644 (file)
index 0000000..35dc0bb
Binary files /dev/null and b/gfx/hud/luma/border_default.tga differ
diff --git a/gfx/hud/luma/border_default_east.tga b/gfx/hud/luma/border_default_east.tga
new file mode 100644 (file)
index 0000000..e14fe26
Binary files /dev/null and b/gfx/hud/luma/border_default_east.tga differ
diff --git a/gfx/hud/luma/border_default_north.tga b/gfx/hud/luma/border_default_north.tga
new file mode 100644 (file)
index 0000000..dd4e7ea
Binary files /dev/null and b/gfx/hud/luma/border_default_north.tga differ
diff --git a/gfx/hud/luma/border_default_south.tga b/gfx/hud/luma/border_default_south.tga
new file mode 100644 (file)
index 0000000..365ae08
Binary files /dev/null and b/gfx/hud/luma/border_default_south.tga differ
diff --git a/gfx/hud/luma/border_default_west.tga b/gfx/hud/luma/border_default_west.tga
new file mode 100644 (file)
index 0000000..39ba91f
Binary files /dev/null and b/gfx/hud/luma/border_default_west.tga differ
diff --git a/gfx/hud/luma/border_fading_east.tga b/gfx/hud/luma/border_fading_east.tga
new file mode 100644 (file)
index 0000000..1e37f16
Binary files /dev/null and b/gfx/hud/luma/border_fading_east.tga differ
diff --git a/gfx/hud/luma/border_fading_north.tga b/gfx/hud/luma/border_fading_north.tga
new file mode 100644 (file)
index 0000000..fa46103
Binary files /dev/null and b/gfx/hud/luma/border_fading_north.tga differ
diff --git a/gfx/hud/luma/border_fading_south.tga b/gfx/hud/luma/border_fading_south.tga
new file mode 100644 (file)
index 0000000..b14ac69
Binary files /dev/null and b/gfx/hud/luma/border_fading_south.tga differ
diff --git a/gfx/hud/luma/border_fading_west.tga b/gfx/hud/luma/border_fading_west.tga
new file mode 100644 (file)
index 0000000..cbf0de1
Binary files /dev/null and b/gfx/hud/luma/border_fading_west.tga differ
diff --git a/gfx/hud/luma/border_highlighted.tga b/gfx/hud/luma/border_highlighted.tga
new file mode 100644 (file)
index 0000000..542f82a
Binary files /dev/null and b/gfx/hud/luma/border_highlighted.tga differ
diff --git a/gfx/hud/luma/border_highlighted2.tga b/gfx/hud/luma/border_highlighted2.tga
new file mode 100644 (file)
index 0000000..7e460e5
Binary files /dev/null and b/gfx/hud/luma/border_highlighted2.tga differ
diff --git a/gfx/hud/luma/border_plain.tga b/gfx/hud/luma/border_plain.tga
new file mode 100644 (file)
index 0000000..1b7b666
Binary files /dev/null and b/gfx/hud/luma/border_plain.tga differ
diff --git a/gfx/hud/luma/border_plain_east.tga b/gfx/hud/luma/border_plain_east.tga
new file mode 100644 (file)
index 0000000..7daf12c
Binary files /dev/null and b/gfx/hud/luma/border_plain_east.tga differ
diff --git a/gfx/hud/luma/border_plain_north.tga b/gfx/hud/luma/border_plain_north.tga
new file mode 100644 (file)
index 0000000..9aacb19
Binary files /dev/null and b/gfx/hud/luma/border_plain_north.tga differ
diff --git a/gfx/hud/luma/border_plain_south.tga b/gfx/hud/luma/border_plain_south.tga
new file mode 100644 (file)
index 0000000..342ee3b
Binary files /dev/null and b/gfx/hud/luma/border_plain_south.tga differ
diff --git a/gfx/hud/luma/border_plain_west.tga b/gfx/hud/luma/border_plain_west.tga
new file mode 100644 (file)
index 0000000..a413b39
Binary files /dev/null and b/gfx/hud/luma/border_plain_west.tga differ
diff --git a/gfx/hud/luma/border_tab_east.tga b/gfx/hud/luma/border_tab_east.tga
new file mode 100644 (file)
index 0000000..974fb6b
Binary files /dev/null and b/gfx/hud/luma/border_tab_east.tga differ
diff --git a/gfx/hud/luma/border_tab_north.tga b/gfx/hud/luma/border_tab_north.tga
new file mode 100644 (file)
index 0000000..62e3793
Binary files /dev/null and b/gfx/hud/luma/border_tab_north.tga differ
diff --git a/gfx/hud/luma/border_tab_south.tga b/gfx/hud/luma/border_tab_south.tga
new file mode 100644 (file)
index 0000000..c6212d5
Binary files /dev/null and b/gfx/hud/luma/border_tab_south.tga differ
diff --git a/gfx/hud/luma/border_tab_west.tga b/gfx/hud/luma/border_tab_west.tga
new file mode 100644 (file)
index 0000000..007efa8
Binary files /dev/null and b/gfx/hud/luma/border_tab_west.tga differ
diff --git a/gfx/hud/luma/dom_icon_blue-highlighted.tga b/gfx/hud/luma/dom_icon_blue-highlighted.tga
new file mode 100644 (file)
index 0000000..a445be4
Binary files /dev/null and b/gfx/hud/luma/dom_icon_blue-highlighted.tga differ
diff --git a/gfx/hud/luma/dom_icon_blue.tga b/gfx/hud/luma/dom_icon_blue.tga
new file mode 100644 (file)
index 0000000..8c9a2b3
Binary files /dev/null and b/gfx/hud/luma/dom_icon_blue.tga differ
diff --git a/gfx/hud/luma/dom_icon_pink-highlighted.tga b/gfx/hud/luma/dom_icon_pink-highlighted.tga
new file mode 100644 (file)
index 0000000..1f0da3c
Binary files /dev/null and b/gfx/hud/luma/dom_icon_pink-highlighted.tga differ
diff --git a/gfx/hud/luma/dom_icon_pink.tga b/gfx/hud/luma/dom_icon_pink.tga
new file mode 100644 (file)
index 0000000..c95a975
Binary files /dev/null and b/gfx/hud/luma/dom_icon_pink.tga differ
diff --git a/gfx/hud/luma/dom_icon_red-highlighted.tga b/gfx/hud/luma/dom_icon_red-highlighted.tga
new file mode 100644 (file)
index 0000000..8336431
Binary files /dev/null and b/gfx/hud/luma/dom_icon_red-highlighted.tga differ
diff --git a/gfx/hud/luma/dom_icon_red.tga b/gfx/hud/luma/dom_icon_red.tga
new file mode 100644 (file)
index 0000000..1cb65d6
Binary files /dev/null and b/gfx/hud/luma/dom_icon_red.tga differ
diff --git a/gfx/hud/luma/dom_icon_yellow-highlighted.tga b/gfx/hud/luma/dom_icon_yellow-highlighted.tga
new file mode 100644 (file)
index 0000000..790ef29
Binary files /dev/null and b/gfx/hud/luma/dom_icon_yellow-highlighted.tga differ
diff --git a/gfx/hud/luma/dom_icon_yellow.tga b/gfx/hud/luma/dom_icon_yellow.tga
new file mode 100644 (file)
index 0000000..87d2abe
Binary files /dev/null and b/gfx/hud/luma/dom_icon_yellow.tga differ
diff --git a/gfx/hud/luma/flag_blue_carrying.tga b/gfx/hud/luma/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..4e4698d
Binary files /dev/null and b/gfx/hud/luma/flag_blue_carrying.tga differ
diff --git a/gfx/hud/luma/flag_blue_lost.tga b/gfx/hud/luma/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..2c5229a
Binary files /dev/null and b/gfx/hud/luma/flag_blue_lost.tga differ
diff --git a/gfx/hud/luma/flag_blue_shielded.tga b/gfx/hud/luma/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..a797f11
Binary files /dev/null and b/gfx/hud/luma/flag_blue_shielded.tga differ
diff --git a/gfx/hud/luma/flag_blue_taken.tga b/gfx/hud/luma/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..a0e76f7
Binary files /dev/null and b/gfx/hud/luma/flag_blue_taken.tga differ
diff --git a/gfx/hud/luma/flag_neutral_carrying.tga b/gfx/hud/luma/flag_neutral_carrying.tga
new file mode 100644 (file)
index 0000000..8ab77dc
Binary files /dev/null and b/gfx/hud/luma/flag_neutral_carrying.tga differ
diff --git a/gfx/hud/luma/flag_neutral_lost.tga b/gfx/hud/luma/flag_neutral_lost.tga
new file mode 100644 (file)
index 0000000..e6fd5c5
Binary files /dev/null and b/gfx/hud/luma/flag_neutral_lost.tga differ
diff --git a/gfx/hud/luma/flag_neutral_shielded.tga b/gfx/hud/luma/flag_neutral_shielded.tga
new file mode 100644 (file)
index 0000000..5158912
Binary files /dev/null and b/gfx/hud/luma/flag_neutral_shielded.tga differ
diff --git a/gfx/hud/luma/flag_neutral_taken.tga b/gfx/hud/luma/flag_neutral_taken.tga
new file mode 100644 (file)
index 0000000..3a32bc5
Binary files /dev/null and b/gfx/hud/luma/flag_neutral_taken.tga differ
diff --git a/gfx/hud/luma/flag_pink_carrying.tga b/gfx/hud/luma/flag_pink_carrying.tga
new file mode 100644 (file)
index 0000000..cf36764
Binary files /dev/null and b/gfx/hud/luma/flag_pink_carrying.tga differ
diff --git a/gfx/hud/luma/flag_pink_lost.tga b/gfx/hud/luma/flag_pink_lost.tga
new file mode 100644 (file)
index 0000000..0cd5467
Binary files /dev/null and b/gfx/hud/luma/flag_pink_lost.tga differ
diff --git a/gfx/hud/luma/flag_pink_shielded.tga b/gfx/hud/luma/flag_pink_shielded.tga
new file mode 100644 (file)
index 0000000..6fe9719
Binary files /dev/null and b/gfx/hud/luma/flag_pink_shielded.tga differ
diff --git a/gfx/hud/luma/flag_pink_taken.tga b/gfx/hud/luma/flag_pink_taken.tga
new file mode 100644 (file)
index 0000000..51eb11c
Binary files /dev/null and b/gfx/hud/luma/flag_pink_taken.tga differ
diff --git a/gfx/hud/luma/flag_red_carrying.tga b/gfx/hud/luma/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..2eaa874
Binary files /dev/null and b/gfx/hud/luma/flag_red_carrying.tga differ
diff --git a/gfx/hud/luma/flag_red_lost.tga b/gfx/hud/luma/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..014a416
Binary files /dev/null and b/gfx/hud/luma/flag_red_lost.tga differ
diff --git a/gfx/hud/luma/flag_red_shielded.tga b/gfx/hud/luma/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..12376d6
Binary files /dev/null and b/gfx/hud/luma/flag_red_shielded.tga differ
diff --git a/gfx/hud/luma/flag_red_taken.tga b/gfx/hud/luma/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..739378c
Binary files /dev/null and b/gfx/hud/luma/flag_red_taken.tga differ
diff --git a/gfx/hud/luma/flag_yellow_carrying.tga b/gfx/hud/luma/flag_yellow_carrying.tga
new file mode 100644 (file)
index 0000000..00c3b09
Binary files /dev/null and b/gfx/hud/luma/flag_yellow_carrying.tga differ
diff --git a/gfx/hud/luma/flag_yellow_lost.tga b/gfx/hud/luma/flag_yellow_lost.tga
new file mode 100644 (file)
index 0000000..bd5f3de
Binary files /dev/null and b/gfx/hud/luma/flag_yellow_lost.tga differ
diff --git a/gfx/hud/luma/flag_yellow_shielded.tga b/gfx/hud/luma/flag_yellow_shielded.tga
new file mode 100644 (file)
index 0000000..a44f976
Binary files /dev/null and b/gfx/hud/luma/flag_yellow_shielded.tga differ
diff --git a/gfx/hud/luma/flag_yellow_taken.tga b/gfx/hud/luma/flag_yellow_taken.tga
new file mode 100644 (file)
index 0000000..cff764d
Binary files /dev/null and b/gfx/hud/luma/flag_yellow_taken.tga differ
diff --git a/gfx/hud/luma/health.tga b/gfx/hud/luma/health.tga
new file mode 100644 (file)
index 0000000..51fdf0b
Binary files /dev/null and b/gfx/hud/luma/health.tga differ
diff --git a/gfx/hud/luma/keepawayball_carrying.tga b/gfx/hud/luma/keepawayball_carrying.tga
new file mode 100644 (file)
index 0000000..71351c2
Binary files /dev/null and b/gfx/hud/luma/keepawayball_carrying.tga differ
diff --git a/gfx/hud/luma/key_atck.tga b/gfx/hud/luma/key_atck.tga
new file mode 100644 (file)
index 0000000..3a60639
Binary files /dev/null and b/gfx/hud/luma/key_atck.tga differ
diff --git a/gfx/hud/luma/key_atck2.tga b/gfx/hud/luma/key_atck2.tga
new file mode 100644 (file)
index 0000000..4e2cd4b
Binary files /dev/null and b/gfx/hud/luma/key_atck2.tga differ
diff --git a/gfx/hud/luma/key_atck2_inv.tga b/gfx/hud/luma/key_atck2_inv.tga
new file mode 100644 (file)
index 0000000..c879549
Binary files /dev/null and b/gfx/hud/luma/key_atck2_inv.tga differ
diff --git a/gfx/hud/luma/key_atck_inv.tga b/gfx/hud/luma/key_atck_inv.tga
new file mode 100644 (file)
index 0000000..8079107
Binary files /dev/null and b/gfx/hud/luma/key_atck_inv.tga differ
diff --git a/gfx/hud/luma/key_backward.tga b/gfx/hud/luma/key_backward.tga
new file mode 100644 (file)
index 0000000..1117288
Binary files /dev/null and b/gfx/hud/luma/key_backward.tga differ
diff --git a/gfx/hud/luma/key_backward_inv.tga b/gfx/hud/luma/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..2d3c623
Binary files /dev/null and b/gfx/hud/luma/key_backward_inv.tga differ
diff --git a/gfx/hud/luma/key_crouch.tga b/gfx/hud/luma/key_crouch.tga
new file mode 100644 (file)
index 0000000..58bbf06
Binary files /dev/null and b/gfx/hud/luma/key_crouch.tga differ
diff --git a/gfx/hud/luma/key_crouch_inv.tga b/gfx/hud/luma/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..e94fc66
Binary files /dev/null and b/gfx/hud/luma/key_crouch_inv.tga differ
diff --git a/gfx/hud/luma/key_forward.tga b/gfx/hud/luma/key_forward.tga
new file mode 100644 (file)
index 0000000..69a365b
Binary files /dev/null and b/gfx/hud/luma/key_forward.tga differ
diff --git a/gfx/hud/luma/key_forward_inv.tga b/gfx/hud/luma/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..b761dd8
Binary files /dev/null and b/gfx/hud/luma/key_forward_inv.tga differ
diff --git a/gfx/hud/luma/key_jump.tga b/gfx/hud/luma/key_jump.tga
new file mode 100644 (file)
index 0000000..c73f1ee
Binary files /dev/null and b/gfx/hud/luma/key_jump.tga differ
diff --git a/gfx/hud/luma/key_jump_inv.tga b/gfx/hud/luma/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..87bf449
Binary files /dev/null and b/gfx/hud/luma/key_jump_inv.tga differ
diff --git a/gfx/hud/luma/key_left.tga b/gfx/hud/luma/key_left.tga
new file mode 100644 (file)
index 0000000..bef02a6
Binary files /dev/null and b/gfx/hud/luma/key_left.tga differ
diff --git a/gfx/hud/luma/key_left_inv.tga b/gfx/hud/luma/key_left_inv.tga
new file mode 100644 (file)
index 0000000..f1191a4
Binary files /dev/null and b/gfx/hud/luma/key_left_inv.tga differ
diff --git a/gfx/hud/luma/key_right.tga b/gfx/hud/luma/key_right.tga
new file mode 100644 (file)
index 0000000..a40b7e8
Binary files /dev/null and b/gfx/hud/luma/key_right.tga differ
diff --git a/gfx/hud/luma/key_right_inv.tga b/gfx/hud/luma/key_right_inv.tga
new file mode 100644 (file)
index 0000000..41ebbd6
Binary files /dev/null and b/gfx/hud/luma/key_right_inv.tga differ
diff --git a/gfx/hud/luma/kh_blue_carrying.tga b/gfx/hud/luma/kh_blue_carrying.tga
new file mode 100644 (file)
index 0000000..37eac47
Binary files /dev/null and b/gfx/hud/luma/kh_blue_carrying.tga differ
diff --git a/gfx/hud/luma/kh_blue_taken.tga b/gfx/hud/luma/kh_blue_taken.tga
new file mode 100644 (file)
index 0000000..e6ecb94
Binary files /dev/null and b/gfx/hud/luma/kh_blue_taken.tga differ
diff --git a/gfx/hud/luma/kh_dropped.tga b/gfx/hud/luma/kh_dropped.tga
new file mode 100644 (file)
index 0000000..7887734
Binary files /dev/null and b/gfx/hud/luma/kh_dropped.tga differ
diff --git a/gfx/hud/luma/kh_pink_carrying.tga b/gfx/hud/luma/kh_pink_carrying.tga
new file mode 100644 (file)
index 0000000..e9cd7c7
Binary files /dev/null and b/gfx/hud/luma/kh_pink_carrying.tga differ
diff --git a/gfx/hud/luma/kh_pink_taken.tga b/gfx/hud/luma/kh_pink_taken.tga
new file mode 100644 (file)
index 0000000..4cf9567
Binary files /dev/null and b/gfx/hud/luma/kh_pink_taken.tga differ
diff --git a/gfx/hud/luma/kh_red_carrying.tga b/gfx/hud/luma/kh_red_carrying.tga
new file mode 100644 (file)
index 0000000..6bd512d
Binary files /dev/null and b/gfx/hud/luma/kh_red_carrying.tga differ
diff --git a/gfx/hud/luma/kh_red_taken.tga b/gfx/hud/luma/kh_red_taken.tga
new file mode 100644 (file)
index 0000000..ee62e60
Binary files /dev/null and b/gfx/hud/luma/kh_red_taken.tga differ
diff --git a/gfx/hud/luma/kh_yellow_carrying.tga b/gfx/hud/luma/kh_yellow_carrying.tga
new file mode 100644 (file)
index 0000000..9b36772
Binary files /dev/null and b/gfx/hud/luma/kh_yellow_carrying.tga differ
diff --git a/gfx/hud/luma/kh_yellow_taken.tga b/gfx/hud/luma/kh_yellow_taken.tga
new file mode 100644 (file)
index 0000000..3370bd0
Binary files /dev/null and b/gfx/hud/luma/kh_yellow_taken.tga differ
diff --git a/gfx/hud/luma/nade_bg.tga b/gfx/hud/luma/nade_bg.tga
new file mode 100644 (file)
index 0000000..0aa0700
Binary files /dev/null and b/gfx/hud/luma/nade_bg.tga differ
diff --git a/gfx/hud/luma/nade_nbg.tga b/gfx/hud/luma/nade_nbg.tga
new file mode 100644 (file)
index 0000000..80f1986
Binary files /dev/null and b/gfx/hud/luma/nade_nbg.tga differ
diff --git a/gfx/hud/luma/nexball_carrying.tga b/gfx/hud/luma/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..90ec767
Binary files /dev/null and b/gfx/hud/luma/nexball_carrying.tga differ
diff --git a/gfx/hud/luma/notify_balldropped.tga b/gfx/hud/luma/notify_balldropped.tga
new file mode 100644 (file)
index 0000000..96a2c0f
Binary files /dev/null and b/gfx/hud/luma/notify_balldropped.tga differ
diff --git a/gfx/hud/luma/notify_ballpickedup.tga b/gfx/hud/luma/notify_ballpickedup.tga
new file mode 100644 (file)
index 0000000..4539f28
Binary files /dev/null and b/gfx/hud/luma/notify_ballpickedup.tga differ
diff --git a/gfx/hud/luma/notify_blue_captured.tga b/gfx/hud/luma/notify_blue_captured.tga
new file mode 100644 (file)
index 0000000..d645a9d
Binary files /dev/null and b/gfx/hud/luma/notify_blue_captured.tga differ
diff --git a/gfx/hud/luma/notify_blue_carrying.tga b/gfx/hud/luma/notify_blue_carrying.tga
new file mode 100644 (file)
index 0000000..4e4698d
Binary files /dev/null and b/gfx/hud/luma/notify_blue_carrying.tga differ
diff --git a/gfx/hud/luma/notify_blue_lost.tga b/gfx/hud/luma/notify_blue_lost.tga
new file mode 100644 (file)
index 0000000..2c5229a
Binary files /dev/null and b/gfx/hud/luma/notify_blue_lost.tga differ
diff --git a/gfx/hud/luma/notify_blue_returned.tga b/gfx/hud/luma/notify_blue_returned.tga
new file mode 100644 (file)
index 0000000..45cfc1d
Binary files /dev/null and b/gfx/hud/luma/notify_blue_returned.tga differ
diff --git a/gfx/hud/luma/notify_blue_shielded.tga b/gfx/hud/luma/notify_blue_shielded.tga
new file mode 100644 (file)
index 0000000..a797f11
Binary files /dev/null and b/gfx/hud/luma/notify_blue_shielded.tga differ
diff --git a/gfx/hud/luma/notify_blue_taken.tga b/gfx/hud/luma/notify_blue_taken.tga
new file mode 100644 (file)
index 0000000..a0e76f7
Binary files /dev/null and b/gfx/hud/luma/notify_blue_taken.tga differ
diff --git a/gfx/hud/luma/notify_camping.tga b/gfx/hud/luma/notify_camping.tga
new file mode 100644 (file)
index 0000000..f86a41e
Binary files /dev/null and b/gfx/hud/luma/notify_camping.tga differ
diff --git a/gfx/hud/luma/notify_death.tga b/gfx/hud/luma/notify_death.tga
new file mode 100644 (file)
index 0000000..97f2fe2
Binary files /dev/null and b/gfx/hud/luma/notify_death.tga differ
diff --git a/gfx/hud/luma/notify_fall.tga b/gfx/hud/luma/notify_fall.tga
new file mode 100644 (file)
index 0000000..4842969
Binary files /dev/null and b/gfx/hud/luma/notify_fall.tga differ
diff --git a/gfx/hud/luma/notify_lava.tga b/gfx/hud/luma/notify_lava.tga
new file mode 100644 (file)
index 0000000..a074f86
Binary files /dev/null and b/gfx/hud/luma/notify_lava.tga differ
diff --git a/gfx/hud/luma/notify_melee_shotgun.tga b/gfx/hud/luma/notify_melee_shotgun.tga
new file mode 100644 (file)
index 0000000..591fdb9
Binary files /dev/null and b/gfx/hud/luma/notify_melee_shotgun.tga differ
diff --git a/gfx/hud/luma/notify_nade.tga b/gfx/hud/luma/notify_nade.tga
new file mode 100644 (file)
index 0000000..c163e50
Binary files /dev/null and b/gfx/hud/luma/notify_nade.tga differ
diff --git a/gfx/hud/luma/notify_nade_heal.tga b/gfx/hud/luma/notify_nade_heal.tga
new file mode 100644 (file)
index 0000000..4a46237
Binary files /dev/null and b/gfx/hud/luma/notify_nade_heal.tga differ
diff --git a/gfx/hud/luma/notify_nade_ice.tga b/gfx/hud/luma/notify_nade_ice.tga
new file mode 100644 (file)
index 0000000..24e31ac
Binary files /dev/null and b/gfx/hud/luma/notify_nade_ice.tga differ
diff --git a/gfx/hud/luma/notify_nade_napalm.tga b/gfx/hud/luma/notify_nade_napalm.tga
new file mode 100644 (file)
index 0000000..9fb16bc
Binary files /dev/null and b/gfx/hud/luma/notify_nade_napalm.tga differ
diff --git a/gfx/hud/luma/notify_neutral_carrying.tga b/gfx/hud/luma/notify_neutral_carrying.tga
new file mode 100644 (file)
index 0000000..8ab77dc
Binary files /dev/null and b/gfx/hud/luma/notify_neutral_carrying.tga differ
diff --git a/gfx/hud/luma/notify_neutral_lost.tga b/gfx/hud/luma/notify_neutral_lost.tga
new file mode 100644 (file)
index 0000000..e6fd5c5
Binary files /dev/null and b/gfx/hud/luma/notify_neutral_lost.tga differ
diff --git a/gfx/hud/luma/notify_neutral_shielded.tga b/gfx/hud/luma/notify_neutral_shielded.tga
new file mode 100644 (file)
index 0000000..5158912
Binary files /dev/null and b/gfx/hud/luma/notify_neutral_shielded.tga differ
diff --git a/gfx/hud/luma/notify_neutral_taken.tga b/gfx/hud/luma/notify_neutral_taken.tga
new file mode 100644 (file)
index 0000000..3a32bc5
Binary files /dev/null and b/gfx/hud/luma/notify_neutral_taken.tga differ
diff --git a/gfx/hud/luma/notify_outofammo.tga b/gfx/hud/luma/notify_outofammo.tga
new file mode 100644 (file)
index 0000000..f221d58
Binary files /dev/null and b/gfx/hud/luma/notify_outofammo.tga differ
diff --git a/gfx/hud/luma/notify_pink_captured.tga b/gfx/hud/luma/notify_pink_captured.tga
new file mode 100644 (file)
index 0000000..5c91fae
Binary files /dev/null and b/gfx/hud/luma/notify_pink_captured.tga differ
diff --git a/gfx/hud/luma/notify_pink_carrying.tga b/gfx/hud/luma/notify_pink_carrying.tga
new file mode 100644 (file)
index 0000000..cf36764
Binary files /dev/null and b/gfx/hud/luma/notify_pink_carrying.tga differ
diff --git a/gfx/hud/luma/notify_pink_lost.tga b/gfx/hud/luma/notify_pink_lost.tga
new file mode 100644 (file)
index 0000000..0cd5467
Binary files /dev/null and b/gfx/hud/luma/notify_pink_lost.tga differ
diff --git a/gfx/hud/luma/notify_pink_returned.tga b/gfx/hud/luma/notify_pink_returned.tga
new file mode 100644 (file)
index 0000000..120e757
Binary files /dev/null and b/gfx/hud/luma/notify_pink_returned.tga differ
diff --git a/gfx/hud/luma/notify_pink_shielded.tga b/gfx/hud/luma/notify_pink_shielded.tga
new file mode 100644 (file)
index 0000000..6fe9719
Binary files /dev/null and b/gfx/hud/luma/notify_pink_shielded.tga differ
diff --git a/gfx/hud/luma/notify_pink_taken.tga b/gfx/hud/luma/notify_pink_taken.tga
new file mode 100644 (file)
index 0000000..51eb11c
Binary files /dev/null and b/gfx/hud/luma/notify_pink_taken.tga differ
diff --git a/gfx/hud/luma/notify_red_captured.tga b/gfx/hud/luma/notify_red_captured.tga
new file mode 100644 (file)
index 0000000..1e17194
Binary files /dev/null and b/gfx/hud/luma/notify_red_captured.tga differ
diff --git a/gfx/hud/luma/notify_red_carrying.tga b/gfx/hud/luma/notify_red_carrying.tga
new file mode 100644 (file)
index 0000000..2eaa874
Binary files /dev/null and b/gfx/hud/luma/notify_red_carrying.tga differ
diff --git a/gfx/hud/luma/notify_red_lost.tga b/gfx/hud/luma/notify_red_lost.tga
new file mode 100644 (file)
index 0000000..014a416
Binary files /dev/null and b/gfx/hud/luma/notify_red_lost.tga differ
diff --git a/gfx/hud/luma/notify_red_returned.tga b/gfx/hud/luma/notify_red_returned.tga
new file mode 100644 (file)
index 0000000..31fbe07
Binary files /dev/null and b/gfx/hud/luma/notify_red_returned.tga differ
diff --git a/gfx/hud/luma/notify_red_shielded.tga b/gfx/hud/luma/notify_red_shielded.tga
new file mode 100644 (file)
index 0000000..12376d6
Binary files /dev/null and b/gfx/hud/luma/notify_red_shielded.tga differ
diff --git a/gfx/hud/luma/notify_red_taken.tga b/gfx/hud/luma/notify_red_taken.tga
new file mode 100644 (file)
index 0000000..739378c
Binary files /dev/null and b/gfx/hud/luma/notify_red_taken.tga differ
diff --git a/gfx/hud/luma/notify_selfkill.tga b/gfx/hud/luma/notify_selfkill.tga
new file mode 100644 (file)
index 0000000..ca2b4fc
Binary files /dev/null and b/gfx/hud/luma/notify_selfkill.tga differ
diff --git a/gfx/hud/luma/notify_shootingstar.tga b/gfx/hud/luma/notify_shootingstar.tga
new file mode 100644 (file)
index 0000000..74e2c0f
Binary files /dev/null and b/gfx/hud/luma/notify_shootingstar.tga differ
diff --git a/gfx/hud/luma/notify_slime.tga b/gfx/hud/luma/notify_slime.tga
new file mode 100644 (file)
index 0000000..b595e15
Binary files /dev/null and b/gfx/hud/luma/notify_slime.tga differ
diff --git a/gfx/hud/luma/notify_teamkill_blue.tga b/gfx/hud/luma/notify_teamkill_blue.tga
new file mode 100644 (file)
index 0000000..b6479dc
Binary files /dev/null and b/gfx/hud/luma/notify_teamkill_blue.tga differ
diff --git a/gfx/hud/luma/notify_teamkill_neutral.tga b/gfx/hud/luma/notify_teamkill_neutral.tga
new file mode 100644 (file)
index 0000000..c346fa9
Binary files /dev/null and b/gfx/hud/luma/notify_teamkill_neutral.tga differ
diff --git a/gfx/hud/luma/notify_teamkill_pink.tga b/gfx/hud/luma/notify_teamkill_pink.tga
new file mode 100644 (file)
index 0000000..9b4660c
Binary files /dev/null and b/gfx/hud/luma/notify_teamkill_pink.tga differ
diff --git a/gfx/hud/luma/notify_teamkill_red.tga b/gfx/hud/luma/notify_teamkill_red.tga
new file mode 100644 (file)
index 0000000..367b552
Binary files /dev/null and b/gfx/hud/luma/notify_teamkill_red.tga differ
diff --git a/gfx/hud/luma/notify_teamkill_yellow.tga b/gfx/hud/luma/notify_teamkill_yellow.tga
new file mode 100644 (file)
index 0000000..772bcaa
Binary files /dev/null and b/gfx/hud/luma/notify_teamkill_yellow.tga differ
diff --git a/gfx/hud/luma/notify_telefrag.tga b/gfx/hud/luma/notify_telefrag.tga
new file mode 100644 (file)
index 0000000..a72ff9c
Binary files /dev/null and b/gfx/hud/luma/notify_telefrag.tga differ
diff --git a/gfx/hud/luma/notify_void.tga b/gfx/hud/luma/notify_void.tga
new file mode 100644 (file)
index 0000000..ce32f81
Binary files /dev/null and b/gfx/hud/luma/notify_void.tga differ
diff --git a/gfx/hud/luma/notify_water.tga b/gfx/hud/luma/notify_water.tga
new file mode 100644 (file)
index 0000000..f7f0cda
Binary files /dev/null and b/gfx/hud/luma/notify_water.tga differ
diff --git a/gfx/hud/luma/notify_yellow_captured.tga b/gfx/hud/luma/notify_yellow_captured.tga
new file mode 100644 (file)
index 0000000..c2fcd01
Binary files /dev/null and b/gfx/hud/luma/notify_yellow_captured.tga differ
diff --git a/gfx/hud/luma/notify_yellow_carrying.tga b/gfx/hud/luma/notify_yellow_carrying.tga
new file mode 100644 (file)
index 0000000..00c3b09
Binary files /dev/null and b/gfx/hud/luma/notify_yellow_carrying.tga differ
diff --git a/gfx/hud/luma/notify_yellow_lost.tga b/gfx/hud/luma/notify_yellow_lost.tga
new file mode 100644 (file)
index 0000000..bd5f3de
Binary files /dev/null and b/gfx/hud/luma/notify_yellow_lost.tga differ
diff --git a/gfx/hud/luma/notify_yellow_returned.tga b/gfx/hud/luma/notify_yellow_returned.tga
new file mode 100644 (file)
index 0000000..cc7348a
Binary files /dev/null and b/gfx/hud/luma/notify_yellow_returned.tga differ
diff --git a/gfx/hud/luma/notify_yellow_shielded.tga b/gfx/hud/luma/notify_yellow_shielded.tga
new file mode 100644 (file)
index 0000000..a44f976
Binary files /dev/null and b/gfx/hud/luma/notify_yellow_shielded.tga differ
diff --git a/gfx/hud/luma/notify_yellow_taken.tga b/gfx/hud/luma/notify_yellow_taken.tga
new file mode 100644 (file)
index 0000000..cff764d
Binary files /dev/null and b/gfx/hud/luma/notify_yellow_taken.tga differ
diff --git a/gfx/hud/luma/num_leading.tga b/gfx/hud/luma/num_leading.tga
new file mode 100644 (file)
index 0000000..0aa0700
Binary files /dev/null and b/gfx/hud/luma/num_leading.tga differ
diff --git a/gfx/hud/luma/ok_weapon_rail.tga b/gfx/hud/luma/ok_weapon_rail.tga
new file mode 100644 (file)
index 0000000..e2e83ae
Binary files /dev/null and b/gfx/hud/luma/ok_weapon_rail.tga differ
diff --git a/gfx/hud/luma/ok_weapon_shotgun.tga b/gfx/hud/luma/ok_weapon_shotgun.tga
new file mode 100644 (file)
index 0000000..f5fb92e
Binary files /dev/null and b/gfx/hud/luma/ok_weapon_shotgun.tga differ
diff --git a/gfx/hud/luma/ok_weapon_smg.tga b/gfx/hud/luma/ok_weapon_smg.tga
new file mode 100644 (file)
index 0000000..5aee32a
Binary files /dev/null and b/gfx/hud/luma/ok_weapon_smg.tga differ
diff --git a/gfx/hud/luma/player_blue.tga b/gfx/hud/luma/player_blue.tga
new file mode 100644 (file)
index 0000000..028092e
Binary files /dev/null and b/gfx/hud/luma/player_blue.tga differ
diff --git a/gfx/hud/luma/player_neutral.tga b/gfx/hud/luma/player_neutral.tga
new file mode 100644 (file)
index 0000000..0880bc9
Binary files /dev/null and b/gfx/hud/luma/player_neutral.tga differ
diff --git a/gfx/hud/luma/player_pink.tga b/gfx/hud/luma/player_pink.tga
new file mode 100644 (file)
index 0000000..0e4cb7e
Binary files /dev/null and b/gfx/hud/luma/player_pink.tga differ
diff --git a/gfx/hud/luma/player_red.tga b/gfx/hud/luma/player_red.tga
new file mode 100644 (file)
index 0000000..7f0c4e5
Binary files /dev/null and b/gfx/hud/luma/player_red.tga differ
diff --git a/gfx/hud/luma/player_yellow.tga b/gfx/hud/luma/player_yellow.tga
new file mode 100644 (file)
index 0000000..283db51
Binary files /dev/null and b/gfx/hud/luma/player_yellow.tga differ
diff --git a/gfx/hud/luma/powerup_detonator.tga b/gfx/hud/luma/powerup_detonator.tga
new file mode 100644 (file)
index 0000000..e59955a
Binary files /dev/null and b/gfx/hud/luma/powerup_detonator.tga differ
diff --git a/gfx/hud/luma/powerup_invisibility.tga b/gfx/hud/luma/powerup_invisibility.tga
new file mode 100644 (file)
index 0000000..d1aa0c7
Binary files /dev/null and b/gfx/hud/luma/powerup_invisibility.tga differ
diff --git a/gfx/hud/luma/powerup_resurrection.tga b/gfx/hud/luma/powerup_resurrection.tga
new file mode 100644 (file)
index 0000000..47d09e7
Binary files /dev/null and b/gfx/hud/luma/powerup_resurrection.tga differ
diff --git a/gfx/hud/luma/powerup_speed.tga b/gfx/hud/luma/powerup_speed.tga
new file mode 100644 (file)
index 0000000..1a893d6
Binary files /dev/null and b/gfx/hud/luma/powerup_speed.tga differ
diff --git a/gfx/hud/luma/powerup_ultrahealing.tga b/gfx/hud/luma/powerup_ultrahealing.tga
new file mode 100644 (file)
index 0000000..ea9e00f
Binary files /dev/null and b/gfx/hud/luma/powerup_ultrahealing.tga differ
diff --git a/gfx/hud/luma/powerup_xray.tga b/gfx/hud/luma/powerup_xray.tga
new file mode 100644 (file)
index 0000000..bf81ff4
Binary files /dev/null and b/gfx/hud/luma/powerup_xray.tga differ
diff --git a/gfx/hud/luma/progressbar.tga b/gfx/hud/luma/progressbar.tga
new file mode 100644 (file)
index 0000000..f70f3a4
Binary files /dev/null and b/gfx/hud/luma/progressbar.tga differ
diff --git a/gfx/hud/luma/progressbar_vertical.tga b/gfx/hud/luma/progressbar_vertical.tga
new file mode 100644 (file)
index 0000000..9df8bd6
Binary files /dev/null and b/gfx/hud/luma/progressbar_vertical.tga differ
diff --git a/gfx/hud/luma/race_newfail.tga b/gfx/hud/luma/race_newfail.tga
new file mode 100644 (file)
index 0000000..19e6314
Binary files /dev/null and b/gfx/hud/luma/race_newfail.tga differ
diff --git a/gfx/hud/luma/race_newrankgreen.tga b/gfx/hud/luma/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..05feb73
Binary files /dev/null and b/gfx/hud/luma/race_newrankgreen.tga differ
diff --git a/gfx/hud/luma/race_newrankyellow.tga b/gfx/hud/luma/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..05feb73
Binary files /dev/null and b/gfx/hud/luma/race_newrankyellow.tga differ
diff --git a/gfx/hud/luma/race_newrecordserver.tga b/gfx/hud/luma/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..1141304
Binary files /dev/null and b/gfx/hud/luma/race_newrecordserver.tga differ
diff --git a/gfx/hud/luma/race_newtime.tga b/gfx/hud/luma/race_newtime.tga
new file mode 100644 (file)
index 0000000..8d21a41
Binary files /dev/null and b/gfx/hud/luma/race_newtime.tga differ
diff --git a/gfx/hud/luma/shield.tga b/gfx/hud/luma/shield.tga
new file mode 100644 (file)
index 0000000..3101dbb
Binary files /dev/null and b/gfx/hud/luma/shield.tga differ
diff --git a/gfx/hud/luma/strength.tga b/gfx/hud/luma/strength.tga
new file mode 100644 (file)
index 0000000..7a9910a
Binary files /dev/null and b/gfx/hud/luma/strength.tga differ
diff --git a/gfx/hud/luma/superweapons.tga b/gfx/hud/luma/superweapons.tga
new file mode 100644 (file)
index 0000000..fd873ac
Binary files /dev/null and b/gfx/hud/luma/superweapons.tga differ
diff --git a/gfx/hud/luma/voteprogress_back.tga b/gfx/hud/luma/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..d1fd54a
Binary files /dev/null and b/gfx/hud/luma/voteprogress_back.tga differ
diff --git a/gfx/hud/luma/voteprogress_prog.tga b/gfx/hud/luma/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..50a15d6
Binary files /dev/null and b/gfx/hud/luma/voteprogress_prog.tga differ
diff --git a/gfx/hud/luma/voteprogress_voted.tga b/gfx/hud/luma/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..98b9b16
Binary files /dev/null and b/gfx/hud/luma/voteprogress_voted.tga differ
diff --git a/gfx/hud/luma/weapon_accuracy.tga b/gfx/hud/luma/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..1bdcdd5
Binary files /dev/null and b/gfx/hud/luma/weapon_accuracy.tga differ
diff --git a/gfx/hud/luma/weapon_accuracy_north.tga b/gfx/hud/luma/weapon_accuracy_north.tga
new file mode 100644 (file)
index 0000000..03cc0ff
Binary files /dev/null and b/gfx/hud/luma/weapon_accuracy_north.tga differ
diff --git a/gfx/hud/luma/weapon_accuracy_south.tga b/gfx/hud/luma/weapon_accuracy_south.tga
new file mode 100644 (file)
index 0000000..7aa8069
Binary files /dev/null and b/gfx/hud/luma/weapon_accuracy_south.tga differ
diff --git a/gfx/hud/luma/weapon_accuracy_west.tga b/gfx/hud/luma/weapon_accuracy_west.tga
new file mode 100644 (file)
index 0000000..965c9ad
Binary files /dev/null and b/gfx/hud/luma/weapon_accuracy_west.tga differ
diff --git a/gfx/hud/luma/weapon_ammo.tga b/gfx/hud/luma/weapon_ammo.tga
new file mode 100644 (file)
index 0000000..0a688f7
Binary files /dev/null and b/gfx/hud/luma/weapon_ammo.tga differ
diff --git a/gfx/hud/luma/weapon_complainbubble.tga b/gfx/hud/luma/weapon_complainbubble.tga
new file mode 100644 (file)
index 0000000..943178f
Binary files /dev/null and b/gfx/hud/luma/weapon_complainbubble.tga differ
diff --git a/gfx/hud/luma/weapon_current_bg.tga b/gfx/hud/luma/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..6d3efb9
Binary files /dev/null and b/gfx/hud/luma/weapon_current_bg.tga differ
diff --git a/gfx/hud/luma/weapon_current_bg_north.tga b/gfx/hud/luma/weapon_current_bg_north.tga
new file mode 100644 (file)
index 0000000..8ad7ec2
Binary files /dev/null and b/gfx/hud/luma/weapon_current_bg_north.tga differ
diff --git a/gfx/hud/luma/weapon_current_bg_south.tga b/gfx/hud/luma/weapon_current_bg_south.tga
new file mode 100644 (file)
index 0000000..a2b9bf7
Binary files /dev/null and b/gfx/hud/luma/weapon_current_bg_south.tga differ
diff --git a/gfx/hud/luma/weapon_current_bg_west.tga b/gfx/hud/luma/weapon_current_bg_west.tga
new file mode 100644 (file)
index 0000000..d40e2a4
Binary files /dev/null and b/gfx/hud/luma/weapon_current_bg_west.tga differ
diff --git a/gfx/hud/luma/weaponarc.tga b/gfx/hud/luma/weaponarc.tga
new file mode 100644 (file)
index 0000000..adaeff5
Binary files /dev/null and b/gfx/hud/luma/weaponarc.tga differ
diff --git a/gfx/hud/luma/weaponcrylink.tga b/gfx/hud/luma/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..e6673be
Binary files /dev/null and b/gfx/hud/luma/weaponcrylink.tga differ
diff --git a/gfx/hud/luma/weaponelectro.tga b/gfx/hud/luma/weaponelectro.tga
new file mode 100644 (file)
index 0000000..f0cbdfe
Binary files /dev/null and b/gfx/hud/luma/weaponelectro.tga differ
diff --git a/gfx/hud/luma/weaponfireball.tga b/gfx/hud/luma/weaponfireball.tga
new file mode 100644 (file)
index 0000000..b794d76
Binary files /dev/null and b/gfx/hud/luma/weaponfireball.tga differ
diff --git a/gfx/hud/luma/weapongrenadelauncher.tga b/gfx/hud/luma/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..9cb3228
Binary files /dev/null and b/gfx/hud/luma/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/luma/weaponhagar.tga b/gfx/hud/luma/weaponhagar.tga
new file mode 100644 (file)
index 0000000..63a8b60
Binary files /dev/null and b/gfx/hud/luma/weaponhagar.tga differ
diff --git a/gfx/hud/luma/weaponhlac.tga b/gfx/hud/luma/weaponhlac.tga
new file mode 100644 (file)
index 0000000..2208b83
Binary files /dev/null and b/gfx/hud/luma/weaponhlac.tga differ
diff --git a/gfx/hud/luma/weaponhmg.tga b/gfx/hud/luma/weaponhmg.tga
new file mode 100644 (file)
index 0000000..c36c3f5
Binary files /dev/null and b/gfx/hud/luma/weaponhmg.tga differ
diff --git a/gfx/hud/luma/weaponhook.tga b/gfx/hud/luma/weaponhook.tga
new file mode 100644 (file)
index 0000000..a3d2b88
Binary files /dev/null and b/gfx/hud/luma/weaponhook.tga differ
diff --git a/gfx/hud/luma/weaponlaser.tga b/gfx/hud/luma/weaponlaser.tga
new file mode 100644 (file)
index 0000000..2e77781
Binary files /dev/null and b/gfx/hud/luma/weaponlaser.tga differ
diff --git a/gfx/hud/luma/weaponminelayer.tga b/gfx/hud/luma/weaponminelayer.tga
new file mode 100644 (file)
index 0000000..0f0069d
Binary files /dev/null and b/gfx/hud/luma/weaponminelayer.tga differ
diff --git a/gfx/hud/luma/weaponminstanex.tga b/gfx/hud/luma/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..81c37e8
Binary files /dev/null and b/gfx/hud/luma/weaponminstanex.tga differ
diff --git a/gfx/hud/luma/weaponnex.tga b/gfx/hud/luma/weaponnex.tga
new file mode 100644 (file)
index 0000000..e2e83ae
Binary files /dev/null and b/gfx/hud/luma/weaponnex.tga differ
diff --git a/gfx/hud/luma/weaponporto.tga b/gfx/hud/luma/weaponporto.tga
new file mode 100644 (file)
index 0000000..5ee8169
Binary files /dev/null and b/gfx/hud/luma/weaponporto.tga differ
diff --git a/gfx/hud/luma/weaponrifle.tga b/gfx/hud/luma/weaponrifle.tga
new file mode 100644 (file)
index 0000000..036845c
Binary files /dev/null and b/gfx/hud/luma/weaponrifle.tga differ
diff --git a/gfx/hud/luma/weaponrocketlauncher.tga b/gfx/hud/luma/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..174d86e
Binary files /dev/null and b/gfx/hud/luma/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/luma/weaponrpc.tga b/gfx/hud/luma/weaponrpc.tga
new file mode 100644 (file)
index 0000000..643c5ca
Binary files /dev/null and b/gfx/hud/luma/weaponrpc.tga differ
diff --git a/gfx/hud/luma/weaponseeker.tga b/gfx/hud/luma/weaponseeker.tga
new file mode 100644 (file)
index 0000000..17645a6
Binary files /dev/null and b/gfx/hud/luma/weaponseeker.tga differ
diff --git a/gfx/hud/luma/weaponshockwave.tga b/gfx/hud/luma/weaponshockwave.tga
new file mode 100644 (file)
index 0000000..c37b837
Binary files /dev/null and b/gfx/hud/luma/weaponshockwave.tga differ
diff --git a/gfx/hud/luma/weaponshotgun.tga b/gfx/hud/luma/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..f5fb92e
Binary files /dev/null and b/gfx/hud/luma/weaponshotgun.tga differ
diff --git a/gfx/hud/luma/weapontuba.tga b/gfx/hud/luma/weapontuba.tga
new file mode 100644 (file)
index 0000000..47acf24
Binary files /dev/null and b/gfx/hud/luma/weapontuba.tga differ
diff --git a/gfx/hud/luma/weaponuzi.tga b/gfx/hud/luma/weaponuzi.tga
new file mode 100644 (file)
index 0000000..5aee32a
Binary files /dev/null and b/gfx/hud/luma/weaponuzi.tga differ
diff --git a/gfx/hud/old/kh_blue.tga b/gfx/hud/old/kh_blue.tga
deleted file mode 100644 (file)
index 467b229..0000000
Binary files a/gfx/hud/old/kh_blue.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_bluearrow.tga b/gfx/hud/old/kh_bluearrow.tga
deleted file mode 100644 (file)
index b686d1b..0000000
Binary files a/gfx/hud/old/kh_bluearrow.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_pink.tga b/gfx/hud/old/kh_pink.tga
deleted file mode 100644 (file)
index b40967a..0000000
Binary files a/gfx/hud/old/kh_pink.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_pinkarrow.tga b/gfx/hud/old/kh_pinkarrow.tga
deleted file mode 100644 (file)
index 17427e5..0000000
Binary files a/gfx/hud/old/kh_pinkarrow.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_red.tga b/gfx/hud/old/kh_red.tga
deleted file mode 100644 (file)
index 3201f8a..0000000
Binary files a/gfx/hud/old/kh_red.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_redarrow.tga b/gfx/hud/old/kh_redarrow.tga
deleted file mode 100644 (file)
index edd1fab..0000000
Binary files a/gfx/hud/old/kh_redarrow.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_yellow.tga b/gfx/hud/old/kh_yellow.tga
deleted file mode 100644 (file)
index bb83475..0000000
Binary files a/gfx/hud/old/kh_yellow.tga and /dev/null differ
diff --git a/gfx/hud/old/kh_yellowarrow.tga b/gfx/hud/old/kh_yellowarrow.tga
deleted file mode 100644 (file)
index 8e754cc..0000000
Binary files a/gfx/hud/old/kh_yellowarrow.tga and /dev/null differ
diff --git a/gfx/menu/luma/background.tga b/gfx/menu/luma/background.tga
new file mode 100644 (file)
index 0000000..7497ddc
Binary files /dev/null and b/gfx/menu/luma/background.tga differ
diff --git a/gfx/menu/luma/background_ingame.tga b/gfx/menu/luma/background_ingame.tga
new file mode 100644 (file)
index 0000000..6ead934
Binary files /dev/null and b/gfx/menu/luma/background_ingame.tga differ
diff --git a/gfx/menu/luma/background_ingame_l2.tga b/gfx/menu/luma/background_ingame_l2.tga
new file mode 100644 (file)
index 0000000..6e34b47
Binary files /dev/null and b/gfx/menu/luma/background_ingame_l2.tga differ
diff --git a/gfx/menu/luma/background_l2.tga b/gfx/menu/luma/background_l2.tga
new file mode 100644 (file)
index 0000000..6e34b47
Binary files /dev/null and b/gfx/menu/luma/background_l2.tga differ
diff --git a/gfx/menu/luma/bigbutton_c.tga b/gfx/menu/luma/bigbutton_c.tga
new file mode 100644 (file)
index 0000000..3565f3c
Binary files /dev/null and b/gfx/menu/luma/bigbutton_c.tga differ
diff --git a/gfx/menu/luma/bigbutton_d.tga b/gfx/menu/luma/bigbutton_d.tga
new file mode 100644 (file)
index 0000000..0efae80
Binary files /dev/null and b/gfx/menu/luma/bigbutton_d.tga differ
diff --git a/gfx/menu/luma/bigbutton_f.tga b/gfx/menu/luma/bigbutton_f.tga
new file mode 100644 (file)
index 0000000..3edc7da
Binary files /dev/null and b/gfx/menu/luma/bigbutton_f.tga differ
diff --git a/gfx/menu/luma/bigbutton_n.tga b/gfx/menu/luma/bigbutton_n.tga
new file mode 100644 (file)
index 0000000..4f07b0c
Binary files /dev/null and b/gfx/menu/luma/bigbutton_n.tga differ
diff --git a/gfx/menu/luma/bigbuttongray_c.tga b/gfx/menu/luma/bigbuttongray_c.tga
new file mode 100644 (file)
index 0000000..e18e0f6
Binary files /dev/null and b/gfx/menu/luma/bigbuttongray_c.tga differ
diff --git a/gfx/menu/luma/bigbuttongray_d.tga b/gfx/menu/luma/bigbuttongray_d.tga
new file mode 100644 (file)
index 0000000..87b5dd5
Binary files /dev/null and b/gfx/menu/luma/bigbuttongray_d.tga differ
diff --git a/gfx/menu/luma/bigbuttongray_f.tga b/gfx/menu/luma/bigbuttongray_f.tga
new file mode 100644 (file)
index 0000000..3624987
Binary files /dev/null and b/gfx/menu/luma/bigbuttongray_f.tga differ
diff --git a/gfx/menu/luma/bigbuttongray_n.tga b/gfx/menu/luma/bigbuttongray_n.tga
new file mode 100644 (file)
index 0000000..e18e0f6
Binary files /dev/null and b/gfx/menu/luma/bigbuttongray_n.tga differ
diff --git a/gfx/menu/luma/border.tga b/gfx/menu/luma/border.tga
new file mode 100644 (file)
index 0000000..95bdc3c
Binary files /dev/null and b/gfx/menu/luma/border.tga differ
diff --git a/gfx/menu/luma/button_c.tga b/gfx/menu/luma/button_c.tga
new file mode 100644 (file)
index 0000000..b86b63a
Binary files /dev/null and b/gfx/menu/luma/button_c.tga differ
diff --git a/gfx/menu/luma/button_d.tga b/gfx/menu/luma/button_d.tga
new file mode 100644 (file)
index 0000000..f804330
Binary files /dev/null and b/gfx/menu/luma/button_d.tga differ
diff --git a/gfx/menu/luma/button_f.tga b/gfx/menu/luma/button_f.tga
new file mode 100644 (file)
index 0000000..0b54fee
Binary files /dev/null and b/gfx/menu/luma/button_f.tga differ
diff --git a/gfx/menu/luma/button_n.tga b/gfx/menu/luma/button_n.tga
new file mode 100644 (file)
index 0000000..0dc4fd6
Binary files /dev/null and b/gfx/menu/luma/button_n.tga differ
diff --git a/gfx/menu/luma/buttongray_c.tga b/gfx/menu/luma/buttongray_c.tga
new file mode 100644 (file)
index 0000000..4c1ae7c
Binary files /dev/null and b/gfx/menu/luma/buttongray_c.tga differ
diff --git a/gfx/menu/luma/buttongray_d.tga b/gfx/menu/luma/buttongray_d.tga
new file mode 100644 (file)
index 0000000..e0e8318
Binary files /dev/null and b/gfx/menu/luma/buttongray_d.tga differ
diff --git a/gfx/menu/luma/buttongray_f.tga b/gfx/menu/luma/buttongray_f.tga
new file mode 100644 (file)
index 0000000..cc604bc
Binary files /dev/null and b/gfx/menu/luma/buttongray_f.tga differ
diff --git a/gfx/menu/luma/buttongray_n.tga b/gfx/menu/luma/buttongray_n.tga
new file mode 100644 (file)
index 0000000..4c1ae7c
Binary files /dev/null and b/gfx/menu/luma/buttongray_n.tga differ
diff --git a/gfx/menu/luma/checkbox_c0.tga b/gfx/menu/luma/checkbox_c0.tga
new file mode 100644 (file)
index 0000000..f8e6960
Binary files /dev/null and b/gfx/menu/luma/checkbox_c0.tga differ
diff --git a/gfx/menu/luma/checkbox_c1.tga b/gfx/menu/luma/checkbox_c1.tga
new file mode 100644 (file)
index 0000000..32d2f6d
Binary files /dev/null and b/gfx/menu/luma/checkbox_c1.tga differ
diff --git a/gfx/menu/luma/checkbox_d0.tga b/gfx/menu/luma/checkbox_d0.tga
new file mode 100644 (file)
index 0000000..b059ab6
Binary files /dev/null and b/gfx/menu/luma/checkbox_d0.tga differ
diff --git a/gfx/menu/luma/checkbox_d1.tga b/gfx/menu/luma/checkbox_d1.tga
new file mode 100644 (file)
index 0000000..e38b962
Binary files /dev/null and b/gfx/menu/luma/checkbox_d1.tga differ
diff --git a/gfx/menu/luma/checkbox_f0.tga b/gfx/menu/luma/checkbox_f0.tga
new file mode 100644 (file)
index 0000000..5201675
Binary files /dev/null and b/gfx/menu/luma/checkbox_f0.tga differ
diff --git a/gfx/menu/luma/checkbox_f1.tga b/gfx/menu/luma/checkbox_f1.tga
new file mode 100644 (file)
index 0000000..116b29c
Binary files /dev/null and b/gfx/menu/luma/checkbox_f1.tga differ
diff --git a/gfx/menu/luma/checkbox_n0.tga b/gfx/menu/luma/checkbox_n0.tga
new file mode 100644 (file)
index 0000000..9786dc8
Binary files /dev/null and b/gfx/menu/luma/checkbox_n0.tga differ
diff --git a/gfx/menu/luma/checkbox_n1.tga b/gfx/menu/luma/checkbox_n1.tga
new file mode 100644 (file)
index 0000000..427d3ce
Binary files /dev/null and b/gfx/menu/luma/checkbox_n1.tga differ
diff --git a/gfx/menu/luma/checkmark.tga b/gfx/menu/luma/checkmark.tga
new file mode 100644 (file)
index 0000000..eb4b259
Binary files /dev/null and b/gfx/menu/luma/checkmark.tga differ
diff --git a/gfx/menu/luma/clearbutton_c.tga b/gfx/menu/luma/clearbutton_c.tga
new file mode 100644 (file)
index 0000000..36fc40b
Binary files /dev/null and b/gfx/menu/luma/clearbutton_c.tga differ
diff --git a/gfx/menu/luma/clearbutton_f.tga b/gfx/menu/luma/clearbutton_f.tga
new file mode 100644 (file)
index 0000000..c2418a4
Binary files /dev/null and b/gfx/menu/luma/clearbutton_f.tga differ
diff --git a/gfx/menu/luma/clearbutton_n.tga b/gfx/menu/luma/clearbutton_n.tga
new file mode 100644 (file)
index 0000000..3ac282b
Binary files /dev/null and b/gfx/menu/luma/clearbutton_n.tga differ
diff --git a/gfx/menu/luma/closebutton_c.tga b/gfx/menu/luma/closebutton_c.tga
new file mode 100644 (file)
index 0000000..3a8f46f
Binary files /dev/null and b/gfx/menu/luma/closebutton_c.tga differ
diff --git a/gfx/menu/luma/closebutton_f.tga b/gfx/menu/luma/closebutton_f.tga
new file mode 100644 (file)
index 0000000..0b3933b
Binary files /dev/null and b/gfx/menu/luma/closebutton_f.tga differ
diff --git a/gfx/menu/luma/closebutton_n.tga b/gfx/menu/luma/closebutton_n.tga
new file mode 100644 (file)
index 0000000..4ea4b1c
Binary files /dev/null and b/gfx/menu/luma/closebutton_n.tga differ
diff --git a/gfx/menu/luma/colorbutton_c.tga b/gfx/menu/luma/colorbutton_c.tga
new file mode 100644 (file)
index 0000000..0d8eef1
Binary files /dev/null and b/gfx/menu/luma/colorbutton_c.tga differ
diff --git a/gfx/menu/luma/colorbutton_f.tga b/gfx/menu/luma/colorbutton_f.tga
new file mode 100644 (file)
index 0000000..1a2fc86
Binary files /dev/null and b/gfx/menu/luma/colorbutton_f.tga differ
diff --git a/gfx/menu/luma/colorbutton_n.tga b/gfx/menu/luma/colorbutton_n.tga
new file mode 100644 (file)
index 0000000..3498ad5
Binary files /dev/null and b/gfx/menu/luma/colorbutton_n.tga differ
diff --git a/gfx/menu/luma/colorpicker.tga b/gfx/menu/luma/colorpicker.tga
new file mode 100755 (executable)
index 0000000..6f9845b
Binary files /dev/null and b/gfx/menu/luma/colorpicker.tga differ
diff --git a/gfx/menu/luma/colorpicker_m.tga b/gfx/menu/luma/colorpicker_m.tga
new file mode 100644 (file)
index 0000000..6775942
Binary files /dev/null and b/gfx/menu/luma/colorpicker_m.tga differ
diff --git a/gfx/menu/luma/colorpicker_selected.tga b/gfx/menu/luma/colorpicker_selected.tga
new file mode 100644 (file)
index 0000000..df79869
Binary files /dev/null and b/gfx/menu/luma/colorpicker_selected.tga differ
diff --git a/gfx/menu/luma/crosshairbutton_c.tga b/gfx/menu/luma/crosshairbutton_c.tga
new file mode 100644 (file)
index 0000000..ecfd0a8
Binary files /dev/null and b/gfx/menu/luma/crosshairbutton_c.tga differ
diff --git a/gfx/menu/luma/crosshairbutton_d.tga b/gfx/menu/luma/crosshairbutton_d.tga
new file mode 100644 (file)
index 0000000..4e7901e
Binary files /dev/null and b/gfx/menu/luma/crosshairbutton_d.tga differ
diff --git a/gfx/menu/luma/crosshairbutton_f.tga b/gfx/menu/luma/crosshairbutton_f.tga
new file mode 100644 (file)
index 0000000..604a935
Binary files /dev/null and b/gfx/menu/luma/crosshairbutton_f.tga differ
diff --git a/gfx/menu/luma/crosshairbutton_n.tga b/gfx/menu/luma/crosshairbutton_n.tga
new file mode 100644 (file)
index 0000000..4e7901e
Binary files /dev/null and b/gfx/menu/luma/crosshairbutton_n.tga differ
diff --git a/gfx/menu/luma/cursor.tga b/gfx/menu/luma/cursor.tga
new file mode 100644 (file)
index 0000000..b12436a
Binary files /dev/null and b/gfx/menu/luma/cursor.tga differ
diff --git a/gfx/menu/luma/cursor_move.tga b/gfx/menu/luma/cursor_move.tga
new file mode 100644 (file)
index 0000000..81e265d
Binary files /dev/null and b/gfx/menu/luma/cursor_move.tga differ
diff --git a/gfx/menu/luma/cursor_resize.tga b/gfx/menu/luma/cursor_resize.tga
new file mode 100644 (file)
index 0000000..617323e
Binary files /dev/null and b/gfx/menu/luma/cursor_resize.tga differ
diff --git a/gfx/menu/luma/cursor_resize2.tga b/gfx/menu/luma/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..606015b
Binary files /dev/null and b/gfx/menu/luma/cursor_resize2.tga differ
diff --git a/gfx/menu/luma/gametype_as.tga b/gfx/menu/luma/gametype_as.tga
new file mode 100644 (file)
index 0000000..85eda57
Binary files /dev/null and b/gfx/menu/luma/gametype_as.tga differ
diff --git a/gfx/menu/luma/gametype_ca.tga b/gfx/menu/luma/gametype_ca.tga
new file mode 100644 (file)
index 0000000..668b57e
Binary files /dev/null and b/gfx/menu/luma/gametype_ca.tga differ
diff --git a/gfx/menu/luma/gametype_ctf.tga b/gfx/menu/luma/gametype_ctf.tga
new file mode 100644 (file)
index 0000000..7eb0c8e
Binary files /dev/null and b/gfx/menu/luma/gametype_ctf.tga differ
diff --git a/gfx/menu/luma/gametype_cts.tga b/gfx/menu/luma/gametype_cts.tga
new file mode 100644 (file)
index 0000000..235da2f
Binary files /dev/null and b/gfx/menu/luma/gametype_cts.tga differ
diff --git a/gfx/menu/luma/gametype_dm.tga b/gfx/menu/luma/gametype_dm.tga
new file mode 100644 (file)
index 0000000..0ce1d16
Binary files /dev/null and b/gfx/menu/luma/gametype_dm.tga differ
diff --git a/gfx/menu/luma/gametype_dom.tga b/gfx/menu/luma/gametype_dom.tga
new file mode 100644 (file)
index 0000000..fcaa2f3
Binary files /dev/null and b/gfx/menu/luma/gametype_dom.tga differ
diff --git a/gfx/menu/luma/gametype_duel.tga b/gfx/menu/luma/gametype_duel.tga
new file mode 100644 (file)
index 0000000..8816316
Binary files /dev/null and b/gfx/menu/luma/gametype_duel.tga differ
diff --git a/gfx/menu/luma/gametype_ft.tga b/gfx/menu/luma/gametype_ft.tga
new file mode 100644 (file)
index 0000000..515a3f8
Binary files /dev/null and b/gfx/menu/luma/gametype_ft.tga differ
diff --git a/gfx/menu/luma/gametype_inf.tga b/gfx/menu/luma/gametype_inf.tga
new file mode 100644 (file)
index 0000000..bcbbd6c
Binary files /dev/null and b/gfx/menu/luma/gametype_inf.tga differ
diff --git a/gfx/menu/luma/gametype_inv.tga b/gfx/menu/luma/gametype_inv.tga
new file mode 100644 (file)
index 0000000..bc114f9
Binary files /dev/null and b/gfx/menu/luma/gametype_inv.tga differ
diff --git a/gfx/menu/luma/gametype_jb.tga b/gfx/menu/luma/gametype_jb.tga
new file mode 100644 (file)
index 0000000..7971be3
Binary files /dev/null and b/gfx/menu/luma/gametype_jb.tga differ
diff --git a/gfx/menu/luma/gametype_ka.tga b/gfx/menu/luma/gametype_ka.tga
new file mode 100644 (file)
index 0000000..3370b5e
Binary files /dev/null and b/gfx/menu/luma/gametype_ka.tga differ
diff --git a/gfx/menu/luma/gametype_kh.tga b/gfx/menu/luma/gametype_kh.tga
new file mode 100644 (file)
index 0000000..bdca280
Binary files /dev/null and b/gfx/menu/luma/gametype_kh.tga differ
diff --git a/gfx/menu/luma/gametype_lms.tga b/gfx/menu/luma/gametype_lms.tga
new file mode 100644 (file)
index 0000000..33e2be7
Binary files /dev/null and b/gfx/menu/luma/gametype_lms.tga differ
diff --git a/gfx/menu/luma/gametype_nb.tga b/gfx/menu/luma/gametype_nb.tga
new file mode 100644 (file)
index 0000000..9bfb5ad
Binary files /dev/null and b/gfx/menu/luma/gametype_nb.tga differ
diff --git a/gfx/menu/luma/gametype_ons.tga b/gfx/menu/luma/gametype_ons.tga
new file mode 100644 (file)
index 0000000..a9a0f17
Binary files /dev/null and b/gfx/menu/luma/gametype_ons.tga differ
diff --git a/gfx/menu/luma/gametype_rc.tga b/gfx/menu/luma/gametype_rc.tga
new file mode 100644 (file)
index 0000000..10d7e41
Binary files /dev/null and b/gfx/menu/luma/gametype_rc.tga differ
diff --git a/gfx/menu/luma/gametype_tdm.tga b/gfx/menu/luma/gametype_tdm.tga
new file mode 100644 (file)
index 0000000..289641e
Binary files /dev/null and b/gfx/menu/luma/gametype_tdm.tga differ
diff --git a/gfx/menu/luma/gametype_vip.tga b/gfx/menu/luma/gametype_vip.tga
new file mode 100644 (file)
index 0000000..2c9eccc
Binary files /dev/null and b/gfx/menu/luma/gametype_vip.tga differ
diff --git a/gfx/menu/luma/icon_aeslevel1.tga b/gfx/menu/luma/icon_aeslevel1.tga
new file mode 100644 (file)
index 0000000..22aa0ff
Binary files /dev/null and b/gfx/menu/luma/icon_aeslevel1.tga differ
diff --git a/gfx/menu/luma/icon_aeslevel2.tga b/gfx/menu/luma/icon_aeslevel2.tga
new file mode 100644 (file)
index 0000000..22aa0ff
Binary files /dev/null and b/gfx/menu/luma/icon_aeslevel2.tga differ
diff --git a/gfx/menu/luma/icon_aeslevel3.tga b/gfx/menu/luma/icon_aeslevel3.tga
new file mode 100644 (file)
index 0000000..c90efa8
Binary files /dev/null and b/gfx/menu/luma/icon_aeslevel3.tga differ
diff --git a/gfx/menu/luma/icon_aeslevel4.tga b/gfx/menu/luma/icon_aeslevel4.tga
new file mode 100644 (file)
index 0000000..c90efa8
Binary files /dev/null and b/gfx/menu/luma/icon_aeslevel4.tga differ
diff --git a/gfx/menu/luma/icon_aeslevel5.tga b/gfx/menu/luma/icon_aeslevel5.tga
new file mode 100644 (file)
index 0000000..c90efa8
Binary files /dev/null and b/gfx/menu/luma/icon_aeslevel5.tga differ
diff --git a/gfx/menu/luma/icon_mod_.tga b/gfx/menu/luma/icon_mod_.tga
new file mode 100644 (file)
index 0000000..79a1f24
Binary files /dev/null and b/gfx/menu/luma/icon_mod_.tga differ
diff --git a/gfx/menu/luma/icon_mod_MinstaGib.tga b/gfx/menu/luma/icon_mod_MinstaGib.tga
new file mode 100644 (file)
index 0000000..ce8c2d5
Binary files /dev/null and b/gfx/menu/luma/icon_mod_MinstaGib.tga differ
diff --git a/gfx/menu/luma/icon_mod_NewToys.tga b/gfx/menu/luma/icon_mod_NewToys.tga
new file mode 100644 (file)
index 0000000..c5f212c
Binary files /dev/null and b/gfx/menu/luma/icon_mod_NewToys.tga differ
diff --git a/gfx/menu/luma/icon_mod_Overkill.tga b/gfx/menu/luma/icon_mod_Overkill.tga
new file mode 100644 (file)
index 0000000..aeeaeb8
Binary files /dev/null and b/gfx/menu/luma/icon_mod_Overkill.tga differ
diff --git a/gfx/menu/luma/icon_mod_XDF.tga b/gfx/menu/luma/icon_mod_XDF.tga
new file mode 100644 (file)
index 0000000..c0b4e6d
Binary files /dev/null and b/gfx/menu/luma/icon_mod_XDF.tga differ
diff --git a/gfx/menu/luma/icon_pure1.tga b/gfx/menu/luma/icon_pure1.tga
new file mode 100644 (file)
index 0000000..fbe4dc9
Binary files /dev/null and b/gfx/menu/luma/icon_pure1.tga differ
diff --git a/gfx/menu/luma/icon_stats1.tga b/gfx/menu/luma/icon_stats1.tga
new file mode 100644 (file)
index 0000000..841dde6
Binary files /dev/null and b/gfx/menu/luma/icon_stats1.tga differ
diff --git a/gfx/menu/luma/inputbox_f.tga b/gfx/menu/luma/inputbox_f.tga
new file mode 100644 (file)
index 0000000..c31aa43
Binary files /dev/null and b/gfx/menu/luma/inputbox_f.tga differ
diff --git a/gfx/menu/luma/inputbox_n.tga b/gfx/menu/luma/inputbox_n.tga
new file mode 100644 (file)
index 0000000..621f50d
Binary files /dev/null and b/gfx/menu/luma/inputbox_n.tga differ
diff --git a/gfx/menu/luma/nopreview_map.tga b/gfx/menu/luma/nopreview_map.tga
new file mode 100644 (file)
index 0000000..5fedc94
Binary files /dev/null and b/gfx/menu/luma/nopreview_map.tga differ
diff --git a/gfx/menu/luma/nopreview_menuskin.tga b/gfx/menu/luma/nopreview_menuskin.tga
new file mode 100644 (file)
index 0000000..c332b63
Binary files /dev/null and b/gfx/menu/luma/nopreview_menuskin.tga differ
diff --git a/gfx/menu/luma/nopreview_player.tga b/gfx/menu/luma/nopreview_player.tga
new file mode 100644 (file)
index 0000000..e1fa52c
Binary files /dev/null and b/gfx/menu/luma/nopreview_player.tga differ
diff --git a/gfx/menu/luma/radiobutton_c0.tga b/gfx/menu/luma/radiobutton_c0.tga
new file mode 100644 (file)
index 0000000..8b60a1b
Binary files /dev/null and b/gfx/menu/luma/radiobutton_c0.tga differ
diff --git a/gfx/menu/luma/radiobutton_c1.tga b/gfx/menu/luma/radiobutton_c1.tga
new file mode 100644 (file)
index 0000000..d23f9df
Binary files /dev/null and b/gfx/menu/luma/radiobutton_c1.tga differ
diff --git a/gfx/menu/luma/radiobutton_d0.tga b/gfx/menu/luma/radiobutton_d0.tga
new file mode 100644 (file)
index 0000000..16a4ff8
Binary files /dev/null and b/gfx/menu/luma/radiobutton_d0.tga differ
diff --git a/gfx/menu/luma/radiobutton_d1.tga b/gfx/menu/luma/radiobutton_d1.tga
new file mode 100644 (file)
index 0000000..b4eacff
Binary files /dev/null and b/gfx/menu/luma/radiobutton_d1.tga differ
diff --git a/gfx/menu/luma/radiobutton_f0.tga b/gfx/menu/luma/radiobutton_f0.tga
new file mode 100644 (file)
index 0000000..59ecc08
Binary files /dev/null and b/gfx/menu/luma/radiobutton_f0.tga differ
diff --git a/gfx/menu/luma/radiobutton_f1.tga b/gfx/menu/luma/radiobutton_f1.tga
new file mode 100644 (file)
index 0000000..396e277
Binary files /dev/null and b/gfx/menu/luma/radiobutton_f1.tga differ
diff --git a/gfx/menu/luma/radiobutton_n0.tga b/gfx/menu/luma/radiobutton_n0.tga
new file mode 100644 (file)
index 0000000..13a96e9
Binary files /dev/null and b/gfx/menu/luma/radiobutton_n0.tga differ
diff --git a/gfx/menu/luma/radiobutton_n1.tga b/gfx/menu/luma/radiobutton_n1.tga
new file mode 100644 (file)
index 0000000..a64b50c
Binary files /dev/null and b/gfx/menu/luma/radiobutton_n1.tga differ
diff --git a/gfx/menu/luma/scrollbar_c.tga b/gfx/menu/luma/scrollbar_c.tga
new file mode 100644 (file)
index 0000000..09333d1
Binary files /dev/null and b/gfx/menu/luma/scrollbar_c.tga differ
diff --git a/gfx/menu/luma/scrollbar_f.tga b/gfx/menu/luma/scrollbar_f.tga
new file mode 100644 (file)
index 0000000..109278c
Binary files /dev/null and b/gfx/menu/luma/scrollbar_f.tga differ
diff --git a/gfx/menu/luma/scrollbar_n.tga b/gfx/menu/luma/scrollbar_n.tga
new file mode 100644 (file)
index 0000000..b8a01d1
Binary files /dev/null and b/gfx/menu/luma/scrollbar_n.tga differ
diff --git a/gfx/menu/luma/scrollbar_s.tga b/gfx/menu/luma/scrollbar_s.tga
new file mode 100644 (file)
index 0000000..699e11c
Binary files /dev/null and b/gfx/menu/luma/scrollbar_s.tga differ
diff --git a/gfx/menu/luma/skinpreview.tga b/gfx/menu/luma/skinpreview.tga
new file mode 100644 (file)
index 0000000..f89a2e6
Binary files /dev/null and b/gfx/menu/luma/skinpreview.tga differ
diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
new file mode 100644 (file)
index 0000000..1e87e88
--- /dev/null
@@ -0,0 +1,209 @@
+title Luma
+author sev
+
+// Image suffixes: c(licked), d(isabled), f(ocused), n(ormal), s(eektrack)
+// Background scaling: c(rop), h(eight), l(etterbox), s(tretch), w(idth)
+// Background positioning:
+//   7 8 9
+//   4 5 6
+//   1 2 3
+
+// background
+ALIGN_BACKGROUND              c5h5
+ALIGN_BACKGROUND_INGAME       c5h5
+ALPHA_BACKGROUND_INGAME       1
+ALPHA_DISABLED                0.2
+ALPHA_BEHIND                  0.5
+
+// button
+COLOR_BUTTON_C                '1 1 1'
+COLOR_BUTTON_D                '1 1 1'
+COLOR_BUTTON_F                '1 1 1'
+COLOR_BUTTON_N                '1 1 1'
+
+// campaign
+ALPHA_CAMPAIGN_CURRENT        1
+COLOR_CAMPAIGN_CURRENT        '0.96 0.99 1'
+ALPHA_CAMPAIGN_DESCRIPTION    0.8
+ALPHA_CAMPAIGN_FUTURE         0.2
+COLOR_CAMPAIGN_FUTURE         '0.96 0.99 1'
+ALPHA_CAMPAIGN_SELECTABLE     0.6
+COLOR_CAMPAIGN_SELECTABLE     '0.96 0.99 1'
+
+// charmap
+ALPHA_CHARMAP_CHAR            0.85
+COLOR_CHARMAP_CHAR            '1 1 1'
+ALPHA_CHARMAP_FOCUS           0.85
+COLOR_CHARMAP_FOCUS           '0.09 0.42 0.69'
+
+// checkbox
+COLOR_CHECKBOX_C              '1 1 1'
+COLOR_CHECKBOX_D              '1 1 1'
+COLOR_CHECKBOX_F              '1 1 1'
+COLOR_CHECKBOX_N              '1 1 1'
+
+// clearbutton
+COLOR_CLEARBUTTON_C           '1 1 1'
+COLOR_CLEARBUTTON_F           '1 1 1'
+COLOR_CLEARBUTTON_N           '1 1 1'
+OFFSET_CLEARBUTTON            0
+
+// colorpicker
+MARGIN_COLORPICKER            '0 0 0'
+
+// credits
+ALPHA_CREDITS_FUNCTION        1
+COLOR_CREDITS_FUNCTION        '0.03 0.25 0.49'
+ALPHA_CREDITS_PERSON          0.8
+COLOR_CREDITS_PERSON          '0.96 0.99 1'
+ALPHA_CREDITS_TITLE           1
+COLOR_CREDITS_TITLE           '0.94 0.45 0.11'
+ROWS_CREDITS                  20
+WIDTH_CREDITS                 0.5
+
+// cursor
+SIZE_CURSOR                   '32 32 0'
+OFFSET_CURSOR                 '0.25 0.125 0'
+ALPHA_CURSOR_INTRO            0
+
+// cvarlist
+COLOR_CVARLIST_CHANGED        '0.95 0.05 0.05'
+COLOR_CVARLIST_CONTROLS       '1 0.2 0.15'
+COLOR_CVARLIST_UNCHANGED      '1 1 1'
+ALPHA_CVARLIST_SAVED          0.85
+ALPHA_CVARLIST_TEMPORARY      0.55
+
+// dialog color
+COLOR_DIALOG_MULTIPLAYER      '1 1 1'
+COLOR_DIALOG_SETTINGS         '1 1 1'
+COLOR_DIALOG_TEAMSELECT       '1 1 1'
+COLOR_DIALOG_SANDBOXTOOLS     '1 1 1'
+COLOR_DIALOG_QUIT             '1 1 1'
+COLOR_DIALOG_ADVANCED         '1 1 1'
+COLOR_DIALOG_MUTATORS         '1 1 1'
+COLOR_DIALOG_MAPINFO          '1 1 1'
+COLOR_DIALOG_USERBIND         '1 1 1'
+COLOR_DIALOG_SINGLEPLAYER     '1 1 1'
+COLOR_DIALOG_CREDITS          '1 1 1'
+COLOR_DIALOG_WEAPONS          '1 1 1'
+COLOR_DIALOG_VIEW             '1 1 1'
+COLOR_DIALOG_MODEL            '1 1 1'
+COLOR_DIALOG_CROSSHAIR        '1 1 1'
+COLOR_DIALOG_HUD              '1 1 1'
+COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1'
+COLOR_DIALOG_SERVERINFO       '1 1 1'
+COLOR_DIALOG_FIRSTRUN         '1 1 1'
+COLOR_DIALOG_CVARS            '1 0.2 0.15'
+COLOR_DIALOG_HUDCONFIRM       '1 0.2 0.15'
+
+// dialog margins
+HEIGHT_DIALOGBORDER           1
+MARGIN_TOP                    8
+MARGIN_BOTTOM                 12
+MARGIN_LEFT                   16
+MARGIN_RIGHT                  16
+MARGIN_COLUMNS                4
+MARGIN_ROWS                   4
+
+// dialog scale transformation centers (NOT the actual positions)
+POSITION_DIALOG_MULTIPLAYER   '0.9 0.4 0'
+POSITION_DIALOG_SINGLEPLAYER  '0.15 0.4 0'
+POSITION_DIALOG_SETTINGS      '0.5 1 0'
+POSITION_DIALOG_CREDITS       '-0.05 1.2 0'
+POSITION_DIALOG_QUIT          '1.05 1.2 0'
+
+// font
+ALPHA_TEXT                    0.8
+COLOR_TEXT                    '0.96 0.99 1'
+ALPHA_HEADER                  0.5
+COLOR_HEADER                  '0.96 0.99 1'
+FONTSIZE_NORMAL               12
+FONTSIZE_TITLE                16
+FONTSIZE_TOOLTIP              12
+HEIGHT_NORMAL                 1.5
+HEIGHT_TITLE                  1.5
+HEIGHT_ZOOMEDTITLE            -1
+
+// inputbox
+COLOR_INPUTBOX_F              '1 1 1'
+COLOR_INPUTBOX_N              '1 1 1'
+MARGIN_INPUTBOX_CHARS         1
+
+// keygrabber
+ALPHA_KEYGRABBER_KEYS         0.8
+COLOR_KEYGRABBER_KEYS         '0.96 0.99 1'
+ALPHA_KEYGRABBER_TITLES       1
+COLOR_KEYGRABBER_TITLES       '0.03 0.25 0.49'
+
+// listbox
+ALPHA_LISTBOX_BACKGROUND      0.5
+COLOR_LISTBOX_BACKGROUND      '0 0 0'
+ALPHA_LISTBOX_SELECTED        1
+COLOR_LISTBOX_SELECTED        '0.97 0.56 0.27'
+ALPHA_LISTBOX_WAITING         0.8
+COLOR_LISTBOX_WAITING         '0.73 0.82 0.9'
+
+// mainmenu
+ALPHAS_MAINMENU               '0.8 0.9 1'
+
+// maplist
+COLOR_MAPLIST_AUTHOR          '0.56 0.72 0.86'
+ALPHA_MAPLIST_INCLUDEDBG      0.3
+COLOR_MAPLIST_INCLUDEDBG      '0.03 0.25 0.49'
+ALPHA_MAPLIST_INCLUDEDFG      1
+ALPHA_MAPLIST_NOTINCLUDEDFG   0.25
+COLOR_MAPLIST_TITLE           '0.96 0.99 1'
+
+// modeltitle
+ALPHA_MODELTITLE              0.8
+COLOR_MODELTITLE              '0.96 0.99 1'
+
+// radiobutton
+COLOR_RADIOBUTTON_C           '1 1 1'
+COLOR_RADIOBUTTON_D           '1 1 1'
+COLOR_RADIOBUTTON_F           '1 1 1'
+COLOR_RADIOBUTTON_N           '1 1 1'
+
+// serverinfo
+COLOR_SERVERINFO_IP           '0.96 0.99 1'
+COLOR_SERVERINFO_NAME         '0.94 0.45 0.11'
+
+// serverlist
+ALPHA_SERVERLIST_CATEGORY     1
+COLOR_SERVERLIST_CATEGORY     '0.03 0.25 0.49'
+ALPHA_SERVERLIST_EMPTY        0.65
+ALPHA_SERVERLIST_FAVORITE     0.8
+COLOR_SERVERLIST_FAVORITE     '1 1 1'
+ALPHA_SERVERLIST_FULL         0.4
+ALPHA_SERVERLIST_HIGHPING     0.4
+COLOR_SERVERLIST_HIGHPING     '0.98 0.08 0.08'
+COLOR_SERVERLIST_LOWPING      '0.08 0.98 0.08'
+COLOR_SERVERLIST_MEDPING      '0.98 0.76 0.08'
+
+// skinlist
+COLOR_SKINLIST_AUTHOR         '0.56 0.72 0.86'
+COLOR_SKINLIST_TITLE          '0.96 0.99 1'
+
+// scrollbar
+COLOR_SCROLLBAR_C             '1 1 1'
+COLOR_SCROLLBAR_F             '1 1 1'
+COLOR_SCROLLBAR_N             '1 1 1'
+COLOR_SCROLLBAR_S             '1 1 1'
+WIDTH_SCROLLBAR               16
+
+// slider
+COLOR_SLIDER_C                '1 1 1'
+COLOR_SLIDER_D                '1 1 1'
+COLOR_SLIDER_F                '1 1 1'
+COLOR_SLIDER_N                '1 1 1'
+COLOR_SLIDER_S                '1 1 1'
+TOLERANCE_SLIDER              '0.2 2 0'
+WIDTH_SLIDERTEXT              0.333333333333
+
+// tooltip
+ALPHA_TOOLTIP                 0.8
+COLOR_TOOLTIP                 '1 0.97 0.94'
+AVOID_TOOLTIP                 '8 8 0'
+BORDER_TOOLTIP                '16 16 0'
+MARGIN_TOOLTIP                '10 8 0'
+WIDTH_TOOLTIP                 0.3
diff --git a/gfx/menu/luma/slider_c.tga b/gfx/menu/luma/slider_c.tga
new file mode 100644 (file)
index 0000000..8471b32
Binary files /dev/null and b/gfx/menu/luma/slider_c.tga differ
diff --git a/gfx/menu/luma/slider_d.tga b/gfx/menu/luma/slider_d.tga
new file mode 100644 (file)
index 0000000..c264fee
Binary files /dev/null and b/gfx/menu/luma/slider_d.tga differ
diff --git a/gfx/menu/luma/slider_f.tga b/gfx/menu/luma/slider_f.tga
new file mode 100644 (file)
index 0000000..6ff2687
Binary files /dev/null and b/gfx/menu/luma/slider_f.tga differ
diff --git a/gfx/menu/luma/slider_n.tga b/gfx/menu/luma/slider_n.tga
new file mode 100644 (file)
index 0000000..2ee36af
Binary files /dev/null and b/gfx/menu/luma/slider_n.tga differ
diff --git a/gfx/menu/luma/slider_s.tga b/gfx/menu/luma/slider_s.tga
new file mode 100644 (file)
index 0000000..e5b7141
Binary files /dev/null and b/gfx/menu/luma/slider_s.tga differ
diff --git a/gfx/menu/luma/tooltip.tga b/gfx/menu/luma/tooltip.tga
new file mode 100644 (file)
index 0000000..32ea27c
Binary files /dev/null and b/gfx/menu/luma/tooltip.tga differ
diff --git a/gfx/menu/luminos/icon_mod_instagib.tga b/gfx/menu/luminos/icon_mod_instagib.tga
new file mode 100644 (file)
index 0000000..518fd79
Binary files /dev/null and b/gfx/menu/luminos/icon_mod_instagib.tga differ
diff --git a/gfx/menu/wickedx/icon_mod_instagib.tga b/gfx/menu/wickedx/icon_mod_instagib.tga
new file mode 100644 (file)
index 0000000..518fd79
Binary files /dev/null and b/gfx/menu/wickedx/icon_mod_instagib.tga differ
diff --git a/gfx/menu/xaw/icon_mod_instagib.tga b/gfx/menu/xaw/icon_mod_instagib.tga
new file mode 100644 (file)
index 0000000..518fd79
Binary files /dev/null and b/gfx/menu/xaw/icon_mod_instagib.tga differ
diff --git a/hud_luma.cfg b/hud_luma.cfg
new file mode 100644 (file)
index 0000000..4f80150
--- /dev/null
@@ -0,0 +1,312 @@
+seta hud_skin "luma"
+seta hud_panel_bg "0"
+seta hud_panel_bg_color "0 0.14 0.25"
+seta hud_panel_bg_color_team "1"
+seta hud_panel_bg_alpha "1"
+seta hud_panel_bg_border "2"
+seta hud_panel_bg_padding "3"
+seta hud_panel_fg_alpha "1"
+
+seta hud_dock "0"
+seta hud_dock_color "0 0 0"
+seta hud_dock_color_team "1"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha "0.600000"
+seta hud_progressbar_health_color "0.83 0.12 0"
+seta hud_progressbar_armor_color "0.28 0.8 0"
+seta hud_progressbar_fuel_color "0.77 0.67 0"
+seta hud_progressbar_strength_color "0.86 0.35 0"
+seta hud_progressbar_shield_color "0.28 0.8 0"
+seta hud_progressbar_superweapons_color "0.77 0.67 0"
+seta hud_progressbar_nexball_color "0.2 0.65 0.93"
+seta hud_progressbar_speed_color "0.77 0.67 0"
+seta hud_progressbar_acceleration_color "0.2 0.65 0.93"
+seta hud_progressbar_acceleration_neg_color "0.86 0.35 0"
+
+seta _hud_panelorder "15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 "
+
+seta hud_configure_grid "1"
+seta hud_configure_grid_xsize "0.005000"
+seta hud_configure_grid_ysize "0.005000"
+
+seta hud_panel_weapons 1
+seta hud_panel_weapons_pos "0.965000 0.120000"
+seta hud_panel_weapons_size "0.035000 0.770000"
+seta hud_panel_weapons_bg "border_default_east"
+seta hud_panel_weapons_bg_color ""
+seta hud_panel_weapons_bg_color_team ""
+seta hud_panel_weapons_bg_alpha ""
+seta hud_panel_weapons_bg_border ""
+seta hud_panel_weapons_bg_padding "0"
+seta hud_panel_weapons_accuracy "0"
+seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.3"
+seta hud_panel_weapons_complainbubble "1"
+seta hud_panel_weapons_complainbubble_padding "0"
+seta hud_panel_weapons_complainbubble_time "0"
+seta hud_panel_weapons_complainbubble_fadetime "1"
+seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0.11 0"
+seta hud_panel_weapons_complainbubble_color_donthave "0.88 0.75 0"
+seta hud_panel_weapons_complainbubble_color_unavailable "0 0.71 1"
+seta hud_panel_weapons_ammo "0"
+seta hud_panel_weapons_ammo_color "0.58 1 0.04"
+seta hud_panel_weapons_ammo_alpha "1"
+seta hud_panel_weapons_aspect "1"
+seta hud_panel_weapons_timeout "1"
+seta hud_panel_weapons_timeout_effect "1"
+seta hud_panel_weapons_timeout_fadebgmin "0.4"
+seta hud_panel_weapons_timeout_fadefgmin "0.4"
+seta hud_panel_weapons_timeout_speed_in "0.25"
+seta hud_panel_weapons_timeout_speed_out "0.75"
+seta hud_panel_weapons_onlyowned "1"
+
+seta hud_panel_ammo 1
+seta hud_panel_ammo_pos "0.330000 0.865000"
+seta hud_panel_ammo_size "0.340000 0.060000"
+seta hud_panel_ammo_bg "border_tab_south"
+seta hud_panel_ammo_bg_color ""
+seta hud_panel_ammo_bg_color_team ""
+seta hud_panel_ammo_bg_alpha ""
+seta hud_panel_ammo_bg_border ""
+seta hud_panel_ammo_bg_padding "4"
+seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_noncurrent_alpha "0.6"
+seta hud_panel_ammo_noncurrent_scale "0.4"
+seta hud_panel_ammo_iconalign "0"
+seta hud_panel_ammo_progressbar "0"
+seta hud_panel_ammo_progressbar_name "progressbar"
+seta hud_panel_ammo_progressbar_xoffset "0"
+seta hud_panel_ammo_text "1"
+
+seta hud_panel_powerups 1
+seta hud_panel_powerups_pos "0 0.270000"
+seta hud_panel_powerups_size "0.040000 0.415000"
+seta hud_panel_powerups_bg "border_default_west"
+seta hud_panel_powerups_bg_color ""
+seta hud_panel_powerups_bg_color_team ""
+seta hud_panel_powerups_bg_alpha ""
+seta hud_panel_powerups_bg_border ""
+seta hud_panel_powerups_bg_padding "2"
+seta hud_panel_powerups_flip "1"
+seta hud_panel_powerups_iconalign "1"
+seta hud_panel_powerups_baralign "1"
+seta hud_panel_powerups_progressbar "1"
+seta hud_panel_powerups_progressbar_strength "progressbar"
+seta hud_panel_powerups_progressbar_shield "progressbar"
+seta hud_panel_powerups_progressbar_superweapons "progressbar"
+seta hud_panel_powerups_text "1"
+
+seta hud_panel_healtharmor 1
+seta hud_panel_healtharmor_pos "0.300000 0.925000"
+seta hud_panel_healtharmor_size "0.400000 0.070000"
+seta hud_panel_healtharmor_bg "border_default_south"
+seta hud_panel_healtharmor_bg_color ""
+seta hud_panel_healtharmor_bg_color_team ""
+seta hud_panel_healtharmor_bg_alpha ""
+seta hud_panel_healtharmor_bg_border "4"
+seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_flip "0"
+seta hud_panel_healtharmor_iconalign "3"
+seta hud_panel_healtharmor_baralign "3"
+seta hud_panel_healtharmor_progressbar "1"
+seta hud_panel_healtharmor_progressbar_health "progressbar"
+seta hud_panel_healtharmor_progressbar_armor "progressbar"
+seta hud_panel_healtharmor_progressbar_gfx "1"
+seta hud_panel_healtharmor_progressbar_gfx_smooth "2"
+seta hud_panel_healtharmor_text "1"
+
+seta hud_panel_notify 1
+seta hud_panel_notify_pos "0.730000 0.800000"
+seta hud_panel_notify_size "0.265000 0.200000"
+seta hud_panel_notify_bg "0"
+seta hud_panel_notify_bg_color ""
+seta hud_panel_notify_bg_color_team ""
+seta hud_panel_notify_bg_alpha ""
+seta hud_panel_notify_bg_border ""
+seta hud_panel_notify_bg_padding ""
+seta hud_panel_notify_flip "0"
+seta hud_panel_notify_fontsize "0.8"
+seta hud_panel_notify_time "10"
+seta hud_panel_notify_fadetime "3"
+seta hud_panel_notify_icon_aspect "1"
+
+seta hud_panel_timer 1
+seta hud_panel_timer_pos "0.456000 0"
+seta hud_panel_timer_size "0.088000 0.030000"
+seta hud_panel_timer_bg "border_plain_north"
+seta hud_panel_timer_bg_color ""
+seta hud_panel_timer_bg_color_team ""
+seta hud_panel_timer_bg_alpha ""
+seta hud_panel_timer_bg_border ""
+seta hud_panel_timer_bg_padding "0"
+seta hud_panel_timer_increment "0"
+
+seta hud_panel_radar 1
+seta hud_panel_radar_pos "0 0"
+seta hud_panel_radar_size "0.200000 0.250000"
+seta hud_panel_radar_bg "border_corner_northwest"
+seta hud_panel_radar_bg_color ""
+seta hud_panel_radar_bg_color_team ""
+seta hud_panel_radar_bg_alpha ""
+seta hud_panel_radar_bg_border ""
+seta hud_panel_radar_bg_padding "1"
+seta hud_panel_radar_foreground_alpha "1"
+seta hud_panel_radar_rotation "0"
+seta hud_panel_radar_zoommode "0"
+seta hud_panel_radar_scale "8192"
+seta hud_panel_radar_maximized_scale "5120"
+seta hud_panel_radar_maximized_size "0.5 0.5"
+seta hud_panel_radar_maximized_rotation "1"
+seta hud_panel_radar_maximized_zoommode "3"
+
+seta hud_panel_score 1
+seta hud_panel_score_pos "0.880000 0"
+seta hud_panel_score_size "0.120000 0.080000"
+seta hud_panel_score_bg "border_corner_northeast"
+seta hud_panel_score_bg_color ""
+seta hud_panel_score_bg_color_team ""
+seta hud_panel_score_bg_alpha ""
+seta hud_panel_score_bg_border ""
+seta hud_panel_score_bg_padding "1"
+seta hud_panel_score_rankings "1"
+
+seta hud_panel_racetimer 1
+seta hud_panel_racetimer_pos "0.360000 0.110000"
+seta hud_panel_racetimer_size "0.280000 0.090000"
+seta hud_panel_racetimer_bg "0"
+seta hud_panel_racetimer_bg_color ""
+seta hud_panel_racetimer_bg_color_team ""
+seta hud_panel_racetimer_bg_alpha ""
+seta hud_panel_racetimer_bg_border ""
+seta hud_panel_racetimer_bg_padding ""
+
+seta hud_panel_vote 1
+seta hud_panel_vote_pos "0.740000 0.690000"
+seta hud_panel_vote_size "0.190000 0.090000"
+seta hud_panel_vote_bg " "
+seta hud_panel_vote_bg_color ""
+seta hud_panel_vote_bg_color_team ""
+seta hud_panel_vote_bg_alpha ""
+seta hud_panel_vote_bg_border ""
+seta hud_panel_vote_bg_padding ""
+seta hud_panel_vote_alreadyvoted_alpha "0.700000"
+
+seta hud_panel_modicons 1
+seta hud_panel_modicons_pos "0.370000 0.030000"
+seta hud_panel_modicons_size "0.260000 0.07000"
+seta hud_panel_modicons_bg "border_fading_north"
+seta hud_panel_modicons_bg_color ""
+seta hud_panel_modicons_bg_color_team ""
+seta hud_panel_modicons_bg_alpha ""
+seta hud_panel_modicons_bg_border "4"
+seta hud_panel_modicons_bg_padding "0"
+seta hud_panel_modicons_ca_layout "1"
+seta hud_panel_modicons_dom_layout "1"
+seta hud_panel_modicons_freezetag_layout "1"
+
+seta hud_panel_pressedkeys 1
+seta hud_panel_pressedkeys_pos "0.445000 0.730000"
+seta hud_panel_pressedkeys_size "0.110000 0.090000"
+seta hud_panel_pressedkeys_bg " "
+seta hud_panel_pressedkeys_bg_color ""
+seta hud_panel_pressedkeys_bg_color_team ""
+seta hud_panel_pressedkeys_bg_alpha ""
+seta hud_panel_pressedkeys_bg_border ""
+seta hud_panel_pressedkeys_bg_padding "1"
+seta hud_panel_pressedkeys_aspect "1.600000"
+seta hud_panel_pressedkeys_attack "0"
+
+seta hud_panel_chat 1
+seta hud_panel_chat_pos "0.010000 0.700000"
+seta hud_panel_chat_size "0.460000 0.190000"
+seta hud_panel_chat_bg "0"
+seta hud_panel_chat_bg_color ""
+seta hud_panel_chat_bg_color_team ""
+seta hud_panel_chat_bg_alpha ""
+seta hud_panel_chat_bg_border ""
+seta hud_panel_chat_bg_padding ""
+
+seta hud_panel_engineinfo 0
+seta hud_panel_engineinfo_pos "0.930000 0.970000"
+seta hud_panel_engineinfo_size "0.070000 0.030000"
+seta hud_panel_engineinfo_bg "0"
+seta hud_panel_engineinfo_bg_color ""
+seta hud_panel_engineinfo_bg_color_team ""
+seta hud_panel_engineinfo_bg_alpha ""
+seta hud_panel_engineinfo_bg_border ""
+seta hud_panel_engineinfo_bg_padding ""
+seta hud_panel_engineinfo_framecounter_time "0.1"
+seta hud_panel_engineinfo_framecounter_decimals "0"
+
+seta hud_panel_infomessages 1
+seta hud_panel_infomessages_pos "0.720000 0.100000"
+seta hud_panel_infomessages_size "0.280000 0.080000"
+seta hud_panel_infomessages_bg "0"
+seta hud_panel_infomessages_bg_color ""
+seta hud_panel_infomessages_bg_color_team ""
+seta hud_panel_infomessages_bg_alpha ""
+seta hud_panel_infomessages_bg_border ""
+seta hud_panel_infomessages_bg_padding "0"
+seta hud_panel_infomessages_flip "1"
+
+seta hud_panel_physics 3
+seta hud_panel_physics_pos "0.410000 0.630000"
+seta hud_panel_physics_size "0.180000 0.080000"
+seta hud_panel_physics_bg "0"
+seta hud_panel_physics_bg_color ""
+seta hud_panel_physics_bg_color_team ""
+seta hud_panel_physics_bg_alpha "0.700000"
+seta hud_panel_physics_bg_border ""
+seta hud_panel_physics_bg_padding ""
+seta hud_panel_physics_speed_unit "1"
+seta hud_panel_physics_speed_unit_show "1"
+seta hud_panel_physics_speed_max "1800"
+seta hud_panel_physics_speed_vertical "0"
+seta hud_panel_physics_topspeed "1"
+seta hud_panel_physics_topspeed_time "4"
+seta hud_panel_physics_acceleration_max "1.5"
+seta hud_panel_physics_acceleration_vertical "0"
+seta hud_panel_physics_flip "0"
+seta hud_panel_physics_baralign "0"
+seta hud_panel_physics_progressbar "1"
+seta hud_panel_physics_acceleration_progressbar_mode "0"
+seta hud_panel_physics_acceleration_progressbar_scale "1"
+seta hud_panel_physics_acceleration_progressbar_nonlinear "0"
+seta hud_panel_physics_text "1"
+seta hud_panel_physics_text_scale "0.7"
+
+seta hud_panel_centerprint 1
+seta hud_panel_centerprint_pos "0.175000 0.220000"
+seta hud_panel_centerprint_size "0.650000 0.220000"
+seta hud_panel_centerprint_bg "0"
+seta hud_panel_centerprint_bg_color ""
+seta hud_panel_centerprint_bg_color_team ""
+seta hud_panel_centerprint_bg_alpha ""
+seta hud_panel_centerprint_bg_border ""
+seta hud_panel_centerprint_bg_padding ""
+seta hud_panel_centerprint_align "0.5"
+seta hud_panel_centerprint_flip "0"
+seta hud_panel_centerprint_fontscale "1"
+seta hud_panel_centerprint_time "3"
+seta hud_panel_centerprint_fade_in "0.2"
+seta hud_panel_centerprint_fade_out "0.5"
+seta hud_panel_centerprint_fade_subsequent "1"
+seta hud_panel_centerprint_fade_subsequent_passone "3"
+seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5"
+seta hud_panel_centerprint_fade_subsequent_passtwo "10"
+seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5"
+seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
+seta hud_panel_centerprint_fade_minfontsize "0"
+
+seta hud_panel_buffs 1
+seta hud_panel_buffs_pos "0.435000 0.840000"
+seta hud_panel_buffs_size "0.125000 0.035000"
+seta hud_panel_buffs_bg "0"
+seta hud_panel_buffs_bg_color ""
+seta hud_panel_buffs_bg_color_team ""
+seta hud_panel_buffs_bg_alpha ""
+seta hud_panel_buffs_bg_border ""
+seta hud_panel_buffs_bg_padding ""
+
+menu_sync
index a37447783d6009448e095c0bfc26a9d894aae7fe..34db2beb663e7cdf118e8cdb3814575a18529ef1 100644 (file)
@@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding "4"
 seta hud_panel_weapons_accuracy "1"
 seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.5"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "-1"
 seta hud_panel_weapons_complainbubble_time "0"
index 3128aff4f15c84140e961f7976c3d47e182a18f1..39a6fd2eddbcb8547c9be24ca5cc983ad6ac0c7c 100644 (file)
@@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding ""
 seta hud_panel_weapons_accuracy "1"
 seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.5"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "-1"
 seta hud_panel_weapons_complainbubble_time "0"
index 0f424c6f06547e643c6b26f629321f00b00d6553..4b6b7e4a74288362ce8761363045f4d2e8767042 100644 (file)
@@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding ""
 seta hud_panel_weapons_accuracy "1"
 seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.5"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "-1"
 seta hud_panel_weapons_complainbubble_time "0"
index 3ee6b927758b0c567ce856a0fb3019f580bc00b8..20650899e77de25e7e1e33d485fbeb5beb2e243f 100644 (file)
@@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding ""
 seta hud_panel_weapons_accuracy "1"
 seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.5"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "-1"
 seta hud_panel_weapons_complainbubble_time "0"
index c4aebab73900a22d3bd034984dbd58659cdc5d47..2d86881f5fa81c7827cf133718987757fd0da4df 100644 (file)
@@ -41,6 +41,7 @@ seta hud_panel_weapons_bg_border ""
 seta hud_panel_weapons_bg_padding "-5"
 seta hud_panel_weapons_accuracy "1"
 seta hud_panel_weapons_label "1"
+seta hud_panel_weapons_label_scale "0.5"
 seta hud_panel_weapons_complainbubble "1"
 seta hud_panel_weapons_complainbubble_padding "-1"
 seta hud_panel_weapons_complainbubble_time "0"
diff --git a/models/items/a_bullets_luma.iqm b/models/items/a_bullets_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/a_bullets_luma.iqm differ
diff --git a/models/items/a_bullets_luma.iqm_0.skin b/models/items/a_bullets_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..b7b9d5b
--- /dev/null
@@ -0,0 +1 @@
+Plane,a_bullets_luma
diff --git a/models/items/a_bullets_luma.tga b/models/items/a_bullets_luma.tga
new file mode 100644 (file)
index 0000000..e853857
Binary files /dev/null and b/models/items/a_bullets_luma.tga differ
diff --git a/models/items/a_cells_luma.iqm b/models/items/a_cells_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/a_cells_luma.iqm differ
diff --git a/models/items/a_cells_luma.iqm_0.skin b/models/items/a_cells_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..f7ca324
--- /dev/null
@@ -0,0 +1 @@
+Plane,a_cells_luma
diff --git a/models/items/a_cells_luma.tga b/models/items/a_cells_luma.tga
new file mode 100644 (file)
index 0000000..2ada7fd
Binary files /dev/null and b/models/items/a_cells_luma.tga differ
diff --git a/models/items/a_plasma_luma.iqm b/models/items/a_plasma_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/a_plasma_luma.iqm differ
diff --git a/models/items/a_plasma_luma.iqm_0.skin b/models/items/a_plasma_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..f7ca324
--- /dev/null
@@ -0,0 +1 @@
+Plane,a_cells_luma
diff --git a/models/items/a_plasma_luma.tga b/models/items/a_plasma_luma.tga
new file mode 100644 (file)
index 0000000..d21484c
Binary files /dev/null and b/models/items/a_plasma_luma.tga differ
diff --git a/models/items/a_rockets_luma.iqm b/models/items/a_rockets_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/a_rockets_luma.iqm differ
diff --git a/models/items/a_rockets_luma.iqm_0.skin b/models/items/a_rockets_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..8e6e85b
--- /dev/null
@@ -0,0 +1 @@
+Plane,a_rockets_luma
diff --git a/models/items/a_rockets_luma.tga b/models/items/a_rockets_luma.tga
new file mode 100644 (file)
index 0000000..dc666cc
Binary files /dev/null and b/models/items/a_rockets_luma.tga differ
diff --git a/models/items/a_shells_luma.iqm b/models/items/a_shells_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/a_shells_luma.iqm differ
diff --git a/models/items/a_shells_luma.iqm_0.skin b/models/items/a_shells_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..e320eda
--- /dev/null
@@ -0,0 +1 @@
+Plane,a_shells_luma
diff --git a/models/items/a_shells_luma.tga b/models/items/a_shells_luma.tga
new file mode 100644 (file)
index 0000000..51db9dc
Binary files /dev/null and b/models/items/a_shells_luma.tga differ
diff --git a/models/items/g_fuel_luma.iqm b/models/items/g_fuel_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_fuel_luma.iqm differ
diff --git a/models/items/g_fuel_luma.iqm_0.skin b/models/items/g_fuel_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..bbb3c6c
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_fuel_luma
diff --git a/models/items/g_fuel_luma.tga b/models/items/g_fuel_luma.tga
new file mode 100644 (file)
index 0000000..8fd4481
Binary files /dev/null and b/models/items/g_fuel_luma.tga differ
diff --git a/models/items/g_fuelregen_luma.iqm b/models/items/g_fuelregen_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_fuelregen_luma.iqm differ
diff --git a/models/items/g_fuelregen_luma.iqm_0.skin b/models/items/g_fuelregen_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..cb4ed6d
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_fuelregen_luma
diff --git a/models/items/g_fuelregen_luma.tga b/models/items/g_fuelregen_luma.tga
new file mode 100644 (file)
index 0000000..1edef47
Binary files /dev/null and b/models/items/g_fuelregen_luma.tga differ
diff --git a/models/items/g_h100_luma.iqm b/models/items/g_h100_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_h100_luma.iqm differ
diff --git a/models/items/g_h100_luma.iqm_0.skin b/models/items/g_h100_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..1d7ba82
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_h100_luma
diff --git a/models/items/g_h100_luma.tga b/models/items/g_h100_luma.tga
new file mode 100644 (file)
index 0000000..ff245d3
Binary files /dev/null and b/models/items/g_h100_luma.tga differ
diff --git a/models/items/g_h1_luma.iqm b/models/items/g_h1_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_h1_luma.iqm differ
diff --git a/models/items/g_h1_luma.iqm_0.skin b/models/items/g_h1_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..1bbdfde
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_h1_luma
diff --git a/models/items/g_h1_luma.tga b/models/items/g_h1_luma.tga
new file mode 100644 (file)
index 0000000..a058638
Binary files /dev/null and b/models/items/g_h1_luma.tga differ
diff --git a/models/items/g_h25_luma.iqm b/models/items/g_h25_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_h25_luma.iqm differ
diff --git a/models/items/g_h25_luma.iqm_0.skin b/models/items/g_h25_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..71d484e
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_h25_luma
diff --git a/models/items/g_h25_luma.tga b/models/items/g_h25_luma.tga
new file mode 100644 (file)
index 0000000..3c272d9
Binary files /dev/null and b/models/items/g_h25_luma.tga differ
diff --git a/models/items/g_h50_luma.iqm b/models/items/g_h50_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_h50_luma.iqm differ
diff --git a/models/items/g_h50_luma.iqm_0.skin b/models/items/g_h50_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..c7ab67e
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_h50_luma
diff --git a/models/items/g_h50_luma.tga b/models/items/g_h50_luma.tga
new file mode 100644 (file)
index 0000000..392a968
Binary files /dev/null and b/models/items/g_h50_luma.tga differ
diff --git a/models/items/g_invincible_luma.iqm b/models/items/g_invincible_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_invincible_luma.iqm differ
diff --git a/models/items/g_invincible_luma.iqm_0.skin b/models/items/g_invincible_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..dd336bd
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_invincible_luma
diff --git a/models/items/g_invincible_luma.tga b/models/items/g_invincible_luma.tga
new file mode 100644 (file)
index 0000000..caa1938
Binary files /dev/null and b/models/items/g_invincible_luma.tga differ
diff --git a/models/items/g_jetpack_luma.iqm b/models/items/g_jetpack_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_jetpack_luma.iqm differ
diff --git a/models/items/g_jetpack_luma.iqm_0.skin b/models/items/g_jetpack_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..7e6336b
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_jetpack_luma
diff --git a/models/items/g_jetpack_luma.tga b/models/items/g_jetpack_luma.tga
new file mode 100644 (file)
index 0000000..11d6613
Binary files /dev/null and b/models/items/g_jetpack_luma.tga differ
diff --git a/models/items/g_strength_luma.iqm b/models/items/g_strength_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/g_strength_luma.iqm differ
diff --git a/models/items/g_strength_luma.iqm_0.skin b/models/items/g_strength_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..94d2ebd
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_strength_luma
diff --git a/models/items/g_strength_luma.tga b/models/items/g_strength_luma.tga
new file mode 100644 (file)
index 0000000..938bd60
Binary files /dev/null and b/models/items/g_strength_luma.tga differ
diff --git a/models/items/item_armor_big_luma.iqm b/models/items/item_armor_big_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/item_armor_big_luma.iqm differ
diff --git a/models/items/item_armor_big_luma.iqm_0.skin b/models/items/item_armor_big_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..83eb086
--- /dev/null
@@ -0,0 +1 @@
+Plane,item_armor_big_luma
diff --git a/models/items/item_armor_big_luma.tga b/models/items/item_armor_big_luma.tga
new file mode 100644 (file)
index 0000000..73fc8af
Binary files /dev/null and b/models/items/item_armor_big_luma.tga differ
diff --git a/models/items/item_armor_large_luma.iqm b/models/items/item_armor_large_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/item_armor_large_luma.iqm differ
diff --git a/models/items/item_armor_large_luma.iqm_0.skin b/models/items/item_armor_large_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..b66a83f
--- /dev/null
@@ -0,0 +1 @@
+Plane,item_armor_large_luma
diff --git a/models/items/item_armor_large_luma.tga b/models/items/item_armor_large_luma.tga
new file mode 100644 (file)
index 0000000..10c189b
Binary files /dev/null and b/models/items/item_armor_large_luma.tga differ
diff --git a/models/items/item_armor_medium_luma.iqm b/models/items/item_armor_medium_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/item_armor_medium_luma.iqm differ
diff --git a/models/items/item_armor_medium_luma.iqm_0.skin b/models/items/item_armor_medium_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..6394bd6
--- /dev/null
@@ -0,0 +1 @@
+Plane,item_armor_medium_luma
diff --git a/models/items/item_armor_medium_luma.tga b/models/items/item_armor_medium_luma.tga
new file mode 100644 (file)
index 0000000..d39696d
Binary files /dev/null and b/models/items/item_armor_medium_luma.tga differ
diff --git a/models/items/item_armor_small_luma.iqm b/models/items/item_armor_small_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/items/item_armor_small_luma.iqm differ
diff --git a/models/items/item_armor_small_luma.iqm_0.skin b/models/items/item_armor_small_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..097d764
--- /dev/null
@@ -0,0 +1 @@
+Plane,item_armor_small_luma
diff --git a/models/items/item_armor_small_luma.tga b/models/items/item_armor_small_luma.tga
new file mode 100644 (file)
index 0000000..4cb8c16
Binary files /dev/null and b/models/items/item_armor_small_luma.tga differ
diff --git a/models/items/powerup_detonator_luma.tga b/models/items/powerup_detonator_luma.tga
new file mode 100644 (file)
index 0000000..3f1f7b0
Binary files /dev/null and b/models/items/powerup_detonator_luma.tga differ
diff --git a/models/items/powerup_invisibility_luma.tga b/models/items/powerup_invisibility_luma.tga
new file mode 100644 (file)
index 0000000..8b1e8ed
Binary files /dev/null and b/models/items/powerup_invisibility_luma.tga differ
diff --git a/models/items/powerup_resurrection_luma.tga b/models/items/powerup_resurrection_luma.tga
new file mode 100644 (file)
index 0000000..d62e5f3
Binary files /dev/null and b/models/items/powerup_resurrection_luma.tga differ
diff --git a/models/items/powerup_speed_luma.tga b/models/items/powerup_speed_luma.tga
new file mode 100644 (file)
index 0000000..fb9c59b
Binary files /dev/null and b/models/items/powerup_speed_luma.tga differ
diff --git a/models/items/powerup_superweapon_luma.tga b/models/items/powerup_superweapon_luma.tga
new file mode 100644 (file)
index 0000000..35ce8fe
Binary files /dev/null and b/models/items/powerup_superweapon_luma.tga differ
diff --git a/models/items/powerup_ultrahealing_luma.tga b/models/items/powerup_ultrahealing_luma.tga
new file mode 100644 (file)
index 0000000..06bff58
Binary files /dev/null and b/models/items/powerup_ultrahealing_luma.tga differ
diff --git a/models/items/powerup_xray_luma.tga b/models/items/powerup_xray_luma.tga
new file mode 100644 (file)
index 0000000..13029fd
Binary files /dev/null and b/models/items/powerup_xray_luma.tga differ
diff --git a/models/weapons/g_arc_luma.iqm b/models/weapons/g_arc_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_arc_luma.iqm differ
diff --git a/models/weapons/g_arc_luma.iqm_0.skin b/models/weapons/g_arc_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..8ca81c1
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_arc_luma
diff --git a/models/weapons/g_arc_luma.tga b/models/weapons/g_arc_luma.tga
new file mode 100644 (file)
index 0000000..b899eda
Binary files /dev/null and b/models/weapons/g_arc_luma.tga differ
diff --git a/models/weapons/g_campingrifle_luma.iqm b/models/weapons/g_campingrifle_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_campingrifle_luma.iqm differ
diff --git a/models/weapons/g_campingrifle_luma.iqm_0.skin b/models/weapons/g_campingrifle_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..3900fba
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_campingrifle_luma
diff --git a/models/weapons/g_campingrifle_luma.tga b/models/weapons/g_campingrifle_luma.tga
new file mode 100644 (file)
index 0000000..5f8e135
Binary files /dev/null and b/models/weapons/g_campingrifle_luma.tga differ
diff --git a/models/weapons/g_crylink_luma.iqm b/models/weapons/g_crylink_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_crylink_luma.iqm differ
diff --git a/models/weapons/g_crylink_luma.iqm_0.skin b/models/weapons/g_crylink_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..21c15c9
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_crylink_luma
diff --git a/models/weapons/g_crylink_luma.tga b/models/weapons/g_crylink_luma.tga
new file mode 100644 (file)
index 0000000..fa69694
Binary files /dev/null and b/models/weapons/g_crylink_luma.tga differ
diff --git a/models/weapons/g_electro_luma.iqm b/models/weapons/g_electro_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_electro_luma.iqm differ
diff --git a/models/weapons/g_electro_luma.iqm_0.skin b/models/weapons/g_electro_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..7aff393
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_electro_luma
diff --git a/models/weapons/g_electro_luma.tga b/models/weapons/g_electro_luma.tga
new file mode 100644 (file)
index 0000000..c25186b
Binary files /dev/null and b/models/weapons/g_electro_luma.tga differ
diff --git a/models/weapons/g_fireball_luma.iqm b/models/weapons/g_fireball_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_fireball_luma.iqm differ
diff --git a/models/weapons/g_fireball_luma.iqm_0.skin b/models/weapons/g_fireball_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..070c2c8
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_fireball_luma
diff --git a/models/weapons/g_fireball_luma.tga b/models/weapons/g_fireball_luma.tga
new file mode 100644 (file)
index 0000000..a7f94a3
Binary files /dev/null and b/models/weapons/g_fireball_luma.tga differ
diff --git a/models/weapons/g_gl_luma.iqm b/models/weapons/g_gl_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_gl_luma.iqm differ
diff --git a/models/weapons/g_gl_luma.iqm_0.skin b/models/weapons/g_gl_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..2356bb6
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_gl_luma
diff --git a/models/weapons/g_gl_luma.tga b/models/weapons/g_gl_luma.tga
new file mode 100644 (file)
index 0000000..4e0ac91
Binary files /dev/null and b/models/weapons/g_gl_luma.tga differ
diff --git a/models/weapons/g_hagar_luma.iqm b/models/weapons/g_hagar_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_hagar_luma.iqm differ
diff --git a/models/weapons/g_hagar_luma.iqm_0.skin b/models/weapons/g_hagar_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..5b413ba
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_hagar_luma
diff --git a/models/weapons/g_hagar_luma.tga b/models/weapons/g_hagar_luma.tga
new file mode 100644 (file)
index 0000000..1a98060
Binary files /dev/null and b/models/weapons/g_hagar_luma.tga differ
diff --git a/models/weapons/g_hlac_luma.iqm b/models/weapons/g_hlac_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_hlac_luma.iqm differ
diff --git a/models/weapons/g_hlac_luma.iqm_0.skin b/models/weapons/g_hlac_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..13be3f2
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_hlac_luma
diff --git a/models/weapons/g_hlac_luma.tga b/models/weapons/g_hlac_luma.tga
new file mode 100644 (file)
index 0000000..0e938ad
Binary files /dev/null and b/models/weapons/g_hlac_luma.tga differ
diff --git a/models/weapons/g_hookgun_luma.iqm b/models/weapons/g_hookgun_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_hookgun_luma.iqm differ
diff --git a/models/weapons/g_hookgun_luma.iqm_0.skin b/models/weapons/g_hookgun_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..76f5a36
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_hookgun_luma
diff --git a/models/weapons/g_hookgun_luma.tga b/models/weapons/g_hookgun_luma.tga
new file mode 100644 (file)
index 0000000..4ce22fb
Binary files /dev/null and b/models/weapons/g_hookgun_luma.tga differ
diff --git a/models/weapons/g_laser_luma.iqm b/models/weapons/g_laser_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_laser_luma.iqm differ
diff --git a/models/weapons/g_laser_luma.iqm_0.skin b/models/weapons/g_laser_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..7f433fb
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_laser_luma
diff --git a/models/weapons/g_laser_luma.tga b/models/weapons/g_laser_luma.tga
new file mode 100644 (file)
index 0000000..6c9d426
Binary files /dev/null and b/models/weapons/g_laser_luma.tga differ
diff --git a/models/weapons/g_minelayer_luma.iqm b/models/weapons/g_minelayer_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_minelayer_luma.iqm differ
diff --git a/models/weapons/g_minelayer_luma.iqm_0.skin b/models/weapons/g_minelayer_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..899a087
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_minelayer_luma
diff --git a/models/weapons/g_minelayer_luma.tga b/models/weapons/g_minelayer_luma.tga
new file mode 100644 (file)
index 0000000..ff1e667
Binary files /dev/null and b/models/weapons/g_minelayer_luma.tga differ
diff --git a/models/weapons/g_minstanex_luma.iqm b/models/weapons/g_minstanex_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_minstanex_luma.iqm differ
diff --git a/models/weapons/g_minstanex_luma.iqm_0.skin b/models/weapons/g_minstanex_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..7085d26
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_minstanex_luma
diff --git a/models/weapons/g_minstanex_luma.tga b/models/weapons/g_minstanex_luma.tga
new file mode 100644 (file)
index 0000000..3134a16
Binary files /dev/null and b/models/weapons/g_minstanex_luma.tga differ
diff --git a/models/weapons/g_nex_luma.iqm b/models/weapons/g_nex_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_nex_luma.iqm differ
diff --git a/models/weapons/g_nex_luma.iqm_0.skin b/models/weapons/g_nex_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..c1b5ac5
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_nex_luma
diff --git a/models/weapons/g_nex_luma.tga b/models/weapons/g_nex_luma.tga
new file mode 100644 (file)
index 0000000..a116aaa
Binary files /dev/null and b/models/weapons/g_nex_luma.tga differ
diff --git a/models/weapons/g_porto_luma.iqm b/models/weapons/g_porto_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_porto_luma.iqm differ
diff --git a/models/weapons/g_porto_luma.iqm_0.skin b/models/weapons/g_porto_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..56e7858
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_porto_luma
diff --git a/models/weapons/g_porto_luma.tga b/models/weapons/g_porto_luma.tga
new file mode 100644 (file)
index 0000000..93bef14
Binary files /dev/null and b/models/weapons/g_porto_luma.tga differ
diff --git a/models/weapons/g_rl_luma.iqm b/models/weapons/g_rl_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_rl_luma.iqm differ
diff --git a/models/weapons/g_rl_luma.iqm_0.skin b/models/weapons/g_rl_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..5be56db
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_rl_luma
diff --git a/models/weapons/g_rl_luma.tga b/models/weapons/g_rl_luma.tga
new file mode 100644 (file)
index 0000000..16bd442
Binary files /dev/null and b/models/weapons/g_rl_luma.tga differ
diff --git a/models/weapons/g_seeker_luma.iqm b/models/weapons/g_seeker_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_seeker_luma.iqm differ
diff --git a/models/weapons/g_seeker_luma.iqm_0.skin b/models/weapons/g_seeker_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..74d6fc4
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_seeker_luma
diff --git a/models/weapons/g_seeker_luma.tga b/models/weapons/g_seeker_luma.tga
new file mode 100644 (file)
index 0000000..12405ee
Binary files /dev/null and b/models/weapons/g_seeker_luma.tga differ
diff --git a/models/weapons/g_shockwave_luma.iqm b/models/weapons/g_shockwave_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_shockwave_luma.iqm differ
diff --git a/models/weapons/g_shockwave_luma.iqm_0.skin b/models/weapons/g_shockwave_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..5a243ff
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_shockwave_luma
diff --git a/models/weapons/g_shockwave_luma.tga b/models/weapons/g_shockwave_luma.tga
new file mode 100644 (file)
index 0000000..74eb94e
Binary files /dev/null and b/models/weapons/g_shockwave_luma.tga differ
diff --git a/models/weapons/g_shotgun_luma.iqm b/models/weapons/g_shotgun_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_shotgun_luma.iqm differ
diff --git a/models/weapons/g_shotgun_luma.iqm_0.skin b/models/weapons/g_shotgun_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..976bca7
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_shotgun_luma
diff --git a/models/weapons/g_shotgun_luma.tga b/models/weapons/g_shotgun_luma.tga
new file mode 100644 (file)
index 0000000..2dd5e09
Binary files /dev/null and b/models/weapons/g_shotgun_luma.tga differ
diff --git a/models/weapons/g_tuba_luma.iqm b/models/weapons/g_tuba_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_tuba_luma.iqm differ
diff --git a/models/weapons/g_tuba_luma.iqm_0.skin b/models/weapons/g_tuba_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..59b0cd4
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_tuba_luma
diff --git a/models/weapons/g_tuba_luma.tga b/models/weapons/g_tuba_luma.tga
new file mode 100644 (file)
index 0000000..82785e6
Binary files /dev/null and b/models/weapons/g_tuba_luma.tga differ
diff --git a/models/weapons/g_uzi_luma.iqm b/models/weapons/g_uzi_luma.iqm
new file mode 100644 (file)
index 0000000..a5cc3e6
Binary files /dev/null and b/models/weapons/g_uzi_luma.iqm differ
diff --git a/models/weapons/g_uzi_luma.iqm_0.skin b/models/weapons/g_uzi_luma.iqm_0.skin
new file mode 100644 (file)
index 0000000..fb808bd
--- /dev/null
@@ -0,0 +1 @@
+Plane,g_uzi_luma
diff --git a/models/weapons/g_uzi_luma.tga b/models/weapons/g_uzi_luma.tga
new file mode 100644 (file)
index 0000000..8a05499
Binary files /dev/null and b/models/weapons/g_uzi_luma.tga differ
index ddcf855af58d8738480f5d12cdfb6b5f4fc085bb..78e57f58b5c73e861c0e82688dd2c1c914373600 100644 (file)
@@ -102,8 +102,13 @@ seta notification_ANNCE_VOTE_ACCEPT "2" "0 = disabled, 1 = enabled if gentle mod
 seta notification_ANNCE_VOTE_CALL "2" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled"
 seta notification_ANNCE_VOTE_FAIL "2" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled"
 
-// MSG_INFO notifications (count = 244):
+// MSG_INFO notifications (count = 259):
 seta notification_INFO_CHAT_NOSPECTATORS "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_COINTOSS "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_JETPACK_NOFUEL "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_SUPERSPEC_MISSING_UID "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_CA_JOIN_LATE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_CA_LEAVE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_CTF_CAPTURE_RED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_CTF_CAPTURE_BLUE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_CTF_CAPTURE_BROKEN_RED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
@@ -301,8 +306,14 @@ seta notification_INFO_VERSION_OUTDATED "2" "0 = off, 1 = print to console, 2 =
 seta notification_INFO_WATERMARK "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ACCORDEON_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ACCORDEON_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_ARC_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_BLASTER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_BLASTER_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_CRYLINK_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_CRYLINK_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_DEVASTATOR_MURDER_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_DEVASTATOR_MURDER_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_DEVASTATOR_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ELECTRO_MURDER_BOLT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ELECTRO_MURDER_COMBO "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ELECTRO_MURDER_ORBS "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
@@ -317,38 +328,43 @@ seta notification_INFO_WEAPON_HAGAR_MURDER_SPRAY "1" "0 = off, 1 = print to cons
 seta notification_INFO_WEAPON_HAGAR_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_HLAC_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_HLAC_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_HMG_MURDER_SNIPE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_HMG_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_HOOK_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_KLEINBOTTLE_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_KLEINBOTTLE_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_LASER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_LASER_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_MACHINEGUN_MURDER_SNIPE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_MACHINEGUN_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_MINELAYER_LIMIT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_MINELAYER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_MINELAYER_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_MINSTANEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_MORTAR_MURDER_BOUNCE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_MORTAR_MURDER_EXPLODE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_MORTAR_SUICIDE_BOUNCE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_MORTAR_SUICIDE_EXPLODE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_NEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_RIFLE_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_RIFLE_MURDER_HAIL "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_RIFLE_MURDER_PIERCING "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_ROCKETLAUNCHER_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_RPC_MURDER_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_RPC_MURDER_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_RPC_SUICIDE_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_RPC_SUICIDE_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_SEEKER_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_SEEKER_MURDER_TAG "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_SEEKER_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_SHOCKWAVE_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_SHOCKWAVE_MURDER_SLAP "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_SHOTGUN_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_SHOTGUN_MURDER_SLAP "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_THINKING_WITH_PORTALS "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_TUBA_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_TUBA_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_UZI_MURDER_SNIPE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WEAPON_UZI_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_VAPORIZER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
+seta notification_INFO_WEAPON_VORTEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 
-// MSG_CENTER notifications (count = 161):
+// MSG_CENTER notifications (count = 170):
+seta notification_CENTER_ALONE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_ASSAULT_ATTACKING "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_ASSAULT_DEFENDING "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_COUNTDOWN_BEGIN "1" "0 = off, 1 = centerprint"
@@ -358,6 +374,7 @@ seta notification_CENTER_COUNTDOWN_ROUNDSTOP "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_ROUND_TIED "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_ROUND_OVER "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_CAMPCHECK "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_COINTOSS "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_CTF_CAPTURESHIELD_FREE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_CTF_CAPTURESHIELD_SHIELDED "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_CTF_CAPTURE_RED "1" "0 = off, 1 = centerprint"
@@ -474,18 +491,23 @@ seta notification_CENTER_KEYHUNT_START_BLUE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_KEYHUNT_START_YELLOW "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_KEYHUNT_START_PINK "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_KEYHUNT_WAIT "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_LMS_NOLIVES "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_MISSING_TEAMS "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_MISSING_PLAYERS "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_INSTAGIB_FINDAMMO "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_INSTAGIB_FINDAMMO_FIRST "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_INSTAGIB_LIVES_REMAINING "1" "0 = off, 1 = centerprint"
-seta notification_CENTER_INSTAGIB_SECONDARY "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_MOTD "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_NIX_COUNTDOWN "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_NIX_NEWWEAPON "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_NADE "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_ONS_NOTSHIELDED "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_OVERTIME_FRAG "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_OVERTIME_CONTROLPOINT "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_OVERTIME_TIME "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_PORTO_CREATED_IN "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_PORTO_CREATED_OUT "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_PORTO_FAILED "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_POWERDOWN_INVISIBILITY "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_POWERDOWN_SHIELD "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_POWERDOWN_SPEED "1" "0 = off, 1 = centerprint"
@@ -495,6 +517,7 @@ seta notification_CENTER_POWERUP_SHIELD "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_POWERUP_SPEED "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_POWERUP_STRENGTH "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_RACE_FINISHLAP "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_SECONDARY_NODAMAGE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_SEQUENCE_COMPLETED "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_SEQUENCE_COUNTER "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_SEQUENCE_COUNTER_FEWMORE "1" "0 = off, 1 = centerprint"
@@ -510,8 +533,9 @@ seta notification_CENTER_TEAMCHANGE_SPECTATE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_TEAMCHANGE_SUICIDE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_TIMEOUT_BEGINNING "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_TIMEOUT_ENDING "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_WEAPON_MINELAYER_LIMIT "1" "0 = off, 1 = centerprint"
 
-// MSG_MULTI notifications (count = 141):
+// MSG_MULTI notifications (count = 152):
 seta notification_DEATH_MURDER_CHEAT "1" "Enable this multiple notification"
 seta notification_DEATH_MURDER_DROWN "1" "Enable this multiple notification"
 seta notification_DEATH_MURDER_FALL "1" "Enable this multiple notification"
@@ -603,12 +627,19 @@ seta notification_ITEM_WEAPON_GOT "1" "Enable this multiple notification"
 seta notification_ITEM_WEAPON_NOAMMO "1" "Enable this multiple notification"
 seta notification_ITEM_WEAPON_PRIMORSEC "1" "Enable this multiple notification"
 seta notification_ITEM_WEAPON_UNAVAILABLE "1" "Enable this multiple notification"
+seta notification_MULTI_COINTOSS "1" "Enable this multiple notification"
 seta notification_MULTI_COUNTDOWN_BEGIN "1" "Enable this multiple notification"
 seta notification_MULTI_INSTAGIB_FINDAMMO "1" "Enable this multiple notification"
 seta notification_WEAPON_ACCORDEON_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_ACCORDEON_SUICIDE "1" "Enable this multiple notification"
+seta notification_WEAPON_ARC_MURDER "1" "Enable this multiple notification"
+seta notification_WEAPON_BLASTER_MURDER "1" "Enable this multiple notification"
+seta notification_WEAPON_BLASTER_SUICIDE "1" "Enable this multiple notification"
 seta notification_WEAPON_CRYLINK_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_CRYLINK_SUICIDE "1" "Enable this multiple notification"
+seta notification_WEAPON_DEVASTATOR_MURDER_DIRECT "1" "Enable this multiple notification"
+seta notification_WEAPON_DEVASTATOR_MURDER_SPLASH "1" "Enable this multiple notification"
+seta notification_WEAPON_DEVASTATOR_SUICIDE "1" "Enable this multiple notification"
 seta notification_WEAPON_ELECTRO_MURDER_BOLT "1" "Enable this multiple notification"
 seta notification_WEAPON_ELECTRO_MURDER_COMBO "1" "Enable this multiple notification"
 seta notification_WEAPON_ELECTRO_MURDER_ORBS "1" "Enable this multiple notification"
@@ -623,36 +654,40 @@ seta notification_WEAPON_HAGAR_MURDER_SPRAY "1" "Enable this multiple notificati
 seta notification_WEAPON_HAGAR_SUICIDE "1" "Enable this multiple notification"
 seta notification_WEAPON_HLAC_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_HLAC_SUICIDE "1" "Enable this multiple notification"
+seta notification_WEAPON_HMG_MURDER_SNIPE "1" "Enable this multiple notification"
+seta notification_WEAPON_HMG_MURDER_SPRAY "1" "Enable this multiple notification"
 seta notification_WEAPON_HOOK_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_KLEINBOTTLE_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_KLEINBOTTLE_SUICIDE "1" "Enable this multiple notification"
-seta notification_WEAPON_LASER_MURDER "1" "Enable this multiple notification"
-seta notification_WEAPON_LASER_SUICIDE "1" "Enable this multiple notification"
+seta notification_WEAPON_MACHINEGUN_MURDER_SNIPE "1" "Enable this multiple notification"
+seta notification_WEAPON_MACHINEGUN_MURDER_SPRAY "1" "Enable this multiple notification"
+seta notification_WEAPON_MINELAYER_LIMIT "1" "Enable this multiple notification"
 seta notification_WEAPON_MINELAYER_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_MINELAYER_SUICIDE "1" "Enable this multiple notification"
-seta notification_WEAPON_MINSTANEX_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_MORTAR_MURDER_BOUNCE "1" "Enable this multiple notification"
 seta notification_WEAPON_MORTAR_MURDER_EXPLODE "1" "Enable this multiple notification"
 seta notification_WEAPON_MORTAR_SUICIDE_BOUNCE "1" "Enable this multiple notification"
 seta notification_WEAPON_MORTAR_SUICIDE_EXPLODE "1" "Enable this multiple notification"
-seta notification_WEAPON_NEX_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_RIFLE_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_RIFLE_MURDER_HAIL "1" "Enable this multiple notification"
 seta notification_WEAPON_RIFLE_MURDER_HAIL_PIERCING "1" "Enable this multiple notification"
 seta notification_WEAPON_RIFLE_MURDER_PIERCING "1" "Enable this multiple notification"
-seta notification_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT "1" "Enable this multiple notification"
-seta notification_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH "1" "Enable this multiple notification"
-seta notification_WEAPON_ROCKETLAUNCHER_SUICIDE "1" "Enable this multiple notification"
+seta notification_WEAPON_RPC_MURDER_DIRECT "1" "Enable this multiple notification"
+seta notification_WEAPON_RPC_MURDER_SPLASH "1" "Enable this multiple notification"
+seta notification_WEAPON_RPC_SUICIDE_DIRECT "1" "Enable this multiple notification"
+seta notification_WEAPON_RPC_SUICIDE_SPLASH "1" "Enable this multiple notification"
 seta notification_WEAPON_SEEKER_MURDER_SPRAY "1" "Enable this multiple notification"
 seta notification_WEAPON_SEEKER_MURDER_TAG "1" "Enable this multiple notification"
 seta notification_WEAPON_SEEKER_SUICIDE "1" "Enable this multiple notification"
+seta notification_WEAPON_SHOCKWAVE_MURDER "1" "Enable this multiple notification"
+seta notification_WEAPON_SHOCKWAVE_MURDER_SLAP "1" "Enable this multiple notification"
 seta notification_WEAPON_SHOTGUN_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_SHOTGUN_MURDER_SLAP "1" "Enable this multiple notification"
 seta notification_WEAPON_THINKING_WITH_PORTALS "1" "Enable this multiple notification"
 seta notification_WEAPON_TUBA_MURDER "1" "Enable this multiple notification"
 seta notification_WEAPON_TUBA_SUICIDE "1" "Enable this multiple notification"
-seta notification_WEAPON_UZI_MURDER_SNIPE "1" "Enable this multiple notification"
-seta notification_WEAPON_UZI_MURDER_SPRAY "1" "Enable this multiple notification"
+seta notification_WEAPON_VAPORIZER_MURDER "1" "Enable this multiple notification"
+seta notification_WEAPON_VORTEX_MURDER "1" "Enable this multiple notification"
 
 // MSG_CHOICE notifications (count = 12):
 seta notification_CHOICE_CTF_CAPTURE_BROKEN_RED "1" "Choice for this notification 0 = off, 1 = default message, 2 = verbose message"
@@ -697,4 +732,4 @@ seta notification_show_sprees_info "3" "Show spree information in MSG_INFO messa
 seta notification_show_sprees_info_newline "1" "Show attacker spree information for MSG_INFO messages on a separate line than the death notification itself"
 seta notification_show_sprees_info_specialonly "1" "Don't show attacker spree information in MSG_INFO messages if it isn't an achievement"
 
-// Notification counts (total = 647): MSG_ANNCE = 89, MSG_INFO = 244, MSG_CENTER = 161, MSG_MULTI = 141, MSG_CHOICE = 12
+// Notification counts (total = 682): MSG_ANNCE = 89, MSG_INFO = 259, MSG_CENTER = 170, MSG_MULTI = 152, MSG_CHOICE = 12
index 35077496911a9ea8f8f56664068d3cd06437e3f0..f49b847d69d05c2a3bd8fecca9d932fe7ec95cc6 100644 (file)
@@ -27,6 +27,7 @@ void Announcer_Countdown()
        }
        else // countdown is still going
        {
+               // if concomitant countdown to round start overrides countdown to game start
                if(roundstarttime == starttime)
                {
                        Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
@@ -59,9 +60,6 @@ void Announcer_Gamestart()
 
        if(previous_game_starttime != startTime)
        {
-               if((time + 5.0) < startTime) // if connecting to server while restart was active don't always play prepareforbattle
-                       Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
-
                if(time < startTime)
                {
                        entity e = find(world, classname, "announcer_countdown");
@@ -71,6 +69,11 @@ void Announcer_Gamestart()
                                e.classname = "announcer_countdown";
                                e.think = Announcer_Countdown;
                        }
+
+                       if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
+                       if(time > e.nextthink) // don't play it again if countdown was already going
+                               Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+
                        e.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
                }
        }
index 8215b9faf2aeddfe7057eede883513cbc258a4c7..1355bafe7687ffddf316a450a79e01c00ab070ac 100644 (file)
@@ -347,6 +347,7 @@ float autocvar_hud_panel_weapons_complainbubble_fadetime;
 float autocvar_hud_panel_weapons_complainbubble_padding;
 float autocvar_hud_panel_weapons_complainbubble_time;
 float autocvar_hud_panel_weapons_label;
+float autocvar_hud_panel_weapons_label_scale = 0.5;
 float autocvar_hud_panel_weapons_onlyowned;
 float autocvar_hud_panel_weapons_timeout;
 float autocvar_hud_panel_weapons_timeout_effect;
index 9e6861ebd06e7d05a4a0fabfc4c305dc4433c3c3..413f05cff777619ed13c8202355d5f037bf4ee34 100644 (file)
@@ -415,7 +415,7 @@ void HUD_Weapons(void)
        float i, f, a;
        float screen_ar, center_x = 0, center_y;
        float weapon_count, weapon_id;
-       float row, column, rows = 0, columns;
+       float row, column, rows = 0, columns = 0;
        float aspect = autocvar_hud_panel_weapons_aspect;
 
        float panel_weapon_accuracy;
@@ -433,7 +433,7 @@ void HUD_Weapons(void)
        float fadetime = max(0, autocvar_hud_panel_weapons_complainbubble_fadetime);
 
        vector weapon_pos, weapon_size = '0 0 0';
-       local noref vector old_panel_size; // fteqcc sucks
+       local noref vector max_panel_size; // fteqcc sucks
        vector color;
 
        // check to see if we want to continue
@@ -519,38 +519,41 @@ void HUD_Weapons(void)
                        return;
                }
 
-               old_panel_size = panel_size;
-               if(panel_bg_padding)
-                       old_panel_size -= '2 2 0' * panel_bg_padding;
+               max_panel_size = panel_size - '2 2 0' * panel_bg_padding;
 
-               // first find values for the standard table (with all the weapons)
-               rows = old_panel_size_y/old_panel_size_x;
-               rows = bound(1, floor((sqrt(4 * aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
-               columns = ceil(WEP_COUNT/rows);
-               weapon_size_x = old_panel_size_x / columns;
-               weapon_size_y = old_panel_size_y / rows;
-
-               // change table values to include only the owned weapons
-               float columns_save = columns;
-               if(weapon_count <= rows)
+               // calculate distribution and size of table cells
+               if(max_panel_size_x > max_panel_size_y)
                {
-                       rows = weapon_count;
-                       columns = 1;
+                       while(weapon_count > columns * rows)
+                       {
+                               ++rows;
+                               columns = ceil(max_panel_size_x / (max_panel_size_y / rows * aspect));
+                       }
+
+                       weapon_size_x = max_panel_size_x / columns;
+                       weapon_size_y = max_panel_size_y / rows;
+                       columns = ceil(weapon_count / rows);
                }
                else
-                       columns = ceil(weapon_count / rows);
+               {
+                       while(weapon_count > columns * rows)
+                       {
+                               ++columns;
+                               rows = ceil(max_panel_size_y / (max_panel_size_x / columns / aspect));
+                       }
 
-               // enlarge weapon_size to match desired aspect ratio in order to capitalize on panel space
-               if(columns < columns_save)
-                       weapon_size_x = min(old_panel_size_x / columns, aspect * weapon_size_y);
+                       weapon_size_x = max_panel_size_x / columns;
+                       weapon_size_y = max_panel_size_y / rows;
+                       rows = ceil(weapon_count / columns);
+               }
 
                // reduce size of the panel
                panel_size_x = columns * weapon_size_x;
                panel_size_y = rows * weapon_size_y;
-               panel_pos_x += (old_panel_size_x - panel_size_x) / 2;
-               panel_pos_y += (old_panel_size_y - panel_size_y) / 2;
-               if(panel_bg_padding)
-                       panel_size += '2 2 0' * panel_bg_padding;
+               panel_pos_x += (max_panel_size_x - panel_size_x) / 2;
+               panel_pos_y += (max_panel_size_y - panel_size_y) / 2;
+
+               panel_size += '2 2 0' * panel_bg_padding;
        }
        else
                weapon_count = WEP_COUNT;
@@ -689,7 +692,9 @@ void HUD_Weapons(void)
        if(autocvar_hud_panel_weapons_accuracy)
                Accuracy_LoadColors();
 
+       // draw items
        row = column = 0;
+       vector label_size = '1 1 0' * min(weapon_size_x, weapon_size_y) * bound(0, autocvar_hud_panel_weapons_label_scale, 1);
        for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i)
        {
                // retrieve information about the current weapon to be drawn
@@ -734,15 +739,15 @@ void HUD_Weapons(void)
                        switch(autocvar_hud_panel_weapons_label)
                        {
                                case 1: // weapon number
-                                       drawstring(weapon_pos, ftos(weapon_id), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                                       drawstring(weapon_pos, ftos(weapon_id), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                                        break;
 
                                case 2: // bind
-                                       drawstring(weapon_pos, getcommandkey(ftos(weapon_id), strcat("weapon_group_", ftos(weapon_id))), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                                       drawstring(weapon_pos, getcommandkey(ftos(weapon_id), strcat("weapon_group_", ftos(weapon_id))), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                                        break;
 
                                case 3: // weapon name
-                                       drawstring(weapon_pos, strtolower(self.message), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                                       drawstring(weapon_pos, strtolower(self.message), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                                        break;
 
                                default: // nothing
@@ -2910,148 +2915,132 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 }
 
 // Keyhunt HUD modicon section
-float kh_runheretime;
-
-void HUD_Mod_KH_Reset(void)
-{
-       kh_runheretime = 0;
-}
+vector KH_SLOTS[4];
 
 void HUD_Mod_KH(vector pos, vector mySize)
 {
        mod_active = 1; // keyhunt should never hide the mod icons panel
-       float kh_keys;
-       float keyteam;
-       float a, aa;
-       vector p = '0 0 0', pa, kh_size = '0 0 0', kh_asize = '0 0 0';
 
-       kh_keys = getstati(STAT_KH_KEYS);
+       // Read current state
 
-       p_x = pos_x;
-       if(mySize_x > mySize_y)
-       {
-               p_y = pos_y + 0.25 * mySize_y;
-               pa = p - eY * 0.25 * mySize_y;
+       float state = getstati(STAT_KH_KEYS);
+       float i, key_state;
+       float all_keys, team1_keys, team2_keys, team3_keys, team4_keys, dropped_keys, carrying_keys;
+       all_keys = team1_keys = team2_keys = team3_keys = team4_keys = dropped_keys = carrying_keys = 0;
 
-               kh_size_x = mySize_x * 0.25;
-               kh_size_y = 0.75 * mySize_y;
-               kh_asize_x = mySize_x * 0.25;
-               kh_asize_y = mySize_y * 0.25;
-       }
-       else
+       for(i = 0; i < 4; ++i)
        {
-               p_y = pos_y + 0.125 * mySize_y;
-               pa = p - eY * 0.125 * mySize_y;
+               key_state = (bitshift(state, i * -5) & 31) - 1;
 
-               kh_size_x = mySize_x * 0.5;
-               kh_size_y = 0.375 * mySize_y;
-               kh_asize_x = mySize_x * 0.5;
-               kh_asize_y = mySize_y * 0.125;
-       }
+               if(key_state == -1)
+                       continue;
 
-       float i, key;
+               if(key_state == 30)
+               {
+                       ++carrying_keys;
+                       key_state = myteam;
+               }
 
-       float keycount;
-       keycount = 0;
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               if(keyteam == 30 && keycount <= 4)
-                       keycount += 4;
-               if(keyteam == myteam || keyteam == -1 || keyteam == 30)
-                       keycount += 1;
+               switch(key_state)
+               {
+                       case NUM_TEAM_1: ++team1_keys; break;
+                       case NUM_TEAM_2: ++team2_keys; break;
+                       case NUM_TEAM_3: ++team3_keys; break;
+                       case NUM_TEAM_4: ++team4_keys; break;
+                       case 29: ++dropped_keys; break;
+               }
+
+               ++all_keys;
        }
 
-       // this yields 8 exactly if "RUN HERE" shows
+       // Calculate slot measurements
 
-       if(keycount == 8)
+       vector slot_size;
+
+       if(all_keys == 4 && mySize_x * 0.5 < mySize_y && mySize_y * 0.5 < mySize_x)
        {
-               if(!kh_runheretime)
-                       kh_runheretime = time;
-               pa_y -= fabs(sin((time - kh_runheretime) * 3.5)) * 6; // make the arrows jump in case of RUN HERE
+               // Quadratic arrangement
+               slot_size = eX * mySize_x * 0.5 + eY * mySize_y * 0.5;
+               KH_SLOTS[0] = pos;
+               KH_SLOTS[1] = pos + eX * slot_size_x;
+               KH_SLOTS[2] = pos + eY * slot_size_y;
+               KH_SLOTS[3] = pos + eX * slot_size_x + eY * slot_size_y;
        }
        else
-               kh_runheretime = 0;
-
-       for(i = 0; i < 4; ++i)
        {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               switch(keyteam)
+               if(mySize_x > mySize_y)
                {
-                       case 30: // my key
-                               keyteam = myteam;
-                               a = 1;
-                               aa = 1;
-                               break;
-                       case -1: // no key
-                               a = 0;
-                               aa = 0;
-                               break;
-                       default: // owned or dropped
-                               a = 0.2;
-                               aa = 0.5;
-                               break;
+                       // Horizontal arrangement
+                       slot_size = eX * mySize_x / all_keys + eY * mySize_y;
+                       for(i = 0; i < all_keys; ++i)
+                               KH_SLOTS[i] = pos + eX * slot_size_x * i;
                }
-               a = a * panel_fg_alpha;
-               aa = aa * panel_fg_alpha;
-               if(a > 0)
+               else
                {
-                       switch(keyteam)
-                       {
-                               case NUM_TEAM_1:
-                                       drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               case NUM_TEAM_2:
-                                       drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               case NUM_TEAM_3:
-                                       drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               case NUM_TEAM_4:
-                                       drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               default:
-                                       break;
-                       }
-                       switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
-                       {
-                               case 0:
-                                       drawpic_aspect_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               case 1:
-                                       drawpic_aspect_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               case 2:
-                                       drawpic_aspect_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                               case 3:
-                                       drawpic_aspect_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% theAlpha key
-                                       break;
-                       }
+                       // Vertical arrangement
+                       slot_size = eX * mySize_x + eY * mySize_y / all_keys;
+                       for(i = 0; i < all_keys; ++i)
+                               KH_SLOTS[i] = pos + eY * slot_size_y * i;
                }
-               if(mySize_x > mySize_y)
+       }
+
+       // Make icons blink in case of RUN HERE
+
+       float blink = 0.6 + sin(2*M_PI*time) / 2.5; // Oscillate between 0.2 and 1
+       float alpha;
+       alpha = 1;
+
+       if(carrying_keys)
+               switch(myteam)
+               {
+                       case NUM_TEAM_1: if(team1_keys == all_keys) alpha = blink; break;
+                       case NUM_TEAM_2: if(team2_keys == all_keys) alpha = blink; break;
+                       case NUM_TEAM_3: if(team3_keys == all_keys) alpha = blink; break;
+                       case NUM_TEAM_4: if(team4_keys == all_keys) alpha = blink; break;
+               }
+
+       // Draw icons
+
+       i = 0;
+
+       while(team1_keys--)
+               if(myteam == NUM_TEAM_1 && carrying_keys)
                {
-                       p_x += 0.25 * mySize_x;
-                       pa_x += 0.25 * mySize_x;
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_red_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+                       --carrying_keys;
                }
                else
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_red_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+
+       while(team2_keys--)
+               if(myteam == NUM_TEAM_2 && carrying_keys)
                {
-                       if(i == 1)
-                       {
-                               p_y = pos_y + 0.625 * mySize_y;
-                               pa_y = pos_y + 0.5 * mySize_y;
-                               p_x = pos_x;
-                               pa_x = pos_x;
-                       }
-                       else
-                       {
-                               p_x += 0.5 * mySize_x;
-                               pa_x += 0.5 * mySize_x;
-                       }
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_blue_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+                       --carrying_keys;
                }
-       }
+               else
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_blue_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+
+       while(team3_keys--)
+               if(myteam == NUM_TEAM_3 && carrying_keys)
+               {
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_yellow_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+                       --carrying_keys;
+               }
+               else
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_yellow_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+
+       while(team4_keys--)
+               if(myteam == NUM_TEAM_4 && carrying_keys)
+               {
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_pink_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+                       --carrying_keys;
+               }
+               else
+                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_pink_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+
+       while(dropped_keys--)
+               drawpic_aspect_skin(KH_SLOTS[i++], "kh_dropped", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
 }
 
 // Keepaway HUD mod icon
@@ -4482,9 +4471,7 @@ Main HUD system
 void HUD_Reset (void)
 {
        // reset gametype specific icons
-       if(gametype == MAPINFO_TYPE_KEYHUNT)
-               HUD_Mod_KH_Reset();
-       else if(gametype == MAPINFO_TYPE_CTF)
+       if(gametype == MAPINFO_TYPE_CTF)
                HUD_Mod_CTF_Reset();
 }
 
index 78f16f88db99f7b851edc2c426cb6d960527ccee..e19e2378754b1d4052fd3ecdf9eb1195b2ca3cdf 100644 (file)
@@ -67,6 +67,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                case HUD_PANEL_WEAPONS:
                                        HUD_Write_PanelCvar_q("_accuracy");
                                        HUD_Write_PanelCvar_q("_label");
+                                       HUD_Write_PanelCvar_q("_label_scale");
                                        HUD_Write_PanelCvar_q("_complainbubble");
                                        HUD_Write_PanelCvar_q("_complainbubble_padding");
                                        HUD_Write_PanelCvar_q("_complainbubble_time");
@@ -1254,7 +1255,7 @@ void HUD_Configure_Frame()
        }
 }
 
-const float hlBorderSize = 4;
+const float hlBorderSize = 2;
 const string hlBorder = "gfx/hud/default/border_highlighted";
 const string hlBorder2 = "gfx/hud/default/border_highlighted2";
 void HUD_Panel_HlBorder(float myBorder, vector color, float theAlpha)
@@ -1280,7 +1281,7 @@ void HUD_Configure_PostDraw()
                {
                        panel = highlightedPanel;
                        HUD_Panel_UpdatePosSize()
-                       HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha));
+                       HUD_Panel_HlBorder(panel_bg_border * hlBorderSize, '0 0.5 1', 0.4 * (1 - autocvar__menu_alpha));
                }
        }
 }
index 4f11fc3ef272ed53c5763b8f420c36553e6e7b68..284d9811df50c44c98205ca041a659162079493d 100644 (file)
@@ -112,7 +112,7 @@ void register_weapon(
        e.netname = refname;
        e.message = wepname;
 
-       #ifndef MENUQC
+       #ifdef CSQC
        func(WR_INIT);
        #endif
 }
index 9f01ee3fbf08dc8c8a633916923eea028f0d14d1..857f071b2fa2d01984b99838fff9531ddbb1ac7c 100644 (file)
@@ -9,12 +9,12 @@
 #include "item/modalcontroller.c"
 #include "item/image.c"
 #include "item/label.c"
+#include "item/dialog.c"
 #include "item/button.c"
 #include "item/checkbox.c"
 #include "item/radiobutton.c"
 #include "item/borderimage.c"
 #include "item/slider.c"
-#include "item/dialog.c"
 #include "item/tab.c"
 #include "item/textslider.c"
 #include "item/listbox.c"
index c7499e58e40a8a94ba1f31f2c504f0310bb465a3..89086406699a995153b8df9a4f7e293b36945859 100644 (file)
@@ -85,7 +85,10 @@ void GameCommand(string theCommand)
                                }
                }
                else if(argc == 2 && !isdemo()) // don't allow this command in demos
+               {
+                       m_play_click_sound(MENU_SOUND_OPEN);
                        m_goto(strcat(filter, argv(1))); // switch to a menu item
+               }
                if(filter)
                        strunzone(filter);
                return;
index d055b1a051d535dbfd18736751eb2357c25003a0..d0bd40b03884c30d4e83c6727e82d89ac23019a3 100644 (file)
@@ -17,6 +17,7 @@ CLASS(Item) EXTENDS(Object)
        METHOD(Item, destroy, void(entity))
        ATTRIB(Item, focused, float, 0)
        ATTRIB(Item, focusable, float, 0)
+       ATTRIB(Item, allowFocusSound, float, 0)
        ATTRIB(Item, parent, entity, NULL)
        ATTRIB(Item, preferredFocusPriority, float, 0)
        ATTRIB(Item, origin, vector, '0 0 0')
@@ -121,6 +122,8 @@ float Item_mouseRelease(entity me, vector pos)
 
 void Item_focusEnter(entity me)
 {
+       if(me.allowFocusSound)
+               m_play_focus_sound();
 }
 
 void Item_focusLeave(entity me)
index 8bbdfa70406e125083dc6572acedf2f123aeb120..385064e5dad5315c75f0e5376d813bf83a40e94f 100644 (file)
@@ -8,7 +8,7 @@ CLASS(Button) EXTENDS(Label)
        METHOD(Button, mousePress, float(entity, vector))
        METHOD(Button, mouseDrag, float(entity, vector))
        METHOD(Button, mouseRelease, float(entity, vector))
-       METHOD(Button, focusEnter, void(entity))
+       METHOD(Button, playClickSound, void(entity))
        ATTRIB(Button, onClick, void(entity, entity), func_null)
        ATTRIB(Button, onClickEntity, entity, NULL)
        ATTRIB(Button, src, string, string_null)
@@ -18,6 +18,7 @@ CLASS(Button) EXTENDS(Label)
        ATTRIB(Button, srcMulti, float, 1) // 0: button square left, text right; 1: button stretched, text over it
        ATTRIB(Button, buttonLeftOfText, float, 0)
        ATTRIB(Button, focusable, float, 1)
+       ATTRIB(Button, allowFocusSound, float, 1)
        ATTRIB(Button, pressed, float, 0)
        ATTRIB(Button, clickTime, float, 0)
        ATTRIB(Button, disabled, float, 0)
@@ -53,6 +54,7 @@ float Button_keyDown(entity me, float key, float ascii, float shift)
 {
        if(key == K_ENTER || key == K_SPACE || key == K_KP_ENTER)
        {
+               me.playClickSound(me);
                me.clickTime = 0.1; // delayed for effect
                return 1;
        }
@@ -79,8 +81,7 @@ float Button_mouseRelease(entity me, vector pos)
        {
                if (!me.disabled)
                {
-                       if(cvar("menu_sounds"))
-                               localsound("sound/misc/menu2.wav");
+                       me.playClickSound(me);
                        if(me.onClick)
                                me.onClick(me, me.onClickEntity);
                }
@@ -92,12 +93,6 @@ void Button_showNotify(entity me)
 {
        me.focusable = !me.disabled;
 }
-void Button_focusEnter(entity me)
-{
-       if(cvar("menu_sounds") > 1)
-               localsound("sound/misc/menu1.wav");
-       SUPER(Button).focusEnter(me);
-}
 void Button_draw(entity me)
 {
        vector bOrigin, bSize;
@@ -170,4 +165,13 @@ void Button_draw(entity me)
 
        SUPER(Button).draw(me);
 }
+void Button_playClickSound(entity me)
+{
+       if(me.onClick == DialogOpenButton_Click)
+               m_play_click_sound(MENU_SOUND_OPEN);
+       else if(me.onClick == Dialog_Close)
+               m_play_click_sound(MENU_SOUND_CLOSE);
+       else
+               m_play_click_sound(MENU_SOUND_EXECUTE);
+}
 #endif
index 94f67ba709ef7422b1d0b3a76e488b1b9f8f5acf..2540cc846fdbddf80ef44a5d8f4bd022e7f1dee8 100644 (file)
@@ -3,6 +3,7 @@ void CheckBox_Click(entity me, entity other);
 CLASS(CheckBox) EXTENDS(Button)
        METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))
        METHOD(CheckBox, draw, void(entity))
+       METHOD(CheckBox, playClickSound, void(entity))
        METHOD(CheckBox, toString, string(entity))
        METHOD(CheckBox, setChecked, void(entity, float))
        ATTRIB(CheckBox, useDownAsChecked, float, 0)
@@ -45,4 +46,8 @@ void CheckBox_draw(entity me)
        me.pressed = s;
        SUPER(CheckBox).draw(me);
 }
+void CheckBox_playClickSound(entity me)
+{
+       m_play_click_sound(MENU_SOUND_SELECT);
+}
 #endif
index 383578781544e96b900cca383fc702c377945de8..f60550103423b94c869f493ad4616897b5430fef 100644 (file)
@@ -182,6 +182,7 @@ float Dialog_keyDown(entity me, float key, float ascii, float shift)
        {
                if(key == K_ESCAPE)
                {
+                       m_play_click_sound(MENU_SOUND_CLOSE);
                        me.close(me);
                        return 1;
                }
index 1c1bf5189bc34a48a824a46f132e96e79e2f83cb..7b74ade9b0180e67ea982da477198bf48b5b5366 100644 (file)
@@ -18,6 +18,7 @@ CLASS(InputBox) EXTENDS(Label)
        ATTRIB(InputBox, scrollPos, float, 0) // widths
 
        ATTRIB(InputBox, focusable, float, 1)
+       ATTRIB(InputBox, allowFocusSound, float, 1)
        ATTRIB(InputBox, disabled, float, 0)
        ATTRIB(InputBox, lastChangeTime, float, 0)
        ATTRIB(InputBox, dragScrollTimer, float, 0)
@@ -38,7 +39,6 @@ CLASS(InputBox) EXTENDS(Label)
        ATTRIB(InputBox, cb_colorF, vector, '1 1 1')
        ATTRIB(InputBox, cb_colorC, vector, '1 1 1')
 ENDCLASS(InputBox)
-void InputBox_Clear_Click(entity btn, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -66,11 +66,6 @@ void InputBox_setText(entity me, string txt)
        SUPER(InputBox).setText(me, strzone(txt));
 }
 
-void InputBox_Clear_Click(entity btn, entity me)
-{
-       me.setText(me, "");
-}
-
 float over_ClearButton(entity me, vector pos)
 {
        if (pos_x >= 1 + me.cb_offset - me.cb_width)
@@ -135,8 +130,9 @@ float InputBox_mouseRelease(entity me, vector pos)
        if(me.cb_pressed)
        if (over_ClearButton(me, pos))
        {
+               m_play_click_sound(MENU_SOUND_CLEAR);
+               me.setText(me, "");
                me.cb_pressed = 0;
-               InputBox_Clear_Click(world, me);
                return 1;
        }
        float r = InputBox_mouseDrag(me, pos);
@@ -204,7 +200,10 @@ float InputBox_keyDown(entity me, float key, float ascii, float shift)
                case K_KP_DEL:
                case K_DEL:
                        if(shift & S_CTRL)
+                       {
+                               m_play_click_sound(MENU_SOUND_CLEAR);
                                me.setText(me, "");
+                       }
                        else
                                me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1)));
                        return 1;
index d4eaab2a7b8277e51866df26756550f5c6378c8c..3466b134bd708890b490879cf607dd4c824fff9d 100644 (file)
@@ -9,6 +9,7 @@ CLASS(ListBox) EXTENDS(Item)
        METHOD(ListBox, mouseRelease, float(entity, vector))
        METHOD(ListBox, focusLeave, void(entity))
        ATTRIB(ListBox, focusable, float, 1)
+       ATTRIB(ListBox, allowFocusSound, float, 1)
        ATTRIB(ListBox, selectedItem, float, 0)
        ATTRIB(ListBox, size, vector, '0 0 0')
        ATTRIB(ListBox, origin, vector, '0 0 0')
@@ -35,8 +36,13 @@ CLASS(ListBox) EXTENDS(Item)
        ATTRIB(ListBox, itemHeight, float, 0)
        ATTRIB(ListBox, colorBG, vector, '0 0 0')
        ATTRIB(ListBox, alphaBG, float, 0)
+
+       ATTRIB(ListBox, lastClickedItem, float, -1)
+       ATTRIB(ListBox, lastClickedTime, float, 0)
+
        METHOD(ListBox, drawListBoxItem, void(entity, float, vector, float)) // item number, width/height, selected
        METHOD(ListBox, clickListBoxItem, void(entity, float, vector)) // item number, relative clickpos
+       METHOD(ListBox, doubleClickListBoxItem, void(entity, float, vector)) // item number, relative clickpos
        METHOD(ListBox, setSelected, void(entity, float))
 
        METHOD(ListBox, getLastFullyVisibleItemAtScrollPos, float(entity, float))
@@ -260,7 +266,15 @@ float ListBox_mouseRelease(entity me, vector pos)
                // and give it a nice click event
                if(me.nItems > 0)
                {
-                       me.clickListBoxItem(me, me.selectedItem, globalToBox(pos, eY * (me.getItemStart(me, me.selectedItem) - me.scrollPos), eX * (1 - me.controlWidth) + eY * me.getItemHeight(me, me.selectedItem)));
+                       vector where = globalToBox(pos, eY * (me.getItemStart(me, me.selectedItem) - me.scrollPos), eX * (1 - me.controlWidth) + eY * me.getItemHeight(me, me.selectedItem));
+
+                       if((me.selectedItem == me.lastClickedItem) && (time < me.lastClickedTime + 0.3))
+                               me.doubleClickListBoxItem(me, me.selectedItem, where);
+                       else
+                               me.clickListBoxItem(me, me.selectedItem, where);
+
+                       me.lastClickedItem = me.selectedItem;
+                       me.lastClickedTime = time;
                }
        }
        me.pressed = 0;
@@ -374,7 +388,12 @@ void ListBox_draw(entity me)
 
 void ListBox_clickListBoxItem(entity me, float i, vector where)
 {
-       // itemclick, itemclick, does whatever itemclick does
+       // template method
+}
+
+void ListBox_doubleClickListBoxItem(entity me, float i, vector where)
+{
+       // template method
 }
 
 void ListBox_drawListBoxItem(entity me, float i, vector absSize, float selected)
index ca7ab8fc3785c479c27bee31ee099268a80a3659..0adc399e0887c45a29931df8ef3fbfd4debf09e9 100644 (file)
@@ -219,6 +219,7 @@ float Nexposee_mousePress(entity me, vector pos)
                Nexposee_mouseMove(me, pos);
                if(me.mouseFocusedChild)
                {
+                       m_play_click_sound(MENU_SOUND_OPEN);
                        me.animationState = 1;
                        SUPER(Nexposee).setFocus(me, NULL);
                }
@@ -230,6 +231,7 @@ float Nexposee_mousePress(entity me, vector pos)
        {
                if (!(SUPER(Nexposee).mousePress(me, pos)))
                {
+                       m_play_click_sound(MENU_SOUND_CLOSE);
                        me.animationState = 3;
                        SUPER(Nexposee).setFocus(me, NULL);
                }
@@ -322,10 +324,12 @@ float Nexposee_keyDown(entity me, float scan, float ascii, float shift)
                        default:
                        case 0:
                        case 3:
+                               m_play_click_sound(MENU_SOUND_OPEN);
                                me.animationState = 1;
                                break;
                        case 1:
                        case 2:
+                               m_play_click_sound(MENU_SOUND_CLOSE);
                                me.animationState = 3;
                                break;
                }
index c92db27e984f84be22a86ff2ae8049d190c3d478..fb8cda906764b31effeafd48893ccc948d084188 100644 (file)
@@ -7,10 +7,10 @@ CLASS(Slider) EXTENDS(Label)
        METHOD(Slider, configureSliderValues, void(entity, float, float, float, float, float, float))
        METHOD(Slider, draw, void(entity))
        METHOD(Slider, keyDown, float(entity, float, float, float))
+       METHOD(Slider, keyUp, float(entity, float, float, float))
        METHOD(Slider, mousePress, float(entity, vector))
        METHOD(Slider, mouseDrag, float(entity, vector))
        METHOD(Slider, mouseRelease, float(entity, vector))
-       METHOD(Slider, focusEnter, void(entity))
        METHOD(Slider, valueToText, string(entity, float))
        METHOD(Slider, toString, string(entity))
        METHOD(Slider, setValue, void(entity, float))
@@ -18,6 +18,7 @@ CLASS(Slider) EXTENDS(Label)
        METHOD(Slider, showNotify, void(entity))
        ATTRIB(Slider, src, string, string_null)
        ATTRIB(Slider, focusable, float, 1)
+       ATTRIB(Slider, allowFocusSound, float, 1)
        ATTRIB(Slider, value, float, 0)
        ATTRIB(Slider, animated, float, 1)
        ATTRIB(Slider, sliderValue, float, 0)
@@ -146,7 +147,29 @@ float Slider_keyDown(entity me, float key, float ascii, float shift)
                me.setValue(me, me.valueMax);
                return 1;
        }
-       // TODO more keys
+       // TODO more keys (NOTE also add them to Slider_keyUp)
+       return 0;
+}
+float Slider_keyUp(entity me, float key, float ascii, float shift)
+{
+       if(me.disabled)
+               return 0;
+       switch(key)
+       {
+               case K_LEFTARROW:
+               case K_KP_LEFTARROW:
+               case K_RIGHTARROW:
+               case K_KP_RIGHTARROW:
+               case K_PGUP:
+               case K_KP_PGUP:
+               case K_PGDN:
+               case K_KP_PGDN:
+               case K_HOME:
+               case K_KP_HOME:
+               case K_END:
+               case K_KP_END:
+                       m_play_click_sound(MENU_SOUND_SLIDE);
+       }
        return 0;
 }
 float Slider_mouseDrag(entity me, vector pos)
@@ -242,20 +265,13 @@ float Slider_mouseRelease(entity me, vector pos)
        me.pressed = 0;
        if(me.disabled)
                return 0;
-       if(cvar("menu_sounds"))
-               localsound("sound/misc/menu2.wav");
+       m_play_click_sound(MENU_SOUND_SLIDE);
        return 1;
 }
 void Slider_showNotify(entity me)
 {
        me.focusable = !me.disabled;
 }
-void Slider_focusEnter(entity me)
-{
-       if(cvar("menu_sounds") > 1)
-               localsound("sound/misc/menu1.wav");
-       SUPER(Slider).focusEnter(me);
-}
 void Slider_draw(entity me)
 {
        float controlLeft;
index aa771649d663fa705e6980d4870ef3d5174624b0..85aa3a640e319a055b56926f053ec58d72c12558 100644 (file)
@@ -1001,3 +1001,20 @@ void m_goto(string itemname)
                }
        }
 }
+
+float menuLastFocusSoundTime;
+void m_play_focus_sound()
+{
+       if(cvar("menu_sounds") > 1)
+               if(time - menuLastFocusSoundTime > 0.25)
+               {
+                       localsound(MENU_SOUND_FOCUS);
+                       menuLastFocusSoundTime = time;
+               }
+}
+
+void m_play_click_sound(string soundfile)
+{
+       if(cvar("menu_sounds"))
+               localsound(soundfile);
+}
index b6c0795a8544424d505b8392d8d7f4f7cec59825..6f36a074e05311361c71b174afa796a03adeb02b 100644 (file)
@@ -38,3 +38,17 @@ void preMenuDraw(); // this is run before the menu is drawn. You may put some st
 void postMenuDraw(); // this is run just after the menu is drawn (or not). Useful to draw something over everything else.
 
 void m_sync();
+
+// sounds
+
+const string MENU_SOUND_CLEAR   = "sound/menu/clear.wav";
+const string MENU_SOUND_CLOSE   = "sound/menu/close.wav";
+const string MENU_SOUND_EXECUTE = "sound/menu/execute.wav";
+const string MENU_SOUND_FOCUS   = "sound/menu/focus.wav";
+const string MENU_SOUND_OPEN    = "sound/menu/open.wav";
+const string MENU_SOUND_SELECT  = "sound/menu/select.wav";
+const string MENU_SOUND_SLIDE   = "sound/menu/slide.wav";
+const string MENU_SOUND_WINNER  = "sound/menu/winner.wav";
+
+void m_play_focus_sound();
+void m_play_click_sound(string soundfile);
index 454b4ad710ba660764384042c17edbd398038456..126b728c8fc1a563f12e6cbeb603b348ebf5cd42 100644 (file)
@@ -4,7 +4,7 @@ CLASS(XonoticCampaignList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticCampaignList, rowsPerItem, float, 10)
        METHOD(XonoticCampaignList, draw, void(entity))
        METHOD(XonoticCampaignList, drawListBoxItem, void(entity, float, vector, float))
-       METHOD(XonoticCampaignList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticCampaignList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticCampaignList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticCampaignList, setSelected, void(entity, float))
        METHOD(XonoticCampaignList, keyDown, float(entity, float, float, float))
@@ -24,9 +24,6 @@ CLASS(XonoticCampaignList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticCampaignList, realUpperMargin1, float, 0)
        ATTRIB(XonoticCampaignList, realUpperMargin2, float, 0)
 
-       ATTRIB(XonoticCampaignList, lastClickedMap, float, -1)
-       ATTRIB(XonoticCampaignList, lastClickedTime, float, 0)
-
        ATTRIB(XonoticCampaignList, origin, vector, '0 0 0')
        ATTRIB(XonoticCampaignList, itemAbsSize, vector, '0 0 0')
        ATTRIB(XonoticCampaignList, emptyLineHeight, float, 0.5)
@@ -233,18 +230,9 @@ void XonoticCampaignList_resizeNotify(entity me, vector relOrigin, vector relSiz
 
        rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);
 }
-void XonoticCampaignList_clickListBoxItem(entity me, float i, vector where)
+void XonoticCampaignList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedMap)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       // start game
-                       CampaignList_LoadMap(me, me);
-                       return;
-               }
-       me.lastClickedMap = i;
-       me.lastClickedTime = time;
+       CampaignList_LoadMap(me, me);
 }
 void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
index e0727373c14b3a4795db1cde2f3caadaec45bfbc..a6be0a4d0476f4e2e7268b8265f4adee79d1fd53 100644 (file)
@@ -139,6 +139,7 @@ float XonoticColorpicker_mouseDrag(entity me, vector coords)
 
 float XonoticColorpicker_mouseRelease(entity me, vector coords)
 {
+       m_play_click_sound(MENU_SOUND_SLIDE);
        me.mouseDrag(me, coords);
        return 1;
 }
index 5d53135e9cca1967c7e3f0d68b8a4b631b7e1ef3..56b8100aaa3a5c816cb9e00e43f276be5240d519 100644 (file)
@@ -97,6 +97,7 @@ float XonoticColorpickerString_mouseDrag(entity me, vector coords)
 
 float XonoticColorpickerString_mouseRelease(entity me, vector coords)
 {
+       m_play_click_sound(MENU_SOUND_SLIDE);
        me.mouseDrag(me, coords);
        return 1;
 }
index f2e209ca4d2b38190cdc64ec1f382f4756e4569d..9f5909676298fc15dc2e08027bf374d1cbf3afb1 100644 (file)
@@ -8,7 +8,7 @@ CLASS(XonoticDemoList) EXTENDS(XonoticListBox)
        METHOD(XonoticDemoList, startDemo, void(entity))
        METHOD(XonoticDemoList, timeDemo, void(entity))
        METHOD(XonoticDemoList, demoName, string(entity, float))
-       METHOD(XonoticDemoList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticDemoList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticDemoList, keyDown, float(entity, float, float, float))
        METHOD(XonoticDemoList, destroy, void(entity))
        METHOD(XonoticDemoList, showNotify, void(entity))
@@ -21,8 +21,6 @@ CLASS(XonoticDemoList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticDemoList, origin, vector, '0 0 0')
        ATTRIB(XonoticDemoList, itemAbsSize, vector, '0 0 0')
 
-       ATTRIB(XonoticDemoList, lastClickedDemo, float, -1)
-       ATTRIB(XonoticDemoList, lastClickedTime, float, 0)
        ATTRIB(XonoticDemoList, filterString, string, string_null)
 ENDCLASS(XonoticDemoList)
 
@@ -207,17 +205,9 @@ void DemoConfirm_ListClick_Check_Gamestatus(entity me)
        }
 }
 
-void XonoticDemoList_clickListBoxItem(entity me, float i, vector where)
+void XonoticDemoList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedDemo)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       me.setSelected(me, i);
-                       DemoConfirm_ListClick_Check_Gamestatus(me);
-               }
-       me.lastClickedDemo = i;
-       me.lastClickedTime = time;
+       DemoConfirm_ListClick_Check_Gamestatus(me);
 }
 
 float XonoticDemoList_keyDown(entity me, float scan, float ascii, float shift)
index 07026be69f8fba06495b8d94dcb4658ac3e55dc5..64c9cf43a6959ccfd04206049c068aafb0c7bcf0 100644 (file)
@@ -4,7 +4,7 @@ CLASS(XonoticHUDWeaponsDialog) EXTENDS(XonoticRootDialog)
        ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"))
        ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 18)
+       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 19)
        ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4)
        ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons")
        ATTRIB(XonoticHUDWeaponsDialog, requiresConnection, float, TRUE)
@@ -50,20 +50,25 @@ void XonoticHUDWeaponsDialog_fill(entity me)
                        me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "0", ZCTX(_("SHOWAS^None"))));
                        me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "1", _("Number")));
                        me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "2", _("Bind")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Weapon ID scale:")));
+                       me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.05, "hud_panel_weapons_label_scale"));
+                       setDependent(e, "hud_panel_weapons_label", 1, 2);
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 3.8/2, e = makeXonoticCheckBox(0, "hud_panel_weapons_accuracy", _("Show Accuracy")));
                me.TD(me, 1, 3.8/2, e = makeXonoticCheckBox(0, "hud_panel_weapons_ammo", _("Show Ammo")));
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Ammo bar color:")));
-               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_weapons_ammo_color", "hud_panel_weapons_ammo_color"));
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Ammo bar alpha:")));
+                       me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_weapons_ammo_alpha"));
                        setDependent(e, "hud_panel_weapons_ammo", 1, 1);
-               me.TR(me);
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Ammo bar alpha:")));
-                       me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.1, "hud_panel_weapons_ammo_alpha"));
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Ammo bar color:")));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_weapons_ammo_color", "hud_panel_weapons_ammo_color"));
                        setDependent(e, "hud_panel_weapons_ammo", 1, 1);
+               me.TR(me);
 }
 #endif
index 39bee32426c84bd771755266fc67bf3ab9d01e8d..cfbe229b551a2e643734d0ac7c7f0a8717ab2cab 100644 (file)
@@ -5,6 +5,7 @@ CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space
+       ATTRIB(XonoticAudioSettingsTab, hiddenMenuSoundsSlider, entity, NULL)
 ENDCLASS(XonoticAudioSettingsTab)
 entity makeXonoticAudioSettingsTab();
 #endif
@@ -136,7 +137,10 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 3, makeXonoticCheckBox(0, "con_chatsound", _("Chat message sound")));
        me.TR(me);
-               me.TD(me, 1, 3, makeXonoticCheckBoxEx(2, 0, "menu_sounds", _("Menu sounds")));
+               me.hiddenMenuSoundsSlider = makeXonoticSlider(1, 1, 1, "menu_sounds");
+               me.TD(me, 1, 1.2, makeXonoticSliderCheckBox(0, 1, me.hiddenMenuSoundsSlider, _("Menu sounds")));
+               me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(2, 0, me.hiddenMenuSoundsSlider, _("Focus sounds")));
+               setDependent(e, "menu_sounds", 1, 2);
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, makeXonoticTextLabel(0, _("Time announcer:")));
index 3e164c11fe8f2e5aca1e62d931039cab7cac7816..c226fbcc41d25e5944cf35970a5b6709471d3ca3 100644 (file)
@@ -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:")));
index 8e584b8a8a259866636932eccce69630a840747a..0d1c05af44a10a89281bc4c668d06dd1827608ba 100644 (file)
@@ -1,6 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticWinnerDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticWinnerDialog, fill, void(entity))
+       METHOD(XonoticWinnerDialog, focusEnter, void(entity))
        ATTRIB(XonoticWinnerDialog, title, string, _("Winner"))
        ATTRIB(XonoticWinnerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER)
        ATTRIB(XonoticWinnerDialog, intendedWidth, float, 0.32)
@@ -22,4 +23,8 @@ void XonoticWinnerDialog_fill(entity me)
                        e.onClick = Dialog_Close;
                        e.onClickEntity = me;
 }
+void XonoticWinnerDialog_focusEnter(entity me)
+{
+       m_play_click_sound(MENU_SOUND_WINNER);
+}
 #endif
index e3df84467708fc9ab1c47a04410e66fa15aa21b2..3fd45c329c306fdabe3fa6e532cf7fdb784a7a69 100644 (file)
@@ -8,6 +8,7 @@ CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
        METHOD(XonoticGametypeList, loadCvars, void(entity))
        METHOD(XonoticGametypeList, saveCvars, void(entity))
        METHOD(XonoticGametypeList, keyDown, float(entity, float, float, float))
+       METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector))
 
        ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0')
        ATTRIB(XonoticGametypeList, realUpperMargin, float, 0)
@@ -45,7 +46,6 @@ void XonoticGametypeList_setSelected(entity me, float i)
        SUPER(XonoticGametypeList).setSelected(me, i);
        me.saveCvars(me);
 }
-
 void XonoticGametypeList_loadCvars(entity me)
 {
        float t;
@@ -111,15 +111,19 @@ void XonoticGametypeList_resizeNotify(entity me, vector relOrigin, vector relSiz
        me.columnNameOrigin = me.columnIconOrigin + me.columnIconSize + (0.5 * me.realFontSize_x);
        me.columnNameSize = 1 - me.columnIconSize - (1.5 * me.realFontSize_x);
 }
-
 float XonoticGametypeList_keyDown(entity me, float scan, float ascii, float shift)
 {
        if(scan == K_ENTER || scan == K_KP_ENTER)
        {
+               m_play_click_sound(MENU_SOUND_EXECUTE);
                me.parent.gameTypeSelectNotify(me.parent);
                return 1;
        }
 
        return SUPER(XonoticGametypeList).keyDown(me, scan, ascii, shift);
 }
+void XonoticGametypeList_clickListBoxItem(entity me, float i, vector where)
+{
+       m_play_click_sound(MENU_SOUND_SELECT);
+}
 #endif
index c312e382656105a4824bd3b6e3c3568df0ee36ae..272edd905311a65724514c70b445f368b455e3ec 100644 (file)
@@ -3,7 +3,7 @@ CLASS(XonoticKeyBinder) EXTENDS(XonoticListBox)
        METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity))
        ATTRIB(XonoticKeyBinder, rowsPerItem, float, 1)
        METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, float, vector, float))
-       METHOD(XonoticKeyBinder, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticKeyBinder, setSelected, void(entity, float))
        METHOD(XonoticKeyBinder, keyDown, float(entity, float, float, float))
@@ -16,8 +16,6 @@ CLASS(XonoticKeyBinder) EXTENDS(XonoticListBox)
        ATTRIB(XonoticKeyBinder, columnKeysOrigin, float, 0)
        ATTRIB(XonoticKeyBinder, columnKeysSize, float, 0)
 
-       ATTRIB(XonoticKeyBinder, lastClickedKey, float, -1)
-       ATTRIB(XonoticKeyBinder, lastClickedTime, float, 0)
        ATTRIB(XonoticKeyBinder, previouslySelected, float, -1)
        ATTRIB(XonoticKeyBinder, inMouseHandler, float, 0)
        ATTRIB(XonoticKeyBinder, userbindEditButton, entity, NULL)
@@ -172,6 +170,7 @@ void XonoticKeyBinder_keyGrabbed(entity me, float key, float ascii)
                                localcmd("\nbind \"", keynumtostring(k), "\" \"", KEY_NOT_BOUND_CMD, "\"\n");
                }
        }
+       m_play_click_sound(MENU_SOUND_SELECT);
        localcmd("\nbind \"", keynumtostring(key), "\" \"", func, "\"\n");
        localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
        cvar_set("_hud_showbinds_reload", "1");
@@ -235,6 +234,7 @@ void KeyBinder_Bind_Clear(entity btn, entity me)
                        //localcmd("\nunbind \"", keynumtostring(k), "\"\n");
                        localcmd("\nbind \"", keynumtostring(k), "\" \"", KEY_NOT_BOUND_CMD, "\"\n");
        }
+       m_play_click_sound(MENU_SOUND_CLEAR);
        localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
        cvar_set("_hud_showbinds_reload", "1");
 }
@@ -245,16 +245,9 @@ void KeyBinder_Bind_Reset_All(entity btn, entity me)
        localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
        cvar_set("_hud_showbinds_reload", "1");
 }
-void XonoticKeyBinder_clickListBoxItem(entity me, float i, vector where)
+void XonoticKeyBinder_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedKey)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       KeyBinder_Bind_Change(NULL, me);
-               }
-       me.lastClickedKey = i;
-       me.lastClickedTime = time;
+       KeyBinder_Bind_Change(NULL, me);
 }
 void XonoticKeyBinder_setSelected(entity me, float i)
 {
index 24445786aea98b696c0c1c84b926d6ac29cafc2c..5697f823109d001bdc1a226165d62cb47fef3ef7 100644 (file)
@@ -15,10 +15,8 @@ CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticLanguageList, columnPercentageOrigin, float, 0)
        ATTRIB(XonoticLanguageList, columnPercentageSize, float, 0)
 
-       METHOD(XonoticLanguageList, clickListBoxItem, void(entity, float, vector)) // double click handling
+       METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)) // enter handling
-       ATTRIB(XonoticLanguageList, lastClickedLanguage, float, -1)
-       ATTRIB(XonoticLanguageList, lastClickedTime, float, 0)
 
        METHOD(XonoticLanguageList, destroy, void(entity))
 
@@ -140,22 +138,17 @@ void XonoticLanguageList_saveCvars(entity me)
        cvar_set("_menu_prvm_language", me.languageParameter(me, me.selectedItem, LANGPARM_ID));
 }
 
-void XonoticLanguageList_clickListBoxItem(entity me, float i, vector where)
+void XonoticLanguageList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedLanguage)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       me.setSelected(me, i);
-                       me.setLanguage(me);
-               }
-       me.lastClickedLanguage = i;
-       me.lastClickedTime = time;
+       m_play_click_sound(MENU_SOUND_EXECUTE);
+       me.setLanguage(me);
 }
 
 float XonoticLanguageList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER || scan == K_KP_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER)
+       {
+               m_play_click_sound(MENU_SOUND_EXECUTE);
                me.setLanguage(me);
                return 1;
        }
index 60eeb445c6c4877caf508aa145ccf9c403d9e5ef..54166f6e045cc5e5c1e0ed06e5424313cacab5f3 100644 (file)
@@ -5,6 +5,7 @@ CLASS(XonoticMapList) EXTENDS(XonoticListBox)
        METHOD(XonoticMapList, draw, void(entity))
        METHOD(XonoticMapList, drawListBoxItem, void(entity, float, vector, float))
        METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticMapList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticMapList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticMapList, refilter, void(entity))
        METHOD(XonoticMapList, refilterCallback, void(entity, entity))
@@ -20,9 +21,6 @@ CLASS(XonoticMapList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticMapList, realUpperMargin1, float, 0)
        ATTRIB(XonoticMapList, realUpperMargin2, float, 0)
 
-       ATTRIB(XonoticMapList, lastClickedMap, float, -1)
-       ATTRIB(XonoticMapList, lastClickedTime, float, 0)
-
        ATTRIB(XonoticMapList, lastGametype, float, 0)
        ATTRIB(XonoticMapList, lastFeatures, float, 0)
 
@@ -143,22 +141,21 @@ void XonoticMapList_clickListBoxItem(entity me, float i, vector where)
 {
        if(where_x <= me.columnPreviewOrigin + me.columnPreviewSize)
                if(where_x >= 0)
+               {
+                       m_play_click_sound(MENU_SOUND_SELECT);
                        me.g_maplistCacheToggle(me, i);
+               }
+}
 
+void XonoticMapList_doubleClickListBoxItem(entity me, float i, vector where)
+{
        if(where_x >= me.columnNameOrigin)
                if(where_x <= 1)
                {
-                       if(i == me.lastClickedMap)
-                               if(time < me.lastClickedTime + 0.3)
-                               {
-                                       // DOUBLE CLICK!
-                                       // pop up map info screen
-                                       main.mapInfoDialog.loadMapInfo(main.mapInfoDialog, i, me);
-                                       DialogOpenButton_Click_withCoords(NULL, main.mapInfoDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * i - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize));
-                                       return;
-                               }
-                       me.lastClickedMap = i;
-                       me.lastClickedTime = time;
+                       // pop up map info screen
+                       m_play_click_sound(MENU_SOUND_OPEN);
+                       main.mapInfoDialog.loadMapInfo(main.mapInfoDialog, i, me);
+                       DialogOpenButton_Click_withCoords(NULL, main.mapInfoDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * i - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize));
                }
 }
 
@@ -303,22 +300,30 @@ float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
        if(scan == K_MOUSE2 || scan == K_SPACE || scan == K_ENTER || scan == K_KP_ENTER)
        {
                // pop up map info screen
+               m_play_click_sound(MENU_SOUND_OPEN);
                main.mapInfoDialog.loadMapInfo(main.mapInfoDialog, me.selectedItem, me);
                DialogOpenButton_Click_withCoords(NULL, main.mapInfoDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * me.selectedItem - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize));
        }
        else if(scan == K_MOUSE3 || scan == K_INS || scan == K_KP_INS)
        {
+               m_play_click_sound(MENU_SOUND_SELECT);
                me.g_maplistCacheToggle(me, me.selectedItem);
        }
        else if(ascii == 43) // +
        {
                if (!me.g_maplistCacheQuery(me, me.selectedItem))
+               {
+                       m_play_click_sound(MENU_SOUND_SELECT);
                        me.g_maplistCacheToggle(me, me.selectedItem);
+               }
        }
        else if(ascii == 45) // -
        {
                if(me.g_maplistCacheQuery(me, me.selectedItem))
+               {
+                       m_play_click_sound(MENU_SOUND_SELECT);
                        me.g_maplistCacheToggle(me, me.selectedItem);
+               }
        }
        else if(scan == K_BACKSPACE)
        {
index b3ee38670a04ad41117b82f3db7c0b2ee780b974..5579394ea7913cc39e917de99571b3489769ca7e 100644 (file)
@@ -3,6 +3,7 @@ CLASS(XonoticPlayerList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticPlayerList, rowsPerItem, float, 1)
        METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticPlayerList, drawListBoxItem, void(entity, float, vector, float))
+       ATTRIB(XonoticPlayerList, allowFocusSound, float, 0)
        ATTRIB(XonoticPlayerList, realFontSize, vector, '0 0 0')
        ATTRIB(XonoticPlayerList, columnNameOrigin, float, 0)
        ATTRIB(XonoticPlayerList, columnNameSize, float, 0)
index 80fe3132e25eb9a9bea30353bdc38203d35678fe..e918adacd391be7eb4a33744c7a78d4fae31663f 100644 (file)
@@ -9,7 +9,7 @@ CLASS(XonoticPlayList) EXTENDS(XonoticListBox)
        METHOD(XonoticPlayList, startSound, void(entity, float))
        METHOD(XonoticPlayList, resumeSound, void(entity))
        METHOD(XonoticPlayList, pauseSound, void(entity))
-       METHOD(XonoticPlayList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticPlayList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticPlayList, keyDown, float(entity, float, float, float))
        METHOD(XonoticPlayList, mouseDrag, float(entity, vector))
 
@@ -25,9 +25,6 @@ CLASS(XonoticPlayList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticPlayList, realUpperMargin, float, 0)
        ATTRIB(XonoticPlayList, origin, vector, '0 0 0')
        ATTRIB(XonoticPlayList, itemAbsSize, vector, '0 0 0')
-
-       ATTRIB(XonoticPlayList, lastClickedSound, float, -1)
-       ATTRIB(XonoticPlayList, lastClickedTime, float, 0)
 ENDCLASS(XonoticPlayList)
 
 entity makeXonoticPlayList();
@@ -183,7 +180,7 @@ void XonoticPlayList_drawListBoxItem(entity me, float i, vector absSize, float i
        {
                float f = cvar("music_playlist_sampleposition0");
                if(f <= 0 || (((time * 2) & 1) && f > 0))
-                       draw_Text(me.realUpperMargin * eY + (me.columnNumberOrigin + me.columnNumberSize) * eX, chr(0xE000 + 141), me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+                       draw_Text(me.realUpperMargin * eY + (me.columnNumberOrigin + me.columnNumberSize) * eX, "\xE2\x96\xB6", me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
        }
 
        s = ftos(i+1);
@@ -279,17 +276,9 @@ void PauseSound_Click(entity btn, entity me)
        me.pauseSound(me);
 }
 
-void XonoticPlayList_clickListBoxItem(entity me, float i, vector where)
+void XonoticPlayList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedSound)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       me.setSelected(me, i);
-                       me.startSound(me, 0);
-               }
-       me.lastClickedSound = i;
-       me.lastClickedTime = time;
+       me.startSound(me, 0);
 }
 
 float XonoticPlayList_keyDown(entity me, float scan, float ascii, float shift)
index dd8b61ed3f97fc942a456ef2799939c1f9e17f2a..c8f3becfa03c69a9b47c57cd489c2ebf078a78b8 100644 (file)
@@ -10,7 +10,7 @@ CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox)
        METHOD(XonoticScreenshotList, previewScreenshot, void(entity))
        METHOD(XonoticScreenshotList, startScreenshot, void(entity))
        METHOD(XonoticScreenshotList, screenshotName, string(entity, float))
-       METHOD(XonoticScreenshotList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticScreenshotList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticScreenshotList, keyDown, float(entity, float, float, float))
        METHOD(XonoticScreenshotList, destroy, void(entity))
        METHOD(XonoticScreenshotList, showNotify, void(entity))
@@ -21,8 +21,6 @@ CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticScreenshotList, realUpperMargin, float, 0)
        ATTRIB(XonoticScreenshotList, origin, vector, '0 0 0')
        ATTRIB(XonoticScreenshotList, itemAbsSize, vector, '0 0 0')
-       ATTRIB(XonoticScreenshotList, lastClickedScreenshot, float, -1)
-       ATTRIB(XonoticScreenshotList, lastClickedTime, float, 0)
        ATTRIB(XonoticScreenshotList, filterString, string, string_null)
        ATTRIB(XonoticScreenshotList, filterBox, entity, NULL)
        ATTRIB(XonoticScreenshotList, filterTime, float, 0)
@@ -280,18 +278,9 @@ void StartScreenshot_Click(entity btn, entity me)
        me.startScreenshot(me);
 }
 
-void XonoticScreenshotList_clickListBoxItem(entity me, float i, vector where)
+void XonoticScreenshotList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedScreenshot)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       // pop up screenshot
-                       me.setSelected(me, i);
-                       me.startScreenshot(me);
-               }
-       me.lastClickedScreenshot = i;
-       me.lastClickedTime = time;
+       me.startScreenshot(me);
 }
 
 float XonoticScreenshotList_keyDown(entity me, float scan, float ascii, float shift)
index 8b3a9e9a0394caf9f443e27499ce37d46aea4556..3d848c9c59d78df666d39f87776c7a179363e7bb 100644 (file)
@@ -4,7 +4,7 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticServerList, rowsPerItem, float, 1)
        METHOD(XonoticServerList, draw, void(entity))
        METHOD(XonoticServerList, drawListBoxItem, void(entity, float, vector, float))
-       METHOD(XonoticServerList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticServerList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticServerList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticServerList, keyDown, float(entity, float, float, float))
        METHOD(XonoticServerList, toggleFavorite, void(entity, string))
@@ -49,8 +49,6 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticServerList, infoButton, entity, NULL)
        ATTRIB(XonoticServerList, currentSortOrder, float, 0)
        ATTRIB(XonoticServerList, currentSortField, float, -1)
-       ATTRIB(XonoticServerList, lastClickedServer, float, -1)
-       ATTRIB(XonoticServerList, lastClickedTime, float, 0)
 
        ATTRIB(XonoticServerList, ipAddressBoxFocused, float, -1)
 
@@ -563,6 +561,7 @@ void XonoticServerList_refreshServerList(entity me, float mode)
 }
 void XonoticServerList_focusEnter(entity me)
 {
+       SUPER(XonoticServerList).focusEnter(me);
        if(time < me.nextRefreshTime)
        {
                //print("sorry, no refresh yet\n");
@@ -722,11 +721,7 @@ void XonoticServerList_draw(entity me)
                {
                        if(gethostcachestring(SLIST_FIELD_CNAME, i) == me.selectedServer)
                        {
-                               if(i != me.selectedItem)
-                               {
-                                       me.lastClickedServer = -1;
-                                       me.selectedItem = i;
-                               }
+                               me.selectedItem = i;
                                found = 1;
                                break;
                        }
@@ -949,6 +944,7 @@ void ServerList_Favorite_Click(entity btn, entity me)
        ipstr = netaddress_resolve(me.ipAddressBox.text, 26000);
        if(ipstr != "")
        {
+               m_play_click_sound(MENU_SOUND_SELECT);
                me.toggleFavorite(me, me.ipAddressBox.text);
                me.ipAddressBoxFocused = -1;
        }
@@ -962,16 +958,9 @@ void ServerList_Info_Click(entity btn, entity me)
        vector sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
        DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
 }
-void XonoticServerList_clickListBoxItem(entity me, float i, vector where)
+void XonoticServerList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedServer)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       ServerList_Connect_Click(NULL, me);
-               }
-       me.lastClickedServer = i;
-       me.lastClickedTime = time;
+       ServerList_Connect_Click(NULL, me);
 }
 void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
@@ -1258,6 +1247,7 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
        {
                if(me.nItems != 0)
                {
+                       m_play_click_sound(MENU_SOUND_OPEN);
                        main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
                        DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
                        return 1;
index 0387303ea3d2a041f7c91cf09ecc1c6c811b8d66..234f1237ec776a628f774a8e4b98a3ae3f7beff9 100644 (file)
@@ -9,7 +9,7 @@ CLASS(XonoticSkinList) EXTENDS(XonoticListBox)
        METHOD(XonoticSkinList, loadCvars, void(entity))
        METHOD(XonoticSkinList, saveCvars, void(entity))
        METHOD(XonoticSkinList, skinParameter, string(entity, float, float))
-       METHOD(XonoticSkinList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticSkinList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticSkinList, keyDown, float(entity, float, float, float))
        METHOD(XonoticSkinList, destroy, void(entity))
 
@@ -24,9 +24,6 @@ CLASS(XonoticSkinList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticSkinList, origin, vector, '0 0 0')
        ATTRIB(XonoticSkinList, itemAbsSize, vector, '0 0 0')
 
-       ATTRIB(XonoticSkinList, lastClickedSkin, float, -1)
-       ATTRIB(XonoticSkinList, lastClickedTime, float, 0)
-
        ATTRIB(XonoticSkinList, name, string, "skinselector")
 ENDCLASS(XonoticSkinList)
 
@@ -182,22 +179,17 @@ void SetSkin_Click(entity btn, entity me)
        me.setSkin(me);
 }
 
-void XonoticSkinList_clickListBoxItem(entity me, float i, vector where)
+void XonoticSkinList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedSkin)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       me.setSelected(me, i);
-                       me.setSkin(me);
-               }
-       me.lastClickedSkin = i;
-       me.lastClickedTime = time;
+       m_play_click_sound(MENU_SOUND_EXECUTE);
+       me.setSkin(me);
 }
 
 float XonoticSkinList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER || scan == K_KP_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER)
+       {
+               m_play_click_sound(MENU_SOUND_EXECUTE);
                me.setSkin(me);
                return 1;
        }
index e45e486dcf039a29057b2b54f27603d1819ea69a..7d1515062ab5428aa09b0c272272aa4722a2f4c7 100644 (file)
@@ -6,7 +6,7 @@ CLASS(XonoticSoundList) EXTENDS(XonoticListBox)
        METHOD(XonoticSoundList, drawListBoxItem, void(entity, float, vector, float))
        METHOD(XonoticSoundList, getSounds, void(entity))
        METHOD(XonoticSoundList, soundName, string(entity, float))
-       METHOD(XonoticSoundList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticSoundList, keyDown, float(entity, float, float, float))
        METHOD(XonoticSoundList, destroy, void(entity))
        METHOD(XonoticSoundList, showNotify, void(entity))
@@ -21,8 +21,6 @@ CLASS(XonoticSoundList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticSoundList, origin, vector, '0 0 0')
        ATTRIB(XonoticSoundList, itemAbsSize, vector, '0 0 0')
 
-       ATTRIB(XonoticSoundList, lastClickedSound, float, -1)
-       ATTRIB(XonoticSoundList, lastClickedTime, float, 0)
        ATTRIB(XonoticSoundList, filterString, string, string_null)
        ATTRIB(XonoticSoundList, playlist, entity, world)
 ENDCLASS(XonoticSoundList)
@@ -159,17 +157,9 @@ void SoundList_Add_All(entity box, entity me)
                me.playlist.addToPlayList(me.playlist, me.soundName(me, i));
 }
 
-void XonoticSoundList_clickListBoxItem(entity me, float i, vector where)
+void XonoticSoundList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedSound)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       me.setSelected(me, i);
-                       me.playlist.addToPlayList(me.playlist, me.soundName(me, i));
-               }
-       me.lastClickedSound = i;
-       me.lastClickedTime = time;
+       me.playlist.addToPlayList(me.playlist, me.soundName(me, i));
 }
 
 float XonoticSoundList_keyDown(entity me, float scan, float ascii, float shift)
index 988244816c94534c554e221fd26773e3f9076b63..c7b744a66710697c02782151b8607edda74d1ab8 100644 (file)
@@ -5,7 +5,7 @@ CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
        METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticStatsList, drawListBoxItem, void(entity, float, vector, float))
        METHOD(XonoticStatsList, getStats, void(entity))
-       METHOD(XonoticStatsList, clickListBoxItem, void(entity, float, vector))
+       METHOD(XonoticStatsList, doubleClickListBoxItem, void(entity, float, vector))
        METHOD(XonoticStatsList, keyDown, float(entity, float, float, float))
        METHOD(XonoticStatsList, destroy, void(entity))
        METHOD(XonoticStatsList, showNotify, void(entity))
@@ -15,9 +15,6 @@ CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticStatsList, realUpperMargin, float, 0)
        ATTRIB(XonoticStatsList, columnNameOrigin, float, 0)
        ATTRIB(XonoticStatsList, columnNameSize, float, 0)
-
-       ATTRIB(XonoticStatsList, lastClickedDemo, float, -1)
-       ATTRIB(XonoticStatsList, lastClickedTime, float, 0)
 ENDCLASS(XonoticStatsList)
 
 entity statslist; // for reference elsewhere
@@ -333,17 +330,9 @@ void XonoticStatsList_showNotify(entity me)
        PlayerStats_PlayerDetail_CheckUpdate();
 }
 
-void XonoticStatsList_clickListBoxItem(entity me, float i, vector where)
+void XonoticStatsList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-       if(i == me.lastClickedDemo)
-               if(time < me.lastClickedTime + 0.3)
-               {
-                       // DOUBLE CLICK!
-                       me.setSelected(me, i);
-                       //DemoConfirm_ListClick_Check_Gamestatus(me);
-               }
-       me.lastClickedDemo = i;
-       me.lastClickedTime = time;
+       //DemoConfirm_ListClick_Check_Gamestatus(me);
 }
 
 float XonoticStatsList_keyDown(entity me, float scan, float ascii, float shift)
index 8e573b8c3fecbbcbc8121ff79da1d7edc883c0d8..8a8e2205dde03b0ed001162728dda4e6e6783dc9 100644 (file)
@@ -117,7 +117,7 @@ float XonoticWeaponsList_keyDown(entity me, float scan, float ascii, float shift
                WeaponsList_MoveUp_Click(NULL, me);
                return 1;
        }
-       else if(scan == 45) // -
+       else if(ascii == 45) // -
        {
                WeaponsList_MoveDown_Click(NULL, me);
                return 1;
index bf555d4fcd173d4fa245f1635d7c610594c7d45e..fb283bb2a3a488b0bc8bc6d2ed627d7f6917c26a 100644 (file)
@@ -794,7 +794,6 @@ void SV_PlayerPhysics()
                not_allowed_to_move = 0;
                if(self.race_penalty)
                        not_allowed_to_move = 1;
-               if(!autocvar_sv_ready_restart_after_countdown)
                if(time < game_starttime)
                        not_allowed_to_move = 1;
 
index e6fda399e27eb0427e90a241964f623843a54feb..81306a8b1c263497687e155ed7f23f0c0ecf09af 100644 (file)
@@ -1028,6 +1028,10 @@ void readlevelcvars(void)
        if (!warmup_stage)
                game_starttime = time + cvar("g_start_delay");
 
+       float i;
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+               WEP_ACTION(i, WR_INIT);
+
        readplayerstartcvars();
 }
 
diff --git a/scripts/luma.shader b/scripts/luma.shader
new file mode 100644 (file)
index 0000000..ab2d0c6
--- /dev/null
@@ -0,0 +1,425 @@
+// models/items
+
+a_bullets_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/a_bullets_luma
+               blendfunc blend
+       }
+}
+
+a_cells_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/a_cells_luma
+               blendfunc blend
+       }
+}
+
+a_plasma_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/a_plasma_luma
+               blendfunc blend
+       }
+}
+
+a_rockets_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/a_rockets_luma
+               blendfunc blend
+       }
+}
+
+a_shells_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/a_shells_luma
+               blendfunc blend
+       }
+}
+
+g_fuel_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_fuel_luma
+               blendfunc blend
+       }
+}
+
+g_fuelregen_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_fuelregen_luma
+               blendfunc blend
+       }
+}
+
+g_h1_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_h1_luma
+               blendfunc blend
+       }
+}
+
+g_h25_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_h25_luma
+               blendfunc blend
+       }
+}
+
+g_h50_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_h50_luma
+               blendfunc blend
+       }
+}
+
+g_h100_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_h100_luma
+               blendfunc blend
+       }
+}
+
+g_invincible_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_invincible_luma
+               blendfunc blend
+       }
+}
+
+g_jetpack_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_jetpack_luma
+               blendfunc blend
+       }
+}
+
+g_strength_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/g_strength_luma
+               blendfunc blend
+       }
+}
+
+item_armor_big_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/item_armor_big_luma
+               blendfunc blend
+       }
+}
+
+item_armor_large_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/item_armor_large_luma
+               blendfunc blend
+       }
+}
+
+item_armor_medium_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/item_armor_medium_luma
+               blendfunc blend
+       }
+}
+
+item_armor_small_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/items/item_armor_small_luma
+               blendfunc blend
+       }
+}
+
+
+
+
+
+// models/weapons
+
+g_arc_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_arc_luma
+               blendfunc blend
+       }
+}
+
+g_campingrifle_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_campingrifle_luma
+               blendfunc blend
+       }
+}
+
+g_crylink_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_crylink_luma
+               blendfunc blend
+       }
+}
+
+g_electro_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_electro_luma
+               blendfunc blend
+       }
+}
+
+g_fireball_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_fireball_luma
+               blendfunc blend
+       }
+}
+
+g_gl_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_gl_luma
+               blendfunc blend
+       }
+}
+
+g_hagar_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_hagar_luma
+               blendfunc blend
+       }
+}
+
+g_hlac_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_hlac_luma
+               blendfunc blend
+       }
+}
+
+g_hookgun_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_hookgun_luma
+               blendfunc blend
+       }
+}
+
+g_laser_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_laser_luma
+               blendfunc blend
+       }
+}
+
+g_minelayer_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_minelayer_luma
+               blendfunc blend
+       }
+}
+
+g_minstanex_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_minstanex_luma
+               blendfunc blend
+       }
+}
+
+g_nex_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_nex_luma
+               blendfunc blend
+       }
+}
+
+g_porto_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_porto_luma
+               blendfunc blend
+       }
+}
+
+g_rl_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_rl_luma
+               blendfunc blend
+       }
+}
+
+g_seeker_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_seeker_luma
+               blendfunc blend
+       }
+}
+
+g_shockwave_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_shockwave_luma
+               blendfunc blend
+       }
+}
+
+g_shotgun_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_shotgun_luma
+               blendfunc blend
+       }
+}
+
+g_tuba_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_tuba_luma
+               blendfunc blend
+       }
+}
+
+g_uzi_luma
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+       {
+               map models/weapons/g_uzi_luma
+               blendfunc blend
+       }
+}
diff --git a/sound/menu/README b/sound/menu/README
new file mode 100644 (file)
index 0000000..eede58b
--- /dev/null
@@ -0,0 +1,10 @@
+SOUND    PLAYED WHEN
+
+open     opening dialog
+close    closing dialog
+focus    moving focus to new item
+execute  pressing button, enter key, or double click
+select   using checkbox, radiobutton, or similar
+slide    using slider or colorpicker
+clear    clearing inputbox or keybind
+winner   winning single player campaign
diff --git a/sound/menu/clear.wav b/sound/menu/clear.wav
new file mode 100644 (file)
index 0000000..a622af8
Binary files /dev/null and b/sound/menu/clear.wav differ
diff --git a/sound/menu/close.wav b/sound/menu/close.wav
new file mode 100644 (file)
index 0000000..c990fbd
Binary files /dev/null and b/sound/menu/close.wav differ
diff --git a/sound/menu/execute.wav b/sound/menu/execute.wav
new file mode 100644 (file)
index 0000000..58b3d1c
Binary files /dev/null and b/sound/menu/execute.wav differ
diff --git a/sound/menu/focus.wav b/sound/menu/focus.wav
new file mode 100644 (file)
index 0000000..a045d26
Binary files /dev/null and b/sound/menu/focus.wav differ
diff --git a/sound/menu/open.wav b/sound/menu/open.wav
new file mode 100644 (file)
index 0000000..c990fbd
Binary files /dev/null and b/sound/menu/open.wav differ
diff --git a/sound/menu/select.wav b/sound/menu/select.wav
new file mode 100644 (file)
index 0000000..58b3d1c
Binary files /dev/null and b/sound/menu/select.wav differ
diff --git a/sound/menu/slide.wav b/sound/menu/slide.wav
new file mode 100644 (file)
index 0000000..58b3d1c
Binary files /dev/null and b/sound/menu/slide.wav differ
diff --git a/sound/menu/winner.ogg b/sound/menu/winner.ogg
new file mode 100644 (file)
index 0000000..56b114e
Binary files /dev/null and b/sound/menu/winner.ogg differ
diff --git a/sound/misc/menu1.wav b/sound/misc/menu1.wav
deleted file mode 100644 (file)
index a045d26..0000000
Binary files a/sound/misc/menu1.wav and /dev/null differ
diff --git a/sound/misc/menu2.wav b/sound/misc/menu2.wav
deleted file mode 100644 (file)
index 58b3d1c..0000000
Binary files a/sound/misc/menu2.wav and /dev/null differ
diff --git a/sound/misc/mouseclick.wav b/sound/misc/mouseclick.wav
deleted file mode 100644 (file)
index a622af8..0000000
Binary files a/sound/misc/mouseclick.wav and /dev/null differ