Merge branch 'master' into Mario/qc_updates
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 08:23:09 +0000 (19:23 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 08:32:25 +0000 (19:32 +1100)
Conflicts:
qcsrc/menu/classes.c
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/maplist.qc
qcsrc/server/command/banning.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qc

503 files changed:
binds-default.cfg [deleted file]
binds-xonotic.cfg [new file with mode: 0644]
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/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/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]
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/misc/chatbubble.spr_0.tga
models/misc/teambubble.spr_0.tga
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]
qcsrc/common/playerstats.qc
qcsrc/common/weapons/weapons.qc
qcsrc/dpdefs/progsdefs.qh
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/item.qc
qcsrc/menu/item/button.qc
qcsrc/menu/item/checkbox.qc
qcsrc/menu/item/dialog.qc
qcsrc/menu/item/inputbox.qc
qcsrc/menu/item/listbox.qc
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/item/nexposee.qc
qcsrc/menu/item/slider.qc
qcsrc/menu/menu.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/colorpicker.qc
qcsrc/menu/xonotic/colorpicker_string.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_settings_audio.qc
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
qcsrc/menu/xonotic/dialog_singleplayer_winner.qc
qcsrc/menu/xonotic/gametypelist.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/menu/xonotic/languagelist.qc
qcsrc/menu/xonotic/maplist.qc
qcsrc/menu/xonotic/playerlist.qc
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/skinlist.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/banning.qc
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/vote.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/t_items.qc
scripts/luma.shader [new file with mode: 0644]
serverbench.cfg
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]

diff --git a/binds-default.cfg b/binds-default.cfg
deleted file mode 100644 (file)
index f48842f..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-// alias for switching the teamselect menu
-bind f5 menu_showteamselect
-
-bind f6 team_auto
-
-bind f7 menu_showsandboxtools
-
-// movement
-bind w +forward
-bind a +moveleft
-bind s +back
-bind d +moveright
-bind UPARROW +forward
-bind LEFTARROW +moveleft
-bind DOWNARROW +back
-bind RIGHTARROW +moveright
-bind SHIFT +crouch
-bind ENTER +jump
-bind SPACE +jump
-
-// weapons
-bind 0 weapon_group_0
-bind 1 weapon_group_1
-bind 2 weapon_group_2
-bind 3 weapon_group_3
-bind 4 weapon_group_4
-bind 5 weapon_group_5
-bind 6 weapon_group_6
-bind 7 weapon_group_7
-bind 8 weapon_group_8
-bind 9 weapon_group_9
-bind q weaplast
-bind MOUSE1 +fire
-bind MOUSE2 +fire2
-bind MOUSE3 togglezoom
-bind MOUSE4 weaplast
-bind MOUSE5 +hook
-bind MWHEELUP weapnext
-bind MWHEELDOWN weapprev
-bind r reload
-bind BACKSPACE dropweapon
-bind g dropweapon
-bind f +use
-bind v +button8 // drag object
-
-// misc
-bind e +hook
-bind ` toggleconsole
-bind ~ toggleconsole
-bind TAB +showscores
-bind ESCAPE togglemenu
-bind t messagemode
-bind y messagemode2
-bind z messagemode2
-bind u "+con_chat_maximize"
-bind m +hud_panel_radar_maximized
-bind i +show_info
-bind PAUSE pause
-bind F10 menu_showquitdialog
-bind F11 disconnect
-bind F12 screenshot
-bind F4 ready
-bind ALT +showaccuracy
-
-// Gamepad defaults. Tested with Logitech Rumblepad 2, I hope similar ones works as well.
-bind JOY1 "+crouch"
-bind JOY2 "+jump"
-bind JOY3 "weapprev"
-bind JOY4 "weapnext"
-bind JOY5 "+fire2"
-bind JOY6 "+fire"
-bind JOY7 "+zoom"
-bind JOY8 "dropweapon"
-bind JOY9 "menu_showteamselect"
-bind JOY10 "+show_info"
-bind JOY11 "+showscores"
-bind JOY12 "+con_chat_maximize"
-seta joyadvanced "1"
-seta joyadvaxisr "2"
-seta joyadvaxisx "3"
-seta joyadvaxisy "1"
-seta joyadvaxisz "4"
-seta joysidesensitivity "1.0"
-seta joypitchsensitivity "0.9"
-seta joyyawsensitivity "-1.8"
-// SDL only
-seta joy_deadzoneforward "0.05"
-seta joy_deadzonepitch "0.05"
-seta joy_deadzoneside "0.05"
-seta joy_deadzoneup "0.05"
-seta joy_deadzoneyaw "0.05"
-seta joy_sensitivitypitch "0.9"
-seta joy_sensitivityyaw "-1.8"
-
-// team say
-bind kp_ins messagemode
-bind kp_del messagemode2
-bind kp_end "+userbind 1"
-bind kp_downarrow "+userbind 2"
-bind kp_pgdn "+userbind 3"
-bind kp_leftarrow "+userbind 4"
-bind kp_5 "+userbind 6"
-bind kp_rightarrow "+userbind 7"
-bind kp_home "+userbind 9"
-bind kp_uparrow "+userbind 10"
-bind kp_pgup "+userbind 11"
-bind kp_multiply "+userbind 12"
-bind kp_slash "+userbind 13"
-bind kp_enter "+userbind 16"
-bind kp_plus "+userbind 17"
-bind kp_minus "+userbind 18"
-
-bind F1 vyes
-bind F2 vno
-
-//used for spectate/observer mode
-bind F3 spec
-
-// usercommands. These can be edited and bound by the menu.
-seta "userbind1_press" "say_team quad soon";  seta "userbind1_release" "";  seta "userbind1_description" "team: quad soon"
-seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"
-seta "userbind3_press" "say_team took item (l:%l^7); g_waypointsprite_team_here";  seta "userbind3_release" "";  seta "userbind3_description" "team: took item, icon"
-seta "userbind4_press" "say_team negative";  seta "userbind4_release" "";  seta "userbind4_description" "team: negative"
-seta "userbind5_press" "say_team positive";  seta "userbind5_release" "";  seta "userbind5_description" "team: positive"
-seta "userbind6_press" "say_team need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme; cmd voice needhelp";  seta "userbind6_release" "";  seta "userbind6_description" "team: need help, icon"
-seta "userbind7_press" "say_team enemy seen (l:%y^7); g_waypointsprite_team_danger_p; cmd voice incoming";  seta "userbind7_release" "";  seta "userbind7_description" "team: enemy seen, icon"
-seta "userbind8_press" "say_team flag seen (l:%y^7); g_waypointsprite_team_here_p; cmd voice seenflag";  seta "userbind8_release" "";  seta "userbind8_description" "team: flag seen, icon"
-seta "userbind9_press" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind9_release" "";  seta "userbind9_description" "team: defending, icon"
-seta "userbind10_press" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind10_release" "";  seta "userbind10_description" "team: roaming, icon"
-seta "userbind11_press" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind11_release" "";  seta "userbind11_description" "team: attacking, icon"
-seta "userbind12_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_here_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon"
-seta "userbind13_press" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind13_release" ""; seta "userbind13_description" "team: dropped flag, icon"
-seta "userbind14_press" "say_team dropped gun %w^7 (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"; seta "userbind14_release" ""; seta "userbind14_description" "team: drop gun, icon"
-// TODO change this to "use" once we can
-seta "userbind15_press" "say_team dropped flag/key %w^7 (l:%l^7); g_waypointsprite_team_here; wait; +use"; seta "userbind15_release" "-use"; seta "userbind15_description" "team: drop flag/key, icon"
-seta "userbind16_press" "say :-) / nice one"; seta "userbind16_release" ""; seta "userbind16_description" "chat: nice one"
-seta "userbind17_press" "say good game"; seta "userbind17_release" ""; seta "userbind17_description" "chat: good game"
-seta "userbind18_press" "say hi / good luck and have fun"; seta "userbind18_release" ""; seta "userbind18_description" "chat: hi / good luck"
-seta "userbind19_press" "+showscores; +con_chat_maximize"; seta "userbind19_release" "-showscores; -con_chat_maximize"; seta "userbind19_description" "scoreboard / chat history"
-seta "userbind20_press" "toggle cl_capturevideo"; seta "userbind20_release" ""; seta "userbind20_description" "toggle recording .avi"
-seta "userbind21_press" "toggle vid_fullscreen; vid_restart"; seta "userbind21_release" ""; seta "userbind21_description" "toggle fullscreen"
-seta "userbind22_press" ""; seta "userbind22_release" ""; seta "userbind22_description" ""
-seta "userbind23_press" ""; seta "userbind23_release" ""; seta "userbind23_description" ""
-seta "userbind24_press" ""; seta "userbind24_release" ""; seta "userbind24_description" ""
-seta "userbind25_press" ""; seta "userbind25_release" ""; seta "userbind25_description" ""
-seta "userbind26_press" ""; seta "userbind26_release" ""; seta "userbind26_description" ""
-seta "userbind27_press" ""; seta "userbind27_release" ""; seta "userbind27_description" ""
-seta "userbind28_press" ""; seta "userbind28_release" ""; seta "userbind28_description" ""
-seta "userbind29_press" ""; seta "userbind29_release" ""; seta "userbind29_description" ""
-seta "userbind30_press" ""; seta "userbind30_release" ""; seta "userbind30_description" ""
-seta "userbind31_press" ""; seta "userbind31_release" ""; seta "userbind31_description" ""
-seta "userbind32_press" ""; seta "userbind32_release" ""; seta "userbind32_description" ""
-alias _userbind_call "${$1}"
-alias +userbind "_userbind_call userbind${1}_press"
-alias -userbind "_userbind_call userbind${1}_release"
\ No newline at end of file
diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg
new file mode 100644 (file)
index 0000000..f48842f
--- /dev/null
@@ -0,0 +1,155 @@
+// alias for switching the teamselect menu
+bind f5 menu_showteamselect
+
+bind f6 team_auto
+
+bind f7 menu_showsandboxtools
+
+// movement
+bind w +forward
+bind a +moveleft
+bind s +back
+bind d +moveright
+bind UPARROW +forward
+bind LEFTARROW +moveleft
+bind DOWNARROW +back
+bind RIGHTARROW +moveright
+bind SHIFT +crouch
+bind ENTER +jump
+bind SPACE +jump
+
+// weapons
+bind 0 weapon_group_0
+bind 1 weapon_group_1
+bind 2 weapon_group_2
+bind 3 weapon_group_3
+bind 4 weapon_group_4
+bind 5 weapon_group_5
+bind 6 weapon_group_6
+bind 7 weapon_group_7
+bind 8 weapon_group_8
+bind 9 weapon_group_9
+bind q weaplast
+bind MOUSE1 +fire
+bind MOUSE2 +fire2
+bind MOUSE3 togglezoom
+bind MOUSE4 weaplast
+bind MOUSE5 +hook
+bind MWHEELUP weapnext
+bind MWHEELDOWN weapprev
+bind r reload
+bind BACKSPACE dropweapon
+bind g dropweapon
+bind f +use
+bind v +button8 // drag object
+
+// misc
+bind e +hook
+bind ` toggleconsole
+bind ~ toggleconsole
+bind TAB +showscores
+bind ESCAPE togglemenu
+bind t messagemode
+bind y messagemode2
+bind z messagemode2
+bind u "+con_chat_maximize"
+bind m +hud_panel_radar_maximized
+bind i +show_info
+bind PAUSE pause
+bind F10 menu_showquitdialog
+bind F11 disconnect
+bind F12 screenshot
+bind F4 ready
+bind ALT +showaccuracy
+
+// Gamepad defaults. Tested with Logitech Rumblepad 2, I hope similar ones works as well.
+bind JOY1 "+crouch"
+bind JOY2 "+jump"
+bind JOY3 "weapprev"
+bind JOY4 "weapnext"
+bind JOY5 "+fire2"
+bind JOY6 "+fire"
+bind JOY7 "+zoom"
+bind JOY8 "dropweapon"
+bind JOY9 "menu_showteamselect"
+bind JOY10 "+show_info"
+bind JOY11 "+showscores"
+bind JOY12 "+con_chat_maximize"
+seta joyadvanced "1"
+seta joyadvaxisr "2"
+seta joyadvaxisx "3"
+seta joyadvaxisy "1"
+seta joyadvaxisz "4"
+seta joysidesensitivity "1.0"
+seta joypitchsensitivity "0.9"
+seta joyyawsensitivity "-1.8"
+// SDL only
+seta joy_deadzoneforward "0.05"
+seta joy_deadzonepitch "0.05"
+seta joy_deadzoneside "0.05"
+seta joy_deadzoneup "0.05"
+seta joy_deadzoneyaw "0.05"
+seta joy_sensitivitypitch "0.9"
+seta joy_sensitivityyaw "-1.8"
+
+// team say
+bind kp_ins messagemode
+bind kp_del messagemode2
+bind kp_end "+userbind 1"
+bind kp_downarrow "+userbind 2"
+bind kp_pgdn "+userbind 3"
+bind kp_leftarrow "+userbind 4"
+bind kp_5 "+userbind 6"
+bind kp_rightarrow "+userbind 7"
+bind kp_home "+userbind 9"
+bind kp_uparrow "+userbind 10"
+bind kp_pgup "+userbind 11"
+bind kp_multiply "+userbind 12"
+bind kp_slash "+userbind 13"
+bind kp_enter "+userbind 16"
+bind kp_plus "+userbind 17"
+bind kp_minus "+userbind 18"
+
+bind F1 vyes
+bind F2 vno
+
+//used for spectate/observer mode
+bind F3 spec
+
+// usercommands. These can be edited and bound by the menu.
+seta "userbind1_press" "say_team quad soon";  seta "userbind1_release" "";  seta "userbind1_description" "team: quad soon"
+seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p";  seta "userbind2_release" "";  seta "userbind2_description" "team: free item, icon"
+seta "userbind3_press" "say_team took item (l:%l^7); g_waypointsprite_team_here";  seta "userbind3_release" "";  seta "userbind3_description" "team: took item, icon"
+seta "userbind4_press" "say_team negative";  seta "userbind4_release" "";  seta "userbind4_description" "team: negative"
+seta "userbind5_press" "say_team positive";  seta "userbind5_release" "";  seta "userbind5_description" "team: positive"
+seta "userbind6_press" "say_team need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme; cmd voice needhelp";  seta "userbind6_release" "";  seta "userbind6_description" "team: need help, icon"
+seta "userbind7_press" "say_team enemy seen (l:%y^7); g_waypointsprite_team_danger_p; cmd voice incoming";  seta "userbind7_release" "";  seta "userbind7_description" "team: enemy seen, icon"
+seta "userbind8_press" "say_team flag seen (l:%y^7); g_waypointsprite_team_here_p; cmd voice seenflag";  seta "userbind8_release" "";  seta "userbind8_description" "team: flag seen, icon"
+seta "userbind9_press" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind9_release" "";  seta "userbind9_description" "team: defending, icon"
+seta "userbind10_press" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind10_release" "";  seta "userbind10_description" "team: roaming, icon"
+seta "userbind11_press" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here";  seta "userbind11_release" "";  seta "userbind11_description" "team: attacking, icon"
+seta "userbind12_press" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_here_p"; seta "userbind12_release" ""; seta "userbind12_description" "team: killed flag, icon"
+seta "userbind13_press" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"; seta "userbind13_release" ""; seta "userbind13_description" "team: dropped flag, icon"
+seta "userbind14_press" "say_team dropped gun %w^7 (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"; seta "userbind14_release" ""; seta "userbind14_description" "team: drop gun, icon"
+// TODO change this to "use" once we can
+seta "userbind15_press" "say_team dropped flag/key %w^7 (l:%l^7); g_waypointsprite_team_here; wait; +use"; seta "userbind15_release" "-use"; seta "userbind15_description" "team: drop flag/key, icon"
+seta "userbind16_press" "say :-) / nice one"; seta "userbind16_release" ""; seta "userbind16_description" "chat: nice one"
+seta "userbind17_press" "say good game"; seta "userbind17_release" ""; seta "userbind17_description" "chat: good game"
+seta "userbind18_press" "say hi / good luck and have fun"; seta "userbind18_release" ""; seta "userbind18_description" "chat: hi / good luck"
+seta "userbind19_press" "+showscores; +con_chat_maximize"; seta "userbind19_release" "-showscores; -con_chat_maximize"; seta "userbind19_description" "scoreboard / chat history"
+seta "userbind20_press" "toggle cl_capturevideo"; seta "userbind20_release" ""; seta "userbind20_description" "toggle recording .avi"
+seta "userbind21_press" "toggle vid_fullscreen; vid_restart"; seta "userbind21_release" ""; seta "userbind21_description" "toggle fullscreen"
+seta "userbind22_press" ""; seta "userbind22_release" ""; seta "userbind22_description" ""
+seta "userbind23_press" ""; seta "userbind23_release" ""; seta "userbind23_description" ""
+seta "userbind24_press" ""; seta "userbind24_release" ""; seta "userbind24_description" ""
+seta "userbind25_press" ""; seta "userbind25_release" ""; seta "userbind25_description" ""
+seta "userbind26_press" ""; seta "userbind26_release" ""; seta "userbind26_description" ""
+seta "userbind27_press" ""; seta "userbind27_release" ""; seta "userbind27_description" ""
+seta "userbind28_press" ""; seta "userbind28_release" ""; seta "userbind28_description" ""
+seta "userbind29_press" ""; seta "userbind29_release" ""; seta "userbind29_description" ""
+seta "userbind30_press" ""; seta "userbind30_release" ""; seta "userbind30_description" ""
+seta "userbind31_press" ""; seta "userbind31_release" ""; seta "userbind31_description" ""
+seta "userbind32_press" ""; seta "userbind32_release" ""; seta "userbind32_description" ""
+alias _userbind_call "${$1}"
+alias +userbind "_userbind_call userbind${1}_press"
+alias -userbind "_userbind_call userbind${1}_release"
\ No newline at end of file
index 4d25938..034b3bb 100644 (file)
@@ -52,6 +52,7 @@ mod_q3bsp_lightmapmergepower 4
 // player defaults
 _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
 _cl_name ""
+seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)"
 _cl_playermodel models/player/erebus.iqm
 _cl_playerskin 0
 
@@ -786,12 +787,12 @@ set g_banned_list_idmode "1"      "when set, the IP banning system always uses the ID
 
 r_labelsprites_scale 0.40625 // labels sprites get displayed at 0.5x from 640x480 to 1280x1024, and at 1x from 1600x1200 onwards
 
-exec binds-default.cfg
+exec binds-xonotic.cfg
 
 // we must change its default from 1.0 to 1 to be consistent with menuqc
 set slowmo 1
 
-seta menu_skin "luminos"
+seta menu_skin "luma"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 seta menu_tooltips 1 "menu tooltips: 0 disabled, 1 enabled, 2 also shows cvar or console command (when available) changed or executed by the item"
@@ -1406,7 +1407,7 @@ exec _hud_common.cfg
 exec _hud_descriptions.cfg
 // exec the default skin config
 // please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency
-exec hud_luminos.cfg
+exec hud_luma.cfg
 
 
 // ... and now that everything is configured/aliased, we can do some things:
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/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/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
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
index d30980a..ae23918 100644 (file)
Binary files a/models/misc/chatbubble.spr_0.tga and b/models/misc/chatbubble.spr_0.tga differ
index 9c6af1e..0392100 100644 (file)
Binary files a/models/misc/teambubble.spr_0.tga and b/models/misc/teambubble.spr_0.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 27a7bb6..5890fb8 100644 (file)
@@ -516,7 +516,7 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status)
                        #endif
                        url_fputs(fh, sprintf("l %s\n", cvar_string("_menu_prvm_language"))); // language
                        url_fputs(fh, sprintf("c %s\n", cvar_string("_menu_prvm_country"))); // country
-                       url_fputs(fh, sprintf("g %s\n", cvar_string("_menu_prvm_gender"))); // gender
+                       url_fputs(fh, sprintf("g %s\n", cvar_string("_cl_gender"))); // gender
                        url_fputs(fh, sprintf("n %s\n", cvar_string("_cl_name"))); // name
                        url_fputs(fh, sprintf("m %s %s\n", cvar_string("_cl_playermodel"), cvar_string("_cl_playerskin"))); // model/skin
                        */url_fputs(fh, "\n");
@@ -916,7 +916,7 @@ void PlayerInfo_ready(entity fh, entity p, float status)
 #ifdef MENUQC
                         url_fputs(fh, sprintf("l %s\n", cvar_string("_menu_prvm_language"))); // language
                         url_fputs(fh, sprintf("c %s\n", cvar_string("_menu_prvm_country"))); // country
-                        url_fputs(fh, sprintf("g %s\n", cvar_string("_menu_prvm_gender"))); // gender
+                        url_fputs(fh, sprintf("g %s\n", cvar_string("_cl_gender"))); // gender
                         url_fputs(fh, sprintf("n %s\n", cvar_string("_cl_name"))); // name
                         url_fputs(fh, sprintf("m %s %s\n", cvar_string("_cl_playermodel"), cvar_string("_cl_playerskin"))); // model/skin
 #endif
index 2b2fca3..55fcc0e 100644 (file)
@@ -165,7 +165,7 @@ void register_weapon(
        e.netname = refname;
        e.message = wepname;
 
-       #ifndef MENUQC
+       #ifdef CSQC
        func(WR_INIT);
        #endif
 }
index 30ebe1b..fe632ce 100644 (file)
@@ -76,6 +76,9 @@ void()                PlayerPreThink;
 void()                 PlayerPostThink;
 
 void()         ClientKill;
+#ifdef DP_EXT_PRECONNECT
+void()         ClientPreConnect;
+#endif
 void()         ClientConnect;
 void()                 PutClientInServer;              // call after setting the parm1... parms
 void()         ClientDisconnect;
index bc044a2..93825cd 100644 (file)
@@ -89,7 +89,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 d055b1a..d0bd40b 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 f6ba208..52e5823 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,14 @@ void Button_draw(entity me)
 
        SUPER(Button).draw(me);
 }
+void Dialog_Close(entity button, entity 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 94f67ba..2540cc8 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 62c7440..1723f27 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 d3f6815..275b200 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 2f29795..178b12b 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')
index 38332fd..bff2170 100644 (file)
@@ -150,32 +150,27 @@ void ModalController_draw(entity me)
                if(e.ModalController_state)
                {
                        if(front)
+                       {
                                me.switchState(me, front, 2, 0);
+                               if(front.ModalController_factor < 1)
+                                       animating = 1;
+                       }
                        front = e;
                }
        if(front)
+       {
                me.switchState(me, front, 1, 0);
+               if(front.ModalController_factor < 1)
+                       animating = 1;
+       }
+
+       if(front && front.Container_alpha == front.ModalController_initialAlpha)
+               goto update_done; // update isn't needed, everything stay as is
 
        df = frametime * 3; // animation speed
 
        for(e = me.firstChild; e; e = e.nextSibling)
        {
-               f = (e.ModalController_factor = min(1, e.ModalController_factor + df));
-               if(e.ModalController_state)
-                       if(f < 1)
-                               animating = 1;
-
-               if(f < 1)
-               {
-                       prevFactor   = (1 - f) / (1 - f + df);
-                       targetFactor =     df  / (1 - f + df);
-               }
-               else
-               {
-                       prevFactor = 0;
-                       targetFactor = 1;
-               }
-
                if(e.ModalController_state == 2)
                {
                        // fading out partially
@@ -193,24 +188,36 @@ void ModalController_draw(entity me)
                else
                {
                        // fading out
-                       if(f < 1)
-                               animating = 1;
                        targetOrigin = e.Container_origin; // stay as is
                        targetSize = e.Container_size; // stay as is
                        targetAlpha = 0;
                }
 
+               f = (e.ModalController_factor = min(1, e.ModalController_factor + df));
                if(f == 1)
                {
+                       prevFactor = 0;
+                       targetFactor = 1;
                        e.Container_origin = targetOrigin;
                        e.Container_size = targetSize;
                        me.setAlphaOf(me, e, targetAlpha);
                }
                else
                {
-                       e.Container_origin = e.Container_origin * prevFactor + targetOrigin * targetFactor;
-                       e.Container_size   = e.Container_size   * prevFactor + targetSize   * targetFactor;
-                       me.setAlphaOf(me, e, e.Container_alpha  * prevFactor + targetAlpha  * targetFactor);
+                       prevFactor = (1 - f) / (1 - f + df);
+                       if(!e.ModalController_state) // optimize code and avoid precision errors
+                               me.setAlphaOf(me, e, e.Container_alpha  * prevFactor);
+                       else
+                       {
+                               targetFactor = df / (1 - f + df);
+
+                               if(e.ModalController_state == 1)
+                               {
+                                       e.Container_origin = e.Container_origin * prevFactor + targetOrigin * targetFactor;
+                                       e.Container_size   = e.Container_size   * prevFactor + targetSize   * targetFactor;
+                               }
+                               me.setAlphaOf(me, e, e.Container_alpha  * prevFactor + targetAlpha  * targetFactor);
+                       }
                }
                // assume: o == to * f_prev + X * (1 - f_prev)
                // make:   o' = to * f  + X * (1 - f)
@@ -220,10 +227,15 @@ void ModalController_draw(entity me)
                // --> (maxima)
                // o' = (to * (f - f_prev) + o * (1 - f)) / (1 - f_prev)
 
-               fs = globalToBoxSize(e.Container_size, e.ModalController_initialSize);
-               e.Container_fontscale_x = fs.x * e.ModalController_initialFontScale.x;
-               e.Container_fontscale_y = fs.y * e.ModalController_initialFontScale.y;
+               if(e.ModalController_state == 1)
+               {
+                       fs = globalToBoxSize(e.Container_size, e.ModalController_initialSize);
+                       e.Container_fontscale_x = fs.x * e.ModalController_initialFontScale.x;
+                       e.Container_fontscale_y = fs.y * e.ModalController_initialFontScale.y;
+               }
        }
+       :update_done
+
        if(animating || !me.focused)
                me.setFocus(me, NULL);
        else
index 79a294a..1413039 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 f97871b..2c74f61 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 e9f3538..e348796 100644 (file)
@@ -1003,3 +1003,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 2aa2b5d..00f6017 100644 (file)
@@ -52,4 +52,18 @@ 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);
 #endif
index 6634728..f16ab0e 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 f0e3e6d..458a72c 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 bf891ac..1adfb01 100644 (file)
@@ -141,7 +141,7 @@ void XonoticProfileTab_fill(entity me)
        //me.gotoRC(me, 6.5, 3.1); me.setFirstColumn(me, me.currentColumn); // TOP SECTION, BOTTOM POS
        #if 0
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gender:")));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_gender"));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("_cl_gender"));
                        e.addValue(e, ZCTX(_("GENDER^Undisclosed")), "0");
                        e.addValue(e, ZCTX(_("GENDER^Female")), "1");
                        e.addValue(e, ZCTX(_("GENDER^Male")), "2");
@@ -153,9 +153,9 @@ void XonoticProfileTab_fill(entity me)
                        #define GENDERWIDTH_LENGTH 2.5
                        #define GENDERWIDTH_ITEM (GENDERWIDTH_LENGTH / 3)
                        me.TDempty(me, GENDERWIDTH_OFFSET);
-                       me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "cl_gender", "2", _("Female")));
-                       me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "cl_gender", "1", _("Male")));
-                       me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "cl_gender", "0", _("Undisclosed")));
+                       me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "_cl_gender", "2", _("Female")));
+                       me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "_cl_gender", "1", _("Male")));
+                       me.TD(me, 1, GENDERWIDTH_ITEM, e = makeXonoticRadioButton(3, "_cl_gender", "0", _("Undisclosed")));
        #endif
 
        me.gotoRC(me, me.rows - 1, 0);
index 81624fd..cccaa26 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 7e34151..0aa38e8 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 8e584b8..0d1c05a 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 45f493b..feb1d89 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 7304202..a083207 100644 (file)
@@ -170,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");
@@ -233,13 +234,14 @@ 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");
 }
 void KeyBinder_Bind_Reset_All(entity btn, entity me)
 {
        localcmd("unbindall\n");
-       localcmd("exec binds-default.cfg\n");
+       localcmd("exec binds-xonotic.cfg\n");
        localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
        cvar_set("_hud_showbinds_reload", "1");
 }
index 2d43a47..8aa0d2c 100644 (file)
@@ -140,12 +140,15 @@ void XonoticLanguageList_saveCvars(entity me)
 
 void XonoticLanguageList_doubleClickListBoxItem(entity me, float i, vector where)
 {
+       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 60720bd..d88ad0e 100644 (file)
@@ -141,7 +141,10 @@ 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)
@@ -150,6 +153,7 @@ void XonoticMapList_doubleClickListBoxItem(entity me, float i, vector where)
                if(where.x <= 1)
                {
                        // 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));
                }
@@ -296,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 8daf730..d4dc5af 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 db0fbfe..c6c53cc 100644 (file)
@@ -561,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");
@@ -943,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;
        }
@@ -1245,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 c0c05a8..9990c83 100644 (file)
@@ -181,12 +181,15 @@ void SetSkin_Click(entity btn, entity me)
 
 void XonoticSkinList_doubleClickListBoxItem(entity me, float i, vector where)
 {
+       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 b73d747..89647d5 100644 (file)
@@ -1016,6 +1016,27 @@ float PlayerInIDList(entity p, string idlist)
        return 0;
 }
 
+#ifdef DP_EXT_PRECONNECT
+/*
+=============
+ClientPreConnect
+
+Called once (not at each match start) when a client begins a connection to the server
+=============
+*/
+void ClientPreConnect (void)
+{
+       if(autocvar_sv_eventlog)
+       {
+               GameLogEcho(sprintf(":connect:%d:%d:%s",
+                       self.playerid,
+                       num_for_edict(self),
+                       ((IS_REAL_CLIENT(self)) ? self.netaddress : "bot")
+               ));
+       }
+}
+#endif
+
 /*
 =============
 ClientConnect
index cddea7d..9091ae0 100644 (file)
@@ -80,7 +80,7 @@ void BanCommand_kickban(float request, float argc, string command)
                        if(argc >= 2)
                        {
                                entity client = GetIndexedEntity(argc, 1);
-                               float accepted = VerifyClientEntity(client, true, false);
+                               float accepted = VerifyKickableEntity(client);
                                float reason_arg, bantime, masksize;
                                string reason;
 
index eb54502..09314c7 100644 (file)
@@ -26,6 +26,14 @@ string GetCallerName(entity caller)
                return admin_name(); //((autocvar_sv_adminnick != "") ? autocvar_sv_adminnick : autocvar_hostname);
 }
 
+// verify that the client provided is acceptable for kicking
+float VerifyKickableEntity(entity client)
+{
+       if (!IS_REAL_CLIENT(client))
+               return CLIENT_NOT_REAL;
+       return CLIENT_ACCEPTABLE;
+}
+
 // verify that the client provided is acceptable for use
 float VerifyClientEntity(entity client, float must_be_real, float must_be_bots)
 {
index e31a428..2a03041 100644 (file)
@@ -51,6 +51,9 @@ string GetCommandPrefix(entity caller);
 // if client return player nickname, or if server return admin nickname
 string GetCallerName(entity caller);
 
+// verify that the client provided is acceptable for kicking
+float VerifyKickableEntity(entity client);
+
 // verify that the client provided is acceptable for use
 float VerifyClientEntity(entity client, float must_be_real, float must_be_bots);
 
index 4238f28..6edccaf 100644 (file)
@@ -814,6 +814,7 @@ void VoteCommand_call(float request, entity caller, float argc, string vote_comm
                        else if(!autocvar_sv_vote_gamestart && time < game_starttime) { print_to(caller, "^1Vote calling is not allowed before the match has started."); }
                        else if(vote_called) { print_to(caller, "^1There is already a vote called."); }
                        else if(!spectators_allowed && (caller && !IS_PLAYER(caller))) { print_to(caller, "^1Only players can call a vote."); }
+                       else if(caller && !IS_CLIENT(caller)) { print_to(caller, "^1Only connected clients can vote."); }
                        else if(timeout_status) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
                        else if(caller && (time < caller.vote_waittime)) { print_to(caller, strcat("^1You have to wait ^2", ftos(ceil(caller.vote_waittime - time)), "^1 seconds before you can again call a vote.")); }
                        else if (!VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
index 81ca387..bd98808 100644 (file)
@@ -472,7 +472,7 @@ float Ban_MaybeEnforceBanOnce(entity client)
        if(client.ban_checked)
                return false;
        client.ban_checked = true;
-       return Ban_MaybeEnforceBan(self);
+       return Ban_MaybeEnforceBan(client);
 }
 
 string Ban_Enforce(float i, string reason)
@@ -482,7 +482,8 @@ string Ban_Enforce(float i, string reason)
 
        // Enforce our new ban
        s = "";
-       FOR_EACH_REALCLIENT(e)
+       FOR_EACH_CLIENTSLOT(e)
+               if (IS_REAL_CLIENT(e))
                if(Ban_IsClientBanned(e, i))
                {
                        if(reason != "")
index 97f85e5..f19f53f 100644 (file)
@@ -382,6 +382,9 @@ void readlevelcvars(void)
        if (!warmup_stage)
                game_starttime = time + cvar("g_start_delay");
 
+       for(int i = WEP_FIRST; i <= WEP_LAST; ++i)
+               WEP_ACTION(i, WR_INIT);
+
        readplayerstartcvars();
 }
 
index c2add84..03af802 100644 (file)
@@ -1345,6 +1345,7 @@ void spawnfunc_target_items (void)
 {
        float n, i, j;
        entity e;
+       string s;
 
        self.use = target_items_use;
        if(!self.strength_finished)
@@ -1383,7 +1384,8 @@ void spawnfunc_target_items (void)
                                for(j = WEP_FIRST; j <= WEP_LAST; ++j)
                                {
                                        e = get_weaponinfo(j);
-                                       if(argv(i) == e.netname)
+                                       s = W_UndeprecateName(argv(i));
+                                       if(s == e.netname)
                                        {
                                                self.weapons |= WepSet_FromWeapon(j);
                                                if(self.spawnflags == 0 || self.spawnflags == 2)
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
+       }
+}