Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 14 Jul 2010 20:33:14 +0000 (22:33 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 14 Jul 2010 20:33:14 +0000 (22:33 +0200)
Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh

461 files changed:
.gitattributes
balance.cfg
bots.txt
defaultXonotic.cfg
gfx/hud/default/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/default/ammo_cells.tga [new file with mode: 0644]
gfx/hud/default/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/default/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/default/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/default/ammo_shells.tga [new file with mode: 0644]
gfx/hud/default/armor.tga [new file with mode: 0644]
gfx/hud/default/border.tga
gfx/hud/default/border_chat.tga [new file with mode: 0644]
gfx/hud/default/border_healtharmor.tga [new file with mode: 0644]
gfx/hud/default/border_highlighted.tga [new file with mode: 0644]
gfx/hud/default/border_highlighted2.tga [new file with mode: 0644]
gfx/hud/default/border_inventory.tga [new file with mode: 0644]
gfx/hud/default/border_modicons.tga [new file with mode: 0644]
gfx/hud/default/border_powerups.tga [new file with mode: 0644]
gfx/hud/default/border_radar.tga [new file with mode: 0644]
gfx/hud/default/border_score.tga [new file with mode: 0644]
gfx/hud/default/border_timer.tga [new file with mode: 0644]
gfx/hud/default/border_vote.tga [new file with mode: 0644]
gfx/hud/default/border_weaponicons.tga [new file with mode: 0644]
gfx/hud/default/borderx.tga [deleted file]
gfx/hud/default/dock.tga [new file with mode: 0644]
gfx/hud/default/dock_small.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/default/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/default/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/default/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/default/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/default/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/default/health.tga [new file with mode: 0644]
gfx/hud/default/key_backward.tga [new file with mode: 0644]
gfx/hud/default/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/default/key_crouch.tga [new file with mode: 0644]
gfx/hud/default/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/default/key_forward.tga [new file with mode: 0644]
gfx/hud/default/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/default/key_jump.tga [new file with mode: 0644]
gfx/hud/default/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/default/key_left.tga [new file with mode: 0644]
gfx/hud/default/key_left_inv.tga [new file with mode: 0644]
gfx/hud/default/key_right.tga [new file with mode: 0644]
gfx/hud/default/key_right_inv.tga [new file with mode: 0644]
gfx/hud/default/kh_blue.tga [new file with mode: 0644]
gfx/hud/default/kh_bluearrow.tga [new file with mode: 0644]
gfx/hud/default/kh_pink.tga [new file with mode: 0644]
gfx/hud/default/kh_pinkarrow.tga [new file with mode: 0644]
gfx/hud/default/kh_red.tga [new file with mode: 0644]
gfx/hud/default/kh_redarrow.tga [new file with mode: 0644]
gfx/hud/default/kh_yellow.tga [new file with mode: 0644]
gfx/hud/default/kh_yellowarrow.tga [new file with mode: 0644]
gfx/hud/default/nexball_carrying.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_captured.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_lost.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_returned.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_shielded.tga [new file with mode: 0644]
gfx/hud/default/notify_blue_taken.tga [new file with mode: 0644]
gfx/hud/default/notify_camping.tga [new file with mode: 0644]
gfx/hud/default/notify_death.tga [new file with mode: 0644]
gfx/hud/default/notify_fall.tga [new file with mode: 0644]
gfx/hud/default/notify_lava.tga [new file with mode: 0644]
gfx/hud/default/notify_outofammo.tga [new file with mode: 0644]
gfx/hud/default/notify_red_captured.tga [new file with mode: 0644]
gfx/hud/default/notify_red_lost.tga [new file with mode: 0644]
gfx/hud/default/notify_red_returned.tga [new file with mode: 0644]
gfx/hud/default/notify_red_shielded.tga [new file with mode: 0644]
gfx/hud/default/notify_red_taken.tga [new file with mode: 0644]
gfx/hud/default/notify_selfkill.tga [new file with mode: 0644]
gfx/hud/default/notify_shootingstar.tga [new file with mode: 0644]
gfx/hud/default/notify_slime.tga [new file with mode: 0644]
gfx/hud/default/notify_teamkill_blue.tga [new file with mode: 0644]
gfx/hud/default/notify_teamkill_red.tga [new file with mode: 0644]
gfx/hud/default/notify_void.tga [new file with mode: 0644]
gfx/hud/default/notify_water.tga [new file with mode: 0644]
gfx/hud/default/num_0.tga [new file with mode: 0644]
gfx/hud/default/num_0_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_1.tga [new file with mode: 0644]
gfx/hud/default/num_1_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_2.tga [new file with mode: 0644]
gfx/hud/default/num_2_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_3.tga [new file with mode: 0644]
gfx/hud/default/num_3_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_4.tga [new file with mode: 0644]
gfx/hud/default/num_4_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_5.tga [new file with mode: 0644]
gfx/hud/default/num_5_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_6.tga [new file with mode: 0644]
gfx/hud/default/num_6_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_7.tga [new file with mode: 0644]
gfx/hud/default/num_7_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_8.tga [new file with mode: 0644]
gfx/hud/default/num_8_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_9.tga [new file with mode: 0644]
gfx/hud/default/num_9_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_colon.tga [new file with mode: 0644]
gfx/hud/default/num_colon_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_dot.tga [new file with mode: 0644]
gfx/hud/default/num_dot_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_leading.tga [new file with mode: 0644]
gfx/hud/default/num_minus.tga [new file with mode: 0644]
gfx/hud/default/num_minus_stroke.tga [new file with mode: 0644]
gfx/hud/default/num_plus.tga [new file with mode: 0644]
gfx/hud/default/num_plus_stroke.tga [new file with mode: 0644]
gfx/hud/default/race_newfail.tga [new file with mode: 0644]
gfx/hud/default/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/default/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/default/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/default/race_newtime.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_1.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_2.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_3.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_4.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_5.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_6.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_7.tga [new file with mode: 0644]
gfx/hud/default/rifle_ring_8.tga [new file with mode: 0644]
gfx/hud/default/shield.tga [new file with mode: 0644]
gfx/hud/default/statusbar.tga [new file with mode: 0644]
gfx/hud/default/statusbar_vertical.tga [new file with mode: 0644]
gfx/hud/default/strength.tga [new file with mode: 0644]
gfx/hud/default/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/default/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/default/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/default/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/default/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/default/weapon_complainbubble.tga [new file with mode: 0644]
gfx/hud/default/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/default/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/default/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/default/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/default/weaponelectro.tga [new file with mode: 0644]
gfx/hud/default/weaponfireball.tga [new file with mode: 0644]
gfx/hud/default/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/default/weaponhagar.tga [new file with mode: 0644]
gfx/hud/default/weaponhlac.tga [new file with mode: 0644]
gfx/hud/default/weaponhook.tga [new file with mode: 0644]
gfx/hud/default/weaponlaser.tga [new file with mode: 0644]
gfx/hud/default/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/default/weaponnex.tga [new file with mode: 0644]
gfx/hud/default/weaponporto.tga [new file with mode: 0644]
gfx/hud/default/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/default/weaponseeker.tga [new file with mode: 0644]
gfx/hud/default/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/default/weapontuba.tga [new file with mode: 0644]
gfx/hud/default/weaponuzi.tga [new file with mode: 0644]
gfx/hud/old/num_leading.tga [new file with mode: 0644]
gfx/hud/old/num_leading_1.tga [deleted file]
gfx/hud/old/num_leading_2.tga [deleted file]
gfx/hud/old/num_leading_3.tga [deleted file]
gfx/hud/wickedhud/flag_blue_carrying.tga
gfx/hud/wickedhud/flag_blue_lost.tga
gfx/hud/wickedhud/flag_blue_shielded.tga
gfx/hud/wickedhud/flag_blue_taken.tga
gfx/hud/wickedhud/flag_red_carrying.tga
gfx/hud/wickedhud/flag_red_lost.tga
gfx/hud/wickedhud/flag_red_shielded.tga
gfx/hud/wickedhud/flag_red_taken.tga
gfx/hud/wickedhud/key_backward.tga
gfx/hud/wickedhud/key_backward_inv.tga
gfx/hud/wickedhud/key_crouch.tga
gfx/hud/wickedhud/key_crouch_inv.tga
gfx/hud/wickedhud/key_forward.tga
gfx/hud/wickedhud/key_forward_inv.tga
gfx/hud/wickedhud/key_jump.tga
gfx/hud/wickedhud/key_jump_inv.tga
gfx/hud/wickedhud/key_left.tga
gfx/hud/wickedhud/key_left_inv.tga
gfx/hud/wickedhud/key_right.tga
gfx/hud/wickedhud/key_right_inv.tga
gfx/hud/wickedhud/notify_blue_captured.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_blue_lost.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_blue_returned.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_blue_shielded.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_blue_taken.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_camping.tga
gfx/hud/wickedhud/notify_death.tga
gfx/hud/wickedhud/notify_lava.tga
gfx/hud/wickedhud/notify_red_captured.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_red_lost.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_red_returned.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_red_shielded.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_red_taken.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_selfkill.tga
gfx/hud/wickedhud/notify_slime.tga
gfx/hud/wickedhud/notify_teamkill.tga [deleted file]
gfx/hud/wickedhud/notify_teamkill_blue.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_teamkill_red.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_water.tga
gfx/hud/wickedhud/num_leading.tga [new file with mode: 0644]
gfx/hud/wickedhud/num_leading_1.tga [deleted file]
gfx/hud/wickedhud/num_leading_2.tga [deleted file]
gfx/hud/wickedhud/num_leading_3.tga [deleted file]
gfx/hud/wickedhud/race_newfail.tga
gfx/hud/wickedhud/race_newrankgreen.tga
gfx/hud/wickedhud/race_newrankyellow.tga
gfx/hud/wickedhud/race_newrecordserver.tga
gfx/hud/wickedhud/race_newtime.tga
gfx/hud/wickedhud/voteprogress_back.tga
gfx/hud/wickedhud/voteprogress_prog.tga
gfx/hud/wickedhud/voteprogress_voted.tga
gfx/hud/wickedhud/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/wickedhud/weapon_complainbubble.tga [new file with mode: 0644]
gfx/menu/wickedx/colorpicker_m.tga
gfx/menu/wickedx/colorpicker_selected.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_move.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_resize.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_resize2.tga [new file with mode: 0644]
gfx/reticle_nex.tga [new file with mode: 0644]
gfx/reticle_normal.tga [new file with mode: 0644]
hook-firing_swap.cfg [new file with mode: 0644]
hud_wickedhud_default.cfg
hud_wickedhud_minimalistic.cfg [new file with mode: 0644]
keybinds.txt
loadfonts.cfg [deleted file]
models/player/erebus.iqm
models/player/erebus.iqm_0.sounds [new file with mode: 0644]
models/player/erebus.iqm_0.tga
models/player/erebus_lod1.iqm [new file with mode: 0644]
models/player/erebus_lod1.iqm.framegroups [new file with mode: 0644]
models/player/erebus_lod2.iqm [new file with mode: 0644]
models/player/erebus_lod2.iqm.framegroups [new file with mode: 0644]
models/player/gak.iqm
models/player/gak.iqm_0.sounds [new file with mode: 0644]
models/player/gak.iqm_0.tga
models/player/gakarmored.iqm
models/player/gakarmored.iqm_0.sounds [new file with mode: 0644]
models/player/gakarmored.iqm_0.tga
models/player/gakmasked.iqm
models/player/gakmasked.iqm_0.sounds [new file with mode: 0644]
models/player/gakmasked.iqm_0.tga
models/player/ignis.iqm
models/player/ignis.iqm_0.sounds [new file with mode: 0644]
models/player/ignis.iqm_0.tga
models/player/ignis_lod1.iqm [new file with mode: 0644]
models/player/ignis_lod1.iqm.framegroups [new file with mode: 0644]
models/player/ignis_lod2.iqm [new file with mode: 0644]
models/player/ignis_lod2.iqm.framegroups [new file with mode: 0644]
models/player/ignishalfmasked.iqm
models/player/ignishalfmasked.iqm_0.sounds [new file with mode: 0644]
models/player/ignishalfmasked.iqm_0.tga
models/player/ignishalfmasked.iqm_0.txt
models/player/ignishalfmasked_lod1.iqm.framegroups [new file with mode: 0644]
models/player/ignishalfmasked_lod2.iqm.framegroups [new file with mode: 0644]
models/player/ignismasked.iqm
models/player/ignismasked.iqm_0.sounds [new file with mode: 0644]
models/player/ignismasked.iqm_0.tga
models/player/ignismasked_lod1.iqm [new file with mode: 0644]
models/player/ignismasked_lod1.iqm.framegroups [new file with mode: 0644]
models/player/ignismasked_lod2.iqm [new file with mode: 0644]
models/player/ignismasked_lod2.iqm.framegroups [new file with mode: 0644]
models/player/nyx.iqm
models/player/nyx.iqm_0.sounds [new file with mode: 0644]
models/player/nyx.iqm_0.tga
models/player/pyria.iqm
models/player/pyria.iqm_0.sounds
models/player/pyria.iqm_0.tga
models/player/pyria_lod1.iqm [deleted file]
models/player/pyria_lod2.iqm [deleted file]
models/player/seraphina.iqm
models/player/seraphina.iqm_0.sounds [new file with mode: 0644]
models/player/seraphina.iqm_0.tga
models/player/seraphina_lod1.iqm [new file with mode: 0644]
models/player/seraphina_lod1.iqm.framegroups [new file with mode: 0644]
models/player/seraphina_lod2.iqm [new file with mode: 0644]
models/player/seraphina_lod2.iqm.framegroups [new file with mode: 0644]
models/player/seraphinamasked.iqm
models/player/seraphinamasked.iqm_0.sounds [new file with mode: 0644]
models/player/seraphinamasked.iqm_0.tga
models/player/seraphinamasked_lod1.iqm [new file with mode: 0644]
models/player/seraphinamasked_lod1.iqm.framegroups [new file with mode: 0644]
models/player/seraphinamasked_lod2.iqm [new file with mode: 0644]
models/player/seraphinamasked_lod2.iqm.framegroups [new file with mode: 0644]
models/player/umbra.iqm
models/player/umbra.iqm_0.sounds [new file with mode: 0644]
models/player/umbra.iqm_0.tga
models/weapons/g_nex.md3
models/weapons/h_campingrifle.iqm
models/weapons/h_electro.iqm
models/weapons/h_nex.iqm
models/weapons/v_nex.md3
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/items.qc
qcsrc/common/items.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/draw.qc
qcsrc/menu/gamecommand.qc
qcsrc/menu/item/button.c
qcsrc/menu/item/container.c
qcsrc/menu/item/inputbox.c
qcsrc/menu/item/label.c
qcsrc/menu/item/listbox.c
qcsrc/menu/item/modalcontroller.c
qcsrc/menu/item/nexposee.c
qcsrc/menu/item/slider.c
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/campaign.c
qcsrc/menu/xonotic/charmap.c
qcsrc/menu/xonotic/checkbox_string.c [new file with mode: 0644]
qcsrc/menu/xonotic/colorpicker_string.c [new file with mode: 0644]
qcsrc/menu/xonotic/credits.c
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_hudpanel_chat.c
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c [new file with mode: 0644]
qcsrc/menu/xonotic/dialog_hudpanel_inventory.c
qcsrc/menu/xonotic/dialog_hudpanel_modicons.c
qcsrc/menu/xonotic/dialog_hudpanel_notification.c
qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c
qcsrc/menu/xonotic/dialog_hudpanel_radar.c
qcsrc/menu/xonotic/dialog_hudpanel_score.c
qcsrc/menu/xonotic/dialog_hudpanel_timer.c
qcsrc/menu/xonotic/dialog_hudpanel_vote.c
qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/inputbox.c
qcsrc/menu/xonotic/keybinder.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/maplist.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/skinlist.c
qcsrc/server/arena.qc
qcsrc/server/autocvars.qh [new file with mode: 0644]
qcsrc/server/bot/bot.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/clientcommands.qc
qcsrc/server/ctf.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_tetris.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/vote.qc
qcsrc/server/w_common.qc
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/server.qc
quake.rc
scripts/shaderlist.txt [new file with mode: 0644]
sound/player/carni-lycan/player/fall.ogg [new file with mode: 0644]
sound/player/carni-lycan/player/fall1.ogg [deleted file]
sound/player/fricka/player/fall.ogg [new file with mode: 0644]
sound/player/fricka/player/fall1.ogg [deleted file]
sound/player/insurrectionist/player/fall.ogg [new file with mode: 0644]
sound/player/insurrectionist/player/fall1.ogg [deleted file]
sound/player/marine/player/fall.ogg [new file with mode: 0644]
sound/player/marine/player/fall1.ogg [deleted file]
sound/player/pyria-skadi/player/fall.ogg [new file with mode: 0644]
sound/player/pyria-skadi/player/fall1.ogg [deleted file]
sound/player/reptilian/player/fall.ogg [new file with mode: 0644]
sound/player/reptilian/player/fall1.ogg [deleted file]
sound/player/soldier/coms/flagcarriertakingdamage.ogg [new file with mode: 0644]
sound/player/soldier/coms/getflag.ogg [new file with mode: 0644]
sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg [deleted file]
sound/player/soldier/coms/ideas/getourflagback.ogg [deleted file]
sound/player/soldier/player/fall.ogg [new file with mode: 0644]
sound/player/soldier/player/fall1.ogg [deleted file]
sound/player/specop/coms/needhelp.ogg [new file with mode: 0644]
sound/player/specop/coms/needhelp1.ogg [deleted file]
sound/player/specop/player/fall.ogg [new file with mode: 0644]
sound/player/specop/player/fall1.ogg [deleted file]
sound/player/torus/attack.ogg [deleted file]
sound/player/torus/coms/attack.ogg [new file with mode: 0644]
sound/player/torus/coms/coverme.ogg [new file with mode: 0644]
sound/player/torus/coms/incoming.ogg [new file with mode: 0644]
sound/player/torus/coms/jump.ogg [new file with mode: 0644]
sound/player/torus/coms/letsgo.ogg [new file with mode: 0644]
sound/player/torus/coms/needhelp.ogg [new file with mode: 0644]
sound/player/torus/coms/seenflag.ogg [new file with mode: 0644]
sound/player/torus/coms/taunt1.ogg [new file with mode: 0644]
sound/player/torus/coms/taunt2.ogg [new file with mode: 0644]
sound/player/torus/coms/teamshoot.ogg [new file with mode: 0644]
sound/player/torus/coms/waypoint.ogg [new file with mode: 0644]
sound/player/torus/coverme.ogg [deleted file]
sound/player/torus/death.ogg [deleted file]
sound/player/torus/drown.ogg [deleted file]
sound/player/torus/fall.ogg [deleted file]
sound/player/torus/flagseen.ogg [deleted file]
sound/player/torus/gasp.ogg [deleted file]
sound/player/torus/hooah.ogg [deleted file]
sound/player/torus/incoming.ogg [deleted file]
sound/player/torus/jump.ogg [deleted file]
sound/player/torus/letsgo.ogg [deleted file]
sound/player/torus/needhelp.ogg [deleted file]
sound/player/torus/pain100.ogg [deleted file]
sound/player/torus/pain25.ogg [deleted file]
sound/player/torus/pain50.ogg [deleted file]
sound/player/torus/pain75.ogg [deleted file]
sound/player/torus/player/death.ogg [new file with mode: 0644]
sound/player/torus/player/drown.ogg [new file with mode: 0644]
sound/player/torus/player/fall.ogg [new file with mode: 0644]
sound/player/torus/player/gasp.ogg [new file with mode: 0644]
sound/player/torus/player/pain100.ogg [new file with mode: 0644]
sound/player/torus/player/pain25.ogg [new file with mode: 0644]
sound/player/torus/player/pain50.ogg [new file with mode: 0644]
sound/player/torus/player/pain75.ogg [new file with mode: 0644]
sound/player/torus/taunt.ogg [deleted file]
sound/player/torus/teamshoot.ogg [deleted file]
sound/player/torus/waypoint.ogg [deleted file]
textures/campingrifle.tga
textures/campingrifle_bump.tga
textures/campingrifle_gloss.tga
textures/electro.tga
textures/electro_gloss.tga
textures/electro_glow.tga
textures/electro_norm.tga
textures/electro_pants.tga
textures/glauncher.tga
textures/glauncher_gloss.tga
textures/glauncher_norm.tga
textures/glauncher_pants.tga
textures/glauncher_shirt.tga
textures/hagar2.tga
textures/hagar2_gloss.tga
textures/hagar2_glow.tga
textures/hagar2_norm.tga
textures/hagar2_pants.tga
textures/hagar2_shirt.tga
textures/hlac_body.tga
textures/hlac_body_gloss.tga
textures/hlac_body_norm.tga
textures/hlac_body_pants.tga
textures/hlac_body_shirt.tga
textures/hookgun.tga
textures/hookgun_gloss.tga
textures/hookgun_norm.tga
textures/hookgun_pants.tga
textures/nexgun.tga
textures/nexgun_gloss.tga
textures/nexgun_glow.tga
textures/nexgun_norm.tga
textures/nexgun_pants.tga [deleted file]
textures/nexgun_reflect.tga [deleted file]
textures/nexgun_shirt.tga
textures/shotgun2.tga
textures/shotgun2_gloss.tga
textures/shotgun2_glow.tga
textures/shotgun2_norm.tga
textures/shotgun2_shirt.tga
update-cvarcount.sh

index fb9e9b1..695d07e 100644 (file)
@@ -76,6 +76,7 @@ GPL crlf=input
 *.icns -crlf -diff
 *.ico -crlf -diff
 *.idsoftware crlf=input
+*.iqm -crlf -diff
 *.inc crlf=input
 *.instantaction crlf=input
 *.java crlf=input
index cb58e9a..156b69a 100644 (file)
@@ -16,21 +16,21 @@ set g_start_weapon_campingrifle -1 "0 = never provide the weapon, 1 = always pro
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
-set g_balance_health_start 100
+set g_balance_health_start 150
 set g_balance_armor_start 0
-set g_start_ammo_shells 45
+set g_start_ammo_shells 40
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_fuel 0
-set g_warmup_start_health 200 "starting values when being in warmup-stage"
+set g_warmup_start_health 250 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
-set g_lms_start_health 200
+set g_lms_start_health 250
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 50
 set g_lms_start_ammo_nails 150
@@ -54,40 +54,40 @@ set g_balance_nix_ammoincr_fuel 2
 // {{{ pickup items
 set g_pickup_ammo_anyway 0
 set g_pickup_weapons_anyway 0
-set g_pickup_shells 30
-set g_pickup_shells_max 120
+set g_pickup_shells 15
+set g_pickup_shells_max 999
 set g_pickup_nails 80
-set g_pickup_nails_max 400
-set g_pickup_rockets 30
-set g_pickup_rockets_max 120
-set g_pickup_cells 50
-set g_pickup_cells_max 200
+set g_pickup_nails_max 999
+set g_pickup_rockets 15
+set g_pickup_rockets_max 999
+set g_pickup_cells 25
+set g_pickup_cells_max 999
 set g_pickup_fuel 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
-set g_pickup_armorsmall 10
-set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall 5
+set g_pickup_armorsmall_max 999
 set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 100
+set g_pickup_armormedium_max 999
 set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 100
+set g_pickup_armorbig_max 999
 set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 100
+set g_pickup_armorlarge_max 999
 set g_pickup_armorlarge_anyway 0
-set g_pickup_healthsmall 10
-set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall 5
+set g_pickup_healthsmall_max 999
 set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 200
+set g_pickup_healthmedium_max 999
 set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_max 999
 set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
-set g_pickup_healthmega_max 200
+set g_pickup_healthmega_max 999
 set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
@@ -104,23 +104,23 @@ set g_pickup_respawntimejitter_ammo 0
 // }}}
 
 // {{{ regen/rot
-set g_balance_health_regen 0
-set g_balance_health_regenlinear 5
+set g_balance_health_regen 0.1
+set g_balance_health_regenlinear 0
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0
-set g_balance_health_rotlinear 5
-set g_balance_pause_health_rot 3
-set g_balance_pause_health_rot_spawn 1
+set g_balance_health_rot 0.1
+set g_balance_health_rotlinear 0
+set g_balance_pause_health_rot 5
+set g_balance_pause_health_rot_spawn 10
 set g_balance_health_regenstable 100
 set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0
+set g_balance_armor_rot 0.1
 set g_balance_armor_rotlinear 0
-set g_balance_pause_armor_rot 1
-set g_balance_pause_armor_rot_spawn 1
+set g_balance_pause_armor_rot 5
+set g_balance_pause_armor_rot_spawn 10
 set g_balance_armor_regenstable 100
 set g_balance_armor_rotstable 100
 set g_balance_armor_limit 999
@@ -156,8 +156,8 @@ set g_projectiles_newton_style 2
 // 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
 // 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
 // 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-set g_projectiles_newton_style_2_minfactor 0.8
-set g_projectiles_newton_style_2_maxfactor 1.5
+set g_projectiles_newton_style_2_minfactor 0.7
+set g_projectiles_newton_style_2_maxfactor 5
 set g_projectiles_spread_style 0
 // possible values:
 // 0: forward + solid sphere (like Quake) - varies velocity
@@ -188,7 +188,7 @@ set g_balance_powerup_strength_selfforce 1.5
 set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
 set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
 set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
-set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction"
+set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
 set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
 set g_jetpack_fuel 8 "fuel per second for jetpack"
 set g_jetpack_attenuation 2 "jetpack sound attenuation"
@@ -206,11 +206,11 @@ set g_balance_grapplehook_health 130
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_primary_damage 25
+set g_balance_laser_primary_damage 35
 set g_balance_laser_primary_edgedamage 10
 set g_balance_laser_primary_force 400
 set g_balance_laser_primary_radius 70
-set g_balance_laser_primary_speed 12000
+set g_balance_laser_primary_speed 9000
 set g_balance_laser_primary_spread 0
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.3
@@ -219,81 +219,81 @@ set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0.03
 set g_balance_laser_gauntlet 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 25
+set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
 set g_balance_laser_secondary_force 400
 set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 12000
+set g_balance_laser_secondary_speed 9000
 set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
-set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
-set g_balance_shotgun_primary_damage 8
-set g_balance_shotgun_primary_force 0
-set g_balance_shotgun_primary_spread 0.11
+set g_balance_shotgun_primary_damage 9
+set g_balance_shotgun_primary_force 60
+set g_balance_shotgun_primary_spread 0.07
 set g_balance_shotgun_primary_refire 0.5
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 8000
+set g_balance_shotgun_primary_speed 12000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 8
-set g_balance_shotgun_secondary_force 0
-set g_balance_shotgun_secondary_spread 0.17
+set g_balance_shotgun_secondary_damage 9
+set g_balance_shotgun_secondary_force 60
+set g_balance_shotgun_secondary_spread 0.1
 set g_balance_shotgun_secondary_refire 1.35
 set g_balance_shotgun_secondary_animtime 0.2
 set g_balance_shotgun_secondary_ammo 1
-set g_balance_shotgun_secondary_speed 8000
+set g_balance_shotgun_secondary_speed 12000
 set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
 // }}}
 // {{{ uzi
 set g_balance_uzi_first 1
-set g_balance_uzi_first_damage 12
-set g_balance_uzi_first_force 0
+set g_balance_uzi_first_damage 30
+set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.015
-set g_balance_uzi_first_refire 0.15
+set g_balance_uzi_first_refire 0.2
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 0
+set g_balance_uzi_sustained_damage 15
+set g_balance_uzi_sustained_force 27
 set g_balance_uzi_sustained_spread 0.05
-set g_balance_uzi_sustained_refire 0.075
+set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
 set g_balance_uzi_speed 18000
 set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary2secondary 0
-set g_balance_grenadelauncher_primary_damage 50
+set g_balance_grenadelauncher_primary_damage 70
 set g_balance_grenadelauncher_primary_edgedamage 38
 set g_balance_grenadelauncher_primary_force 400
 set g_balance_grenadelauncher_primary_radius 140
-set g_balance_grenadelauncher_primary_speed 2200
-set g_balance_grenadelauncher_primary_speed_up 220
+set g_balance_grenadelauncher_primary_speed 2000
+set g_balance_grenadelauncher_primary_speed_up 200
 set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 30
 set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
-set g_balance_grenadelauncher_secondary_damage 60
+set g_balance_grenadelauncher_secondary_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
 set g_balance_grenadelauncher_secondary_radius 140
 set g_balance_grenadelauncher_secondary_speed 1400
-set g_balance_grenadelauncher_secondary_speed_up 150
+set g_balance_grenadelauncher_secondary_speed_up 200
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
-set g_balance_grenadelauncher_secondary_lifetime 1
+set g_balance_grenadelauncher_secondary_lifetime 2.5
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
-set g_balance_grenadelauncher_secondary_health 70
+set g_balance_grenadelauncher_secondary_health 10
 set g_balance_grenadelauncher_secondary_damageforcescale 4
 set g_balance_grenadelauncher_secondary_bouncefactor 0.5
 set g_balance_grenadelauncher_secondary_bouncestop 0.075
@@ -320,15 +320,15 @@ set g_balance_electro_secondary_speed 900
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0
-set g_balance_electro_secondary_lifetime 2.5
-set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1
-set g_balance_electro_secondary_animtime 0.2
+set g_balance_electro_secondary_lifetime 5
+set g_balance_electro_secondary_refire 0.3
+set g_balance_electro_secondary_refire2 0
+set g_balance_electro_secondary_animtime 0.3
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 3
-set g_balance_electro_combo_damage 50
+set g_balance_electro_secondary_count 1
+set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
 set g_balance_electro_combo_radius 250
@@ -336,12 +336,12 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 2000
 // }}}
 // {{{ crylink
-set g_balance_crylink_primary_damage 14
+set g_balance_crylink_primary_damage 18
 set g_balance_crylink_primary_edgedamage 0
 set g_balance_crylink_primary_force -55
 set g_balance_crylink_primary_radius 80
 set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.01
+set g_balance_crylink_primary_spread 0.03
 set g_balance_crylink_primary_shots 4
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_refire 0.4
@@ -357,17 +357,17 @@ set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 24
 set g_balance_crylink_primary_other_fadetime 0.25
 
 set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_damage 10
+set g_balance_crylink_secondary_damage 18
 set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force -40
-set g_balance_crylink_secondary_radius 10
-set g_balance_crylink_secondary_speed 4000
-set g_balance_crylink_secondary_spread 0.01
-set g_balance_crylink_secondary_shots 3
+set g_balance_crylink_secondary_force -55
+set g_balance_crylink_secondary_radius 3
+set g_balance_crylink_secondary_speed 7000
+set g_balance_crylink_secondary_spread 0.08
+set g_balance_crylink_secondary_shots 7
 set g_balance_crylink_secondary_bounces 0
-set g_balance_crylink_secondary_refire 0.1
-set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1
+set g_balance_crylink_secondary_refire 0.5
+set g_balance_crylink_secondary_animtime 0.3
+set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
@@ -392,43 +392,43 @@ set g_balance_minstanex_animtime 0.3
 set g_balance_minstanex_ammo 10
 // }}}
 // {{{ hagar
-set g_balance_hagar_primary_damage 30
-set g_balance_hagar_primary_edgedamage 0
-set g_balance_hagar_primary_force 50
-set g_balance_hagar_primary_radius 70
-set g_balance_hagar_primary_spread 0.05
-set g_balance_hagar_primary_speed 2400
+set g_balance_hagar_primary_damage 37
+set g_balance_hagar_primary_edgedamage 15
+set g_balance_hagar_primary_force 100
+set g_balance_hagar_primary_radius 65
+set g_balance_hagar_primary_spread 0.010
+set g_balance_hagar_primary_speed 3000
 set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
-set g_balance_hagar_secondary_damage 20
-set g_balance_hagar_secondary_edgedamage 10
-set g_balance_hagar_secondary_force 50
-set g_balance_hagar_secondary_radius 90
-set g_balance_hagar_secondary_spread 0.05
-set g_balance_hagar_secondary_speed 2000
-set g_balance_hagar_secondary_lifetime_min 0.1
-set g_balance_hagar_secondary_lifetime_rand 0.05
-set g_balance_hagar_secondary_refire 0.1
-set g_balance_hagar_secondary_ammo 0.5
+set g_balance_hagar_secondary_damage 37
+set g_balance_hagar_secondary_edgedamage 15
+set g_balance_hagar_secondary_force 100
+set g_balance_hagar_secondary_radius 65
+set g_balance_hagar_secondary_spread 0.015
+set g_balance_hagar_secondary_speed 1400
+set g_balance_hagar_secondary_lifetime_min 30
+set g_balance_hagar_secondary_lifetime_rand 0
+set g_balance_hagar_secondary_refire 0.15
+set g_balance_hagar_secondary_ammo 1
 // }}}
 // {{{ rocketlauncher
-set g_balance_rocketlauncher_damage 80
+set g_balance_rocketlauncher_damage 105
 set g_balance_rocketlauncher_edgedamage 40
 set g_balance_rocketlauncher_force 600
-set g_balance_rocketlauncher_radius 100
-set g_balance_rocketlauncher_speed 1600
-set g_balance_rocketlauncher_speedaccel 1600
-set g_balance_rocketlauncher_speedstart 1000
+set g_balance_rocketlauncher_radius 150
+set g_balance_rocketlauncher_speed 850
+set g_balance_rocketlauncher_speedaccel 0
+set g_balance_rocketlauncher_speedstart 850
 set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1.2
+set g_balance_rocketlauncher_refire 1
 set g_balance_rocketlauncher_animtime 0.3
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 40
 set g_balance_rocketlauncher_damageforcescale 4
-set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 140 // max degrees per second
+set g_balance_rocketlauncher_detonatedelay 0.2 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+set g_balance_rocketlauncher_guiderate 90 // max degrees per second
 set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
 set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
@@ -448,12 +448,12 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 // {{{ hook
-set g_balance_hook_primary_fuel 2 // hook monkeys set 0
+set g_balance_hook_primary_fuel 5 // hook monkeys set 0
 set g_balance_hook_primary_refire 0 // hook monkeys set 0
 set g_balance_hook_primary_animtime 0.3 // good shoot anim
 set g_balance_hook_primary_hooked_time_max 0 // infinite
 set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
-set g_balance_hook_primary_hooked_fuel 3 // fuel per second hooked
+set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
 set g_balance_hook_secondary_damage 25 // not much
 set g_balance_hook_secondary_edgedamage 5 // not much
 set g_balance_hook_secondary_radius 500 // LOTS
@@ -570,7 +570,7 @@ set g_balance_fireball_secondary_damageforcescale 4
 set g_balance_fireball_secondary_damagetime 5
 set g_balance_fireball_secondary_force 100
 set g_balance_fireball_secondary_laserburntime 0.5
-set g_balance_fireball_secondary_laserdamage 30
+set g_balance_fireball_secondary_laserdamage 50
 set g_balance_fireball_secondary_laseredgedamage 20
 set g_balance_fireball_secondary_laserradius 110
 set g_balance_fireball_secondary_lifetime 7
index 0530c99..fc8082f 100644 (file)
--- a/bots.txt
+++ b/bots.txt
@@ -1,21 +1,21 @@
 //bot configuration: name      model   skin    shirt   pants   team    keyboard use    moving  dodging ping    weapon use      aggressivity    range   aiming  calmhand        mouse   fightthink      aithink
 //default team values (team-override): 1 = red, 2 = blue, 3 = yellow, 4 = pink                                                                                                                                 
 //use -1 for shirt-color or pants-color to get random colors                                                                                                                                   
-Hellfire       umbra   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
-Toxic  umbra   0       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
-Discovery      umbra   0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
+Hellfire       ignis   0       4       0       0       0       0       -0.5    -1      1       1       -0.5    -1      -1      2       0.5     -1
+Toxic  gakarmored      0       14      7       0       -1      -1.5    -0.5    0       1       0       0       0       2       -0.5    -0.5    1
+Discovery      erebus  0       2       6       0       0       -1      -0.5    -0.5    1       -0.5    0.5     1.5     -0.5    -1      1       0.5
 Pegasus        umbra   0       13      11      0       1       1       1       1       -1      0       0.5     0       -2      0       -1      0
 Eureka umbra   0       12      7       0       0       0       -1.5    -0.5    -0.5    0       0       0       0       -0.5    1.5     1.5
-Airhead        umbra   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
-Gator  umbra   0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
-Delirium       umbra   0       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
-Death  umbra   0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
-Scorcher       umbra   0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
-Necrotic       umbra   0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
-Dominator      umbra   0       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
-Thunderstorm   umbra   0       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
-Mystery        umbra   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
-Lion   umbra   0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
-Sensible       umbra   0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
-Shadow umbra   0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
+Airhead        ignis   0       11      1       0       -1      -1.5    -1      -0.5    1       1       -1      1       -0.5    1       0.5     0
+Gator  gak     0       3       10      0       0       1       0       0.5     -0.5    0.5     -0.5    -1      0       0       -0.5    0
+Delirium       gakmasked       0       8       12      0       0       -1      -1      -1      0       2       0       1       0       2       -1      -1
+Death  gakmasked       0       4       11      0       -0.5    0       0       1       -0.5    0       1       0       0       0       0       0
+Scorcher       ignishalfmasked 0       13      13      0       0       -1      0       -0.5    0.5     1       0       1       -2      1       0       0
+Necrotic       nyx     0       12      14      0       0       0       0       1       0       -1      -0.5    -1      1       0       0       0
+Dominator      nyx     0       3       9       0       0       0       0       2       -1      0       0       0       -1      0       0       0
+Thunderstorm   erebus  0       13      6       0       0       0       0       -0.5    -1      1       0.5     0.5     -0.5    0       0.5     0
+Mystery        pyria   0       9       14      0       1       1       1       1       -1      -1      0       1       1       -2      -1      -1
+Lion   ignismasked     0       0       4       0       1       1.5     2       -1      -1      -1      1       0       1       -0.5    -1      -1
+Sensible       seraphina       0       9       9       0       0       0       0.5     -1      0       -1      0       -1      2.5     -1.5    1       0.5
+Shadow seraphinamasked 0       4       8       0       -0.5    2       1       0       0       -1      0       -1      0       1       -1      -0.5
 Resurrection   umbra   0       1       1       0       0       -0.5    -0.5    0       2       -1      -1      -1      0       -1      1       1
index 909dfd6..28f7ba1 100644 (file)
@@ -206,6 +206,9 @@ seta crosshair_fireball_color_green 1.0     "crosshair color green component to disp
 seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball"
 seta crosshair_fireball_color_alpha 1  "crosshair alpha value to display when wielding the fireball"
 seta crosshair_fireball_size 1 "crosshair size when wielding the fireball"
+seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
+seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
 fov 90
 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3   "time value for averaging speed values"
@@ -501,7 +504,6 @@ set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can
 set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns"
-set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high"
 set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
 set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once <g_respawn_delay> seconds are over"
 set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)"
@@ -547,6 +549,7 @@ set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that
 set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
 
 set leadlimit 0
+set leadlimit_and_fraglimit 0 "if set, leadlimit is ANDed with fraglimit (otherwise ORed)"
 
 // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch.
 seta timelimit_override -1     "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
@@ -910,8 +913,12 @@ alias sv_loadconfig "exec $serverconfig"
 alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self"
 
 // aliases:
-alias +attack2 +button3
-alias -attack2 -button3
+alias +fire +attack
+alias -fire -attack
+alias +fire2 +button3
+alias -fire2 -button3
+alias +attack2 +button3 // old alias from Nexuiz
+alias -attack2 -button3 // old alias name from Nexuiz
 alias +zoom +button4
 alias -zoom -button4
 alias +crouch +button5
@@ -954,8 +961,8 @@ bind 8 "impulse 8"
 bind 9 "impulse 9"
 bind 0 "impulse 14" // cycles the superweapons
 bind q weaplast
-bind MOUSE1 +attack
-bind MOUSE2 +attack2
+bind MOUSE1 +fire
+bind MOUSE2 +fire2
 bind MOUSE3 +zoom
 bind MOUSE4 weaplast
 bind MOUSE5 +hook
@@ -989,8 +996,8 @@ bind JOY1 "+crouch"
 bind JOY2 "+jump"
 bind JOY3 "weapprev"
 bind JOY4 "weapnext"
-bind JOY5 "+attack2"
-bind JOY6 "+attack"
+bind JOY5 "+fire2"
+bind JOY6 "+fire"
 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
 bind JOY9 "menu_showteamselect"
@@ -1035,7 +1042,7 @@ bind kp_minus "+userbind 18"
 set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted"
 set sv_vote_only_commands ""
 set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)"
-set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
+set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
 set sv_vote_call 1     "users can call a vote for the above commands"
 set sv_vote_master 1   "users can call a vote to become master"
 set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master"
@@ -1317,17 +1324,47 @@ con_notifyalign 0
 
 // hud variables
 set _hud_configure 0 "1 = configure the HUD"
+seta hud_configure_teamcolorforced 1 "1 = force display of team colors in configure mode"
 seta hud_configure_checkcollisions 1 "check for collisions against other panels when in hud configure mode"
 seta hud_configure_bg_minalpha 0.25 "minimum panel background alpha when in hud configure mode"
 seta hud_configure_grid 1 "snap to grid when moving/resizing panels"
-seta hud_configure_grid_x 0.01 "snap to X * vid_conwidth"
-seta hud_configure_grid_y 0.01 "snap to Y * vid_conheight"
+seta hud_configure_grid_xsize 0.01 "snap to X * vid_conwidth"
+seta hud_configure_grid_ysize 0.01 "snap to Y * vid_conheight"
 seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mode"
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
 
 exec hud_wickedhud_default.cfg
 
+// user preference cvars (i.e. shouldn't be adjusted by a skin config) 
+seta hud_weaponicons_number 1 "1 = show number of weapon, 2 = show bound key of weapon"
+seta hud_weaponicons_complainbubble_time 1 "time that a new entry stays until it fades out"
+seta hud_weaponicons_complainbubble_fadetime 0.25 "fade out time"
+seta hud_weaponicons_accuracy 1 "show accuracy as the weapon icon background"
+seta hud_weaponicons_accuracy_yellow 20 "percentage at which the accuracy color is yellow"
+seta hud_weaponicons_ammo 1 "show ammo as a status bar"
+seta hud_weaponicons_ammo_full_shells 40 "show 100% of the status bar at this ammo count"
+seta hud_weaponicons_ammo_full_nails 100 "show 100% of the status bar at this ammo count"
+seta hud_weaponicons_ammo_full_cells 60 "show 100% of the status bar at this ammo count"
+seta hud_weaponicons_ammo_full_rockets 60 "show 100% of the status bar at this ammo count"
+seta hud_weaponicons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count"
+
+seta hud_notify_time 10 "time that a new entry stays until it fades out"
+seta hud_notify_fadetime 3 "fade out time"
+
+seta hud_timer_increment 0 "show elapsed time instead of remaining time"
+
+seta hud_radar_scale 4096 "distance you can see on the team radar"
+seta hud_radar_rotation 0      "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
+seta hud_radar_zoommode 0      "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
+alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4"
+
+seta hud_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
+seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show"
+seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
+seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
+
 // scoreboard
 seta scoreboard_columns default
 seta scoreboard_border_thickness 1 "scoreboard border thickness"
@@ -1479,7 +1516,6 @@ set g_jump_grunt 0        "Do you make a grunting noise every time you jump? Is it the
 
 alias allready "sv_cmd allready"
 
-// note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
 seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
 seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)"
 seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
@@ -1612,8 +1648,10 @@ set camera_look_attenuation      8       "Attenuation of \"looking\" movements, only if ca
 set camera_forward_follows     1       "0: Move the camera forwards without changing altitude. 1: Move towards what you are looking"
 
 // "Gentle mode": show no blood
-seta sv_gentle 0       "force gentle mode for everyone, also remove references to acts of killing from the messages"
-seta cl_gentle 0       "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta sv_gentle 0               "force gentle mode for everyone, also remove references to acts of killing from the messages"
+seta cl_gentle 0               "client side gentle mode, master switch for removing both gibs and messages"
+seta cl_gentle_gibs 0          "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
+seta cl_gentle_messages 0      "client side gentle mode (only replaces frag messages/centerprints)"
 
 seta cl_racetimer_position 0.25 "Y-axis positioning of the race timer (from 0 to 1)"
 seta cl_showpressedkeys        0       "Show which movement keys someone is pressing: 1 for spectating, 2 for always"
@@ -1691,6 +1729,7 @@ alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_nexball
 alias cl_hook_gamestart_cts
 alias cl_hook_gameend
+alias cl_hook_activeweapon
 
 alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2"
 alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"
@@ -1787,9 +1826,6 @@ collision_endposnudge 1
 set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
 set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
 
-// FIXME temporary
-set menu_font_size_snapping_fix 1
-
 // player ID
 seta _cl_userid "" "player ID (e.g. for tournaments)"
 
@@ -1843,3 +1879,5 @@ set g_weaponreplace_seeker ""
 set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility in mapinfo files)"
 
 set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)"
+
+set g_maxspeed 0 "player speed limit, faster players are killed (0 for unlimited speed)"
diff --git a/gfx/hud/default/ammo_bullets.tga b/gfx/hud/default/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..e7cd01a
Binary files /dev/null and b/gfx/hud/default/ammo_bullets.tga differ
diff --git a/gfx/hud/default/ammo_cells.tga b/gfx/hud/default/ammo_cells.tga
new file mode 100644 (file)
index 0000000..664eb23
Binary files /dev/null and b/gfx/hud/default/ammo_cells.tga differ
diff --git a/gfx/hud/default/ammo_current_bg.tga b/gfx/hud/default/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..bd07205
Binary files /dev/null and b/gfx/hud/default/ammo_current_bg.tga differ
diff --git a/gfx/hud/default/ammo_fuel.tga b/gfx/hud/default/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..8450a2f
Binary files /dev/null and b/gfx/hud/default/ammo_fuel.tga differ
diff --git a/gfx/hud/default/ammo_rockets.tga b/gfx/hud/default/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..c37f077
Binary files /dev/null and b/gfx/hud/default/ammo_rockets.tga differ
diff --git a/gfx/hud/default/ammo_shells.tga b/gfx/hud/default/ammo_shells.tga
new file mode 100644 (file)
index 0000000..59bea4b
Binary files /dev/null and b/gfx/hud/default/ammo_shells.tga differ
diff --git a/gfx/hud/default/armor.tga b/gfx/hud/default/armor.tga
new file mode 100644 (file)
index 0000000..92046b4
Binary files /dev/null and b/gfx/hud/default/armor.tga differ
index 6535f36..8ceee44 100644 (file)
Binary files a/gfx/hud/default/border.tga and b/gfx/hud/default/border.tga differ
diff --git a/gfx/hud/default/border_chat.tga b/gfx/hud/default/border_chat.tga
new file mode 100644 (file)
index 0000000..1cd065e
Binary files /dev/null and b/gfx/hud/default/border_chat.tga differ
diff --git a/gfx/hud/default/border_healtharmor.tga b/gfx/hud/default/border_healtharmor.tga
new file mode 100644 (file)
index 0000000..7109ab5
Binary files /dev/null and b/gfx/hud/default/border_healtharmor.tga differ
diff --git a/gfx/hud/default/border_highlighted.tga b/gfx/hud/default/border_highlighted.tga
new file mode 100644 (file)
index 0000000..542f82a
Binary files /dev/null and b/gfx/hud/default/border_highlighted.tga differ
diff --git a/gfx/hud/default/border_highlighted2.tga b/gfx/hud/default/border_highlighted2.tga
new file mode 100644 (file)
index 0000000..7e460e5
Binary files /dev/null and b/gfx/hud/default/border_highlighted2.tga differ
diff --git a/gfx/hud/default/border_inventory.tga b/gfx/hud/default/border_inventory.tga
new file mode 100644 (file)
index 0000000..20ae8f6
Binary files /dev/null and b/gfx/hud/default/border_inventory.tga differ
diff --git a/gfx/hud/default/border_modicons.tga b/gfx/hud/default/border_modicons.tga
new file mode 100644 (file)
index 0000000..5437b04
Binary files /dev/null and b/gfx/hud/default/border_modicons.tga differ
diff --git a/gfx/hud/default/border_powerups.tga b/gfx/hud/default/border_powerups.tga
new file mode 100644 (file)
index 0000000..f8fbf44
Binary files /dev/null and b/gfx/hud/default/border_powerups.tga differ
diff --git a/gfx/hud/default/border_radar.tga b/gfx/hud/default/border_radar.tga
new file mode 100644 (file)
index 0000000..a300f52
Binary files /dev/null and b/gfx/hud/default/border_radar.tga differ
diff --git a/gfx/hud/default/border_score.tga b/gfx/hud/default/border_score.tga
new file mode 100644 (file)
index 0000000..a4d8b6c
Binary files /dev/null and b/gfx/hud/default/border_score.tga differ
diff --git a/gfx/hud/default/border_timer.tga b/gfx/hud/default/border_timer.tga
new file mode 100644 (file)
index 0000000..c657136
Binary files /dev/null and b/gfx/hud/default/border_timer.tga differ
diff --git a/gfx/hud/default/border_vote.tga b/gfx/hud/default/border_vote.tga
new file mode 100644 (file)
index 0000000..13b948e
Binary files /dev/null and b/gfx/hud/default/border_vote.tga differ
diff --git a/gfx/hud/default/border_weaponicons.tga b/gfx/hud/default/border_weaponicons.tga
new file mode 100644 (file)
index 0000000..08e8dcd
Binary files /dev/null and b/gfx/hud/default/border_weaponicons.tga differ
diff --git a/gfx/hud/default/borderx.tga b/gfx/hud/default/borderx.tga
deleted file mode 100644 (file)
index 8ef37d3..0000000
Binary files a/gfx/hud/default/borderx.tga and /dev/null differ
diff --git a/gfx/hud/default/dock.tga b/gfx/hud/default/dock.tga
new file mode 100644 (file)
index 0000000..9dd4e2f
Binary files /dev/null and b/gfx/hud/default/dock.tga differ
diff --git a/gfx/hud/default/dock_small.tga b/gfx/hud/default/dock_small.tga
new file mode 100644 (file)
index 0000000..5135876
Binary files /dev/null and b/gfx/hud/default/dock_small.tga differ
diff --git a/gfx/hud/default/flag_blue_carrying.tga b/gfx/hud/default/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..ace6a5f
Binary files /dev/null and b/gfx/hud/default/flag_blue_carrying.tga differ
diff --git a/gfx/hud/default/flag_blue_lost.tga b/gfx/hud/default/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..67d894d
Binary files /dev/null and b/gfx/hud/default/flag_blue_lost.tga differ
diff --git a/gfx/hud/default/flag_blue_shielded.tga b/gfx/hud/default/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..a8993f6
Binary files /dev/null and b/gfx/hud/default/flag_blue_shielded.tga differ
diff --git a/gfx/hud/default/flag_blue_taken.tga b/gfx/hud/default/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..6847e7c
Binary files /dev/null and b/gfx/hud/default/flag_blue_taken.tga differ
diff --git a/gfx/hud/default/flag_red_carrying.tga b/gfx/hud/default/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..3393083
Binary files /dev/null and b/gfx/hud/default/flag_red_carrying.tga differ
diff --git a/gfx/hud/default/flag_red_lost.tga b/gfx/hud/default/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..f96e021
Binary files /dev/null and b/gfx/hud/default/flag_red_lost.tga differ
diff --git a/gfx/hud/default/flag_red_shielded.tga b/gfx/hud/default/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..e7ec491
Binary files /dev/null and b/gfx/hud/default/flag_red_shielded.tga differ
diff --git a/gfx/hud/default/flag_red_taken.tga b/gfx/hud/default/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..bf71977
Binary files /dev/null and b/gfx/hud/default/flag_red_taken.tga differ
diff --git a/gfx/hud/default/health.tga b/gfx/hud/default/health.tga
new file mode 100644 (file)
index 0000000..0ed8a90
Binary files /dev/null and b/gfx/hud/default/health.tga differ
diff --git a/gfx/hud/default/key_backward.tga b/gfx/hud/default/key_backward.tga
new file mode 100644 (file)
index 0000000..4de0f33
Binary files /dev/null and b/gfx/hud/default/key_backward.tga differ
diff --git a/gfx/hud/default/key_backward_inv.tga b/gfx/hud/default/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..bef0d1c
Binary files /dev/null and b/gfx/hud/default/key_backward_inv.tga differ
diff --git a/gfx/hud/default/key_crouch.tga b/gfx/hud/default/key_crouch.tga
new file mode 100644 (file)
index 0000000..00b2dfe
Binary files /dev/null and b/gfx/hud/default/key_crouch.tga differ
diff --git a/gfx/hud/default/key_crouch_inv.tga b/gfx/hud/default/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..2cdbda8
Binary files /dev/null and b/gfx/hud/default/key_crouch_inv.tga differ
diff --git a/gfx/hud/default/key_forward.tga b/gfx/hud/default/key_forward.tga
new file mode 100644 (file)
index 0000000..dfe2233
Binary files /dev/null and b/gfx/hud/default/key_forward.tga differ
diff --git a/gfx/hud/default/key_forward_inv.tga b/gfx/hud/default/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..7bbea60
Binary files /dev/null and b/gfx/hud/default/key_forward_inv.tga differ
diff --git a/gfx/hud/default/key_jump.tga b/gfx/hud/default/key_jump.tga
new file mode 100644 (file)
index 0000000..d02b2db
Binary files /dev/null and b/gfx/hud/default/key_jump.tga differ
diff --git a/gfx/hud/default/key_jump_inv.tga b/gfx/hud/default/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..c54bb37
Binary files /dev/null and b/gfx/hud/default/key_jump_inv.tga differ
diff --git a/gfx/hud/default/key_left.tga b/gfx/hud/default/key_left.tga
new file mode 100644 (file)
index 0000000..60fe71f
Binary files /dev/null and b/gfx/hud/default/key_left.tga differ
diff --git a/gfx/hud/default/key_left_inv.tga b/gfx/hud/default/key_left_inv.tga
new file mode 100644 (file)
index 0000000..92bc615
Binary files /dev/null and b/gfx/hud/default/key_left_inv.tga differ
diff --git a/gfx/hud/default/key_right.tga b/gfx/hud/default/key_right.tga
new file mode 100644 (file)
index 0000000..308c03b
Binary files /dev/null and b/gfx/hud/default/key_right.tga differ
diff --git a/gfx/hud/default/key_right_inv.tga b/gfx/hud/default/key_right_inv.tga
new file mode 100644 (file)
index 0000000..8f04be4
Binary files /dev/null and b/gfx/hud/default/key_right_inv.tga differ
diff --git a/gfx/hud/default/kh_blue.tga b/gfx/hud/default/kh_blue.tga
new file mode 100644 (file)
index 0000000..467b229
Binary files /dev/null and b/gfx/hud/default/kh_blue.tga differ
diff --git a/gfx/hud/default/kh_bluearrow.tga b/gfx/hud/default/kh_bluearrow.tga
new file mode 100644 (file)
index 0000000..b686d1b
Binary files /dev/null and b/gfx/hud/default/kh_bluearrow.tga differ
diff --git a/gfx/hud/default/kh_pink.tga b/gfx/hud/default/kh_pink.tga
new file mode 100644 (file)
index 0000000..b40967a
Binary files /dev/null and b/gfx/hud/default/kh_pink.tga differ
diff --git a/gfx/hud/default/kh_pinkarrow.tga b/gfx/hud/default/kh_pinkarrow.tga
new file mode 100644 (file)
index 0000000..17427e5
Binary files /dev/null and b/gfx/hud/default/kh_pinkarrow.tga differ
diff --git a/gfx/hud/default/kh_red.tga b/gfx/hud/default/kh_red.tga
new file mode 100644 (file)
index 0000000..3201f8a
Binary files /dev/null and b/gfx/hud/default/kh_red.tga differ
diff --git a/gfx/hud/default/kh_redarrow.tga b/gfx/hud/default/kh_redarrow.tga
new file mode 100644 (file)
index 0000000..edd1fab
Binary files /dev/null and b/gfx/hud/default/kh_redarrow.tga differ
diff --git a/gfx/hud/default/kh_yellow.tga b/gfx/hud/default/kh_yellow.tga
new file mode 100644 (file)
index 0000000..bb83475
Binary files /dev/null and b/gfx/hud/default/kh_yellow.tga differ
diff --git a/gfx/hud/default/kh_yellowarrow.tga b/gfx/hud/default/kh_yellowarrow.tga
new file mode 100644 (file)
index 0000000..8e754cc
Binary files /dev/null and b/gfx/hud/default/kh_yellowarrow.tga differ
diff --git a/gfx/hud/default/nexball_carrying.tga b/gfx/hud/default/nexball_carrying.tga
new file mode 100644 (file)
index 0000000..04ada8c
Binary files /dev/null and b/gfx/hud/default/nexball_carrying.tga differ
diff --git a/gfx/hud/default/notify_blue_captured.tga b/gfx/hud/default/notify_blue_captured.tga
new file mode 100644 (file)
index 0000000..7cff17e
Binary files /dev/null and b/gfx/hud/default/notify_blue_captured.tga differ
diff --git a/gfx/hud/default/notify_blue_lost.tga b/gfx/hud/default/notify_blue_lost.tga
new file mode 100644 (file)
index 0000000..67d894d
Binary files /dev/null and b/gfx/hud/default/notify_blue_lost.tga differ
diff --git a/gfx/hud/default/notify_blue_returned.tga b/gfx/hud/default/notify_blue_returned.tga
new file mode 100644 (file)
index 0000000..8e8b67f
Binary files /dev/null and b/gfx/hud/default/notify_blue_returned.tga differ
diff --git a/gfx/hud/default/notify_blue_shielded.tga b/gfx/hud/default/notify_blue_shielded.tga
new file mode 100644 (file)
index 0000000..a8993f6
Binary files /dev/null and b/gfx/hud/default/notify_blue_shielded.tga differ
diff --git a/gfx/hud/default/notify_blue_taken.tga b/gfx/hud/default/notify_blue_taken.tga
new file mode 100644 (file)
index 0000000..6847e7c
Binary files /dev/null and b/gfx/hud/default/notify_blue_taken.tga differ
diff --git a/gfx/hud/default/notify_camping.tga b/gfx/hud/default/notify_camping.tga
new file mode 100644 (file)
index 0000000..2766dd1
Binary files /dev/null and b/gfx/hud/default/notify_camping.tga differ
diff --git a/gfx/hud/default/notify_death.tga b/gfx/hud/default/notify_death.tga
new file mode 100644 (file)
index 0000000..d5e8045
Binary files /dev/null and b/gfx/hud/default/notify_death.tga differ
diff --git a/gfx/hud/default/notify_fall.tga b/gfx/hud/default/notify_fall.tga
new file mode 100644 (file)
index 0000000..febd1d0
Binary files /dev/null and b/gfx/hud/default/notify_fall.tga differ
diff --git a/gfx/hud/default/notify_lava.tga b/gfx/hud/default/notify_lava.tga
new file mode 100644 (file)
index 0000000..3976e8b
Binary files /dev/null and b/gfx/hud/default/notify_lava.tga differ
diff --git a/gfx/hud/default/notify_outofammo.tga b/gfx/hud/default/notify_outofammo.tga
new file mode 100644 (file)
index 0000000..82a11dd
Binary files /dev/null and b/gfx/hud/default/notify_outofammo.tga differ
diff --git a/gfx/hud/default/notify_red_captured.tga b/gfx/hud/default/notify_red_captured.tga
new file mode 100644 (file)
index 0000000..72814ec
Binary files /dev/null and b/gfx/hud/default/notify_red_captured.tga differ
diff --git a/gfx/hud/default/notify_red_lost.tga b/gfx/hud/default/notify_red_lost.tga
new file mode 100644 (file)
index 0000000..f96e021
Binary files /dev/null and b/gfx/hud/default/notify_red_lost.tga differ
diff --git a/gfx/hud/default/notify_red_returned.tga b/gfx/hud/default/notify_red_returned.tga
new file mode 100644 (file)
index 0000000..deee468
Binary files /dev/null and b/gfx/hud/default/notify_red_returned.tga differ
diff --git a/gfx/hud/default/notify_red_shielded.tga b/gfx/hud/default/notify_red_shielded.tga
new file mode 100644 (file)
index 0000000..e7ec491
Binary files /dev/null and b/gfx/hud/default/notify_red_shielded.tga differ
diff --git a/gfx/hud/default/notify_red_taken.tga b/gfx/hud/default/notify_red_taken.tga
new file mode 100644 (file)
index 0000000..bf71977
Binary files /dev/null and b/gfx/hud/default/notify_red_taken.tga differ
diff --git a/gfx/hud/default/notify_selfkill.tga b/gfx/hud/default/notify_selfkill.tga
new file mode 100644 (file)
index 0000000..646a1a2
Binary files /dev/null and b/gfx/hud/default/notify_selfkill.tga differ
diff --git a/gfx/hud/default/notify_shootingstar.tga b/gfx/hud/default/notify_shootingstar.tga
new file mode 100644 (file)
index 0000000..048e015
Binary files /dev/null and b/gfx/hud/default/notify_shootingstar.tga differ
diff --git a/gfx/hud/default/notify_slime.tga b/gfx/hud/default/notify_slime.tga
new file mode 100644 (file)
index 0000000..c08a6a3
Binary files /dev/null and b/gfx/hud/default/notify_slime.tga differ
diff --git a/gfx/hud/default/notify_teamkill_blue.tga b/gfx/hud/default/notify_teamkill_blue.tga
new file mode 100644 (file)
index 0000000..a40920b
Binary files /dev/null and b/gfx/hud/default/notify_teamkill_blue.tga differ
diff --git a/gfx/hud/default/notify_teamkill_red.tga b/gfx/hud/default/notify_teamkill_red.tga
new file mode 100644 (file)
index 0000000..a40920b
Binary files /dev/null and b/gfx/hud/default/notify_teamkill_red.tga differ
diff --git a/gfx/hud/default/notify_void.tga b/gfx/hud/default/notify_void.tga
new file mode 100644 (file)
index 0000000..1e2d280
Binary files /dev/null and b/gfx/hud/default/notify_void.tga differ
diff --git a/gfx/hud/default/notify_water.tga b/gfx/hud/default/notify_water.tga
new file mode 100644 (file)
index 0000000..8315f12
Binary files /dev/null and b/gfx/hud/default/notify_water.tga differ
diff --git a/gfx/hud/default/num_0.tga b/gfx/hud/default/num_0.tga
new file mode 100644 (file)
index 0000000..f0ab2f1
Binary files /dev/null and b/gfx/hud/default/num_0.tga differ
diff --git a/gfx/hud/default/num_0_stroke.tga b/gfx/hud/default/num_0_stroke.tga
new file mode 100644 (file)
index 0000000..e9c6e5b
Binary files /dev/null and b/gfx/hud/default/num_0_stroke.tga differ
diff --git a/gfx/hud/default/num_1.tga b/gfx/hud/default/num_1.tga
new file mode 100644 (file)
index 0000000..78f1f45
Binary files /dev/null and b/gfx/hud/default/num_1.tga differ
diff --git a/gfx/hud/default/num_1_stroke.tga b/gfx/hud/default/num_1_stroke.tga
new file mode 100644 (file)
index 0000000..1ff552f
Binary files /dev/null and b/gfx/hud/default/num_1_stroke.tga differ
diff --git a/gfx/hud/default/num_2.tga b/gfx/hud/default/num_2.tga
new file mode 100644 (file)
index 0000000..205dd03
Binary files /dev/null and b/gfx/hud/default/num_2.tga differ
diff --git a/gfx/hud/default/num_2_stroke.tga b/gfx/hud/default/num_2_stroke.tga
new file mode 100644 (file)
index 0000000..08d26df
Binary files /dev/null and b/gfx/hud/default/num_2_stroke.tga differ
diff --git a/gfx/hud/default/num_3.tga b/gfx/hud/default/num_3.tga
new file mode 100644 (file)
index 0000000..335b5da
Binary files /dev/null and b/gfx/hud/default/num_3.tga differ
diff --git a/gfx/hud/default/num_3_stroke.tga b/gfx/hud/default/num_3_stroke.tga
new file mode 100644 (file)
index 0000000..a5fddda
Binary files /dev/null and b/gfx/hud/default/num_3_stroke.tga differ
diff --git a/gfx/hud/default/num_4.tga b/gfx/hud/default/num_4.tga
new file mode 100644 (file)
index 0000000..2b9f46f
Binary files /dev/null and b/gfx/hud/default/num_4.tga differ
diff --git a/gfx/hud/default/num_4_stroke.tga b/gfx/hud/default/num_4_stroke.tga
new file mode 100644 (file)
index 0000000..fe87933
Binary files /dev/null and b/gfx/hud/default/num_4_stroke.tga differ
diff --git a/gfx/hud/default/num_5.tga b/gfx/hud/default/num_5.tga
new file mode 100644 (file)
index 0000000..8bb7043
Binary files /dev/null and b/gfx/hud/default/num_5.tga differ
diff --git a/gfx/hud/default/num_5_stroke.tga b/gfx/hud/default/num_5_stroke.tga
new file mode 100644 (file)
index 0000000..3a6978a
Binary files /dev/null and b/gfx/hud/default/num_5_stroke.tga differ
diff --git a/gfx/hud/default/num_6.tga b/gfx/hud/default/num_6.tga
new file mode 100644 (file)
index 0000000..1db8c0e
Binary files /dev/null and b/gfx/hud/default/num_6.tga differ
diff --git a/gfx/hud/default/num_6_stroke.tga b/gfx/hud/default/num_6_stroke.tga
new file mode 100644 (file)
index 0000000..f64e178
Binary files /dev/null and b/gfx/hud/default/num_6_stroke.tga differ
diff --git a/gfx/hud/default/num_7.tga b/gfx/hud/default/num_7.tga
new file mode 100644 (file)
index 0000000..0099d68
Binary files /dev/null and b/gfx/hud/default/num_7.tga differ
diff --git a/gfx/hud/default/num_7_stroke.tga b/gfx/hud/default/num_7_stroke.tga
new file mode 100644 (file)
index 0000000..252e796
Binary files /dev/null and b/gfx/hud/default/num_7_stroke.tga differ
diff --git a/gfx/hud/default/num_8.tga b/gfx/hud/default/num_8.tga
new file mode 100644 (file)
index 0000000..aa20157
Binary files /dev/null and b/gfx/hud/default/num_8.tga differ
diff --git a/gfx/hud/default/num_8_stroke.tga b/gfx/hud/default/num_8_stroke.tga
new file mode 100644 (file)
index 0000000..e2cd39d
Binary files /dev/null and b/gfx/hud/default/num_8_stroke.tga differ
diff --git a/gfx/hud/default/num_9.tga b/gfx/hud/default/num_9.tga
new file mode 100644 (file)
index 0000000..87b9c21
Binary files /dev/null and b/gfx/hud/default/num_9.tga differ
diff --git a/gfx/hud/default/num_9_stroke.tga b/gfx/hud/default/num_9_stroke.tga
new file mode 100644 (file)
index 0000000..5a8d610
Binary files /dev/null and b/gfx/hud/default/num_9_stroke.tga differ
diff --git a/gfx/hud/default/num_colon.tga b/gfx/hud/default/num_colon.tga
new file mode 100644 (file)
index 0000000..e22c09a
Binary files /dev/null and b/gfx/hud/default/num_colon.tga differ
diff --git a/gfx/hud/default/num_colon_stroke.tga b/gfx/hud/default/num_colon_stroke.tga
new file mode 100644 (file)
index 0000000..68ad28a
Binary files /dev/null and b/gfx/hud/default/num_colon_stroke.tga differ
diff --git a/gfx/hud/default/num_dot.tga b/gfx/hud/default/num_dot.tga
new file mode 100644 (file)
index 0000000..7fbfdd0
Binary files /dev/null and b/gfx/hud/default/num_dot.tga differ
diff --git a/gfx/hud/default/num_dot_stroke.tga b/gfx/hud/default/num_dot_stroke.tga
new file mode 100644 (file)
index 0000000..29ad696
Binary files /dev/null and b/gfx/hud/default/num_dot_stroke.tga differ
diff --git a/gfx/hud/default/num_leading.tga b/gfx/hud/default/num_leading.tga
new file mode 100644 (file)
index 0000000..f2f59d3
Binary files /dev/null and b/gfx/hud/default/num_leading.tga differ
diff --git a/gfx/hud/default/num_minus.tga b/gfx/hud/default/num_minus.tga
new file mode 100644 (file)
index 0000000..10721f2
Binary files /dev/null and b/gfx/hud/default/num_minus.tga differ
diff --git a/gfx/hud/default/num_minus_stroke.tga b/gfx/hud/default/num_minus_stroke.tga
new file mode 100644 (file)
index 0000000..26455a0
Binary files /dev/null and b/gfx/hud/default/num_minus_stroke.tga differ
diff --git a/gfx/hud/default/num_plus.tga b/gfx/hud/default/num_plus.tga
new file mode 100644 (file)
index 0000000..3cb17b3
Binary files /dev/null and b/gfx/hud/default/num_plus.tga differ
diff --git a/gfx/hud/default/num_plus_stroke.tga b/gfx/hud/default/num_plus_stroke.tga
new file mode 100644 (file)
index 0000000..7df2faa
Binary files /dev/null and b/gfx/hud/default/num_plus_stroke.tga differ
diff --git a/gfx/hud/default/race_newfail.tga b/gfx/hud/default/race_newfail.tga
new file mode 100644 (file)
index 0000000..cd1164b
Binary files /dev/null and b/gfx/hud/default/race_newfail.tga differ
diff --git a/gfx/hud/default/race_newrankgreen.tga b/gfx/hud/default/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..c8fa157
Binary files /dev/null and b/gfx/hud/default/race_newrankgreen.tga differ
diff --git a/gfx/hud/default/race_newrankyellow.tga b/gfx/hud/default/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..0af3c59
Binary files /dev/null and b/gfx/hud/default/race_newrankyellow.tga differ
diff --git a/gfx/hud/default/race_newrecordserver.tga b/gfx/hud/default/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..aa8bae1
Binary files /dev/null and b/gfx/hud/default/race_newrecordserver.tga differ
diff --git a/gfx/hud/default/race_newtime.tga b/gfx/hud/default/race_newtime.tga
new file mode 100644 (file)
index 0000000..c9647b9
Binary files /dev/null and b/gfx/hud/default/race_newtime.tga differ
diff --git a/gfx/hud/default/rifle_ring_1.tga b/gfx/hud/default/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..a90927c
Binary files /dev/null and b/gfx/hud/default/rifle_ring_1.tga differ
diff --git a/gfx/hud/default/rifle_ring_2.tga b/gfx/hud/default/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..6f6ca4c
Binary files /dev/null and b/gfx/hud/default/rifle_ring_2.tga differ
diff --git a/gfx/hud/default/rifle_ring_3.tga b/gfx/hud/default/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..68f6df7
Binary files /dev/null and b/gfx/hud/default/rifle_ring_3.tga differ
diff --git a/gfx/hud/default/rifle_ring_4.tga b/gfx/hud/default/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..0a5db15
Binary files /dev/null and b/gfx/hud/default/rifle_ring_4.tga differ
diff --git a/gfx/hud/default/rifle_ring_5.tga b/gfx/hud/default/rifle_ring_5.tga
new file mode 100644 (file)
index 0000000..d5cc95b
Binary files /dev/null and b/gfx/hud/default/rifle_ring_5.tga differ
diff --git a/gfx/hud/default/rifle_ring_6.tga b/gfx/hud/default/rifle_ring_6.tga
new file mode 100644 (file)
index 0000000..4a126e7
Binary files /dev/null and b/gfx/hud/default/rifle_ring_6.tga differ
diff --git a/gfx/hud/default/rifle_ring_7.tga b/gfx/hud/default/rifle_ring_7.tga
new file mode 100644 (file)
index 0000000..846212b
Binary files /dev/null and b/gfx/hud/default/rifle_ring_7.tga differ
diff --git a/gfx/hud/default/rifle_ring_8.tga b/gfx/hud/default/rifle_ring_8.tga
new file mode 100644 (file)
index 0000000..137e24d
Binary files /dev/null and b/gfx/hud/default/rifle_ring_8.tga differ
diff --git a/gfx/hud/default/shield.tga b/gfx/hud/default/shield.tga
new file mode 100644 (file)
index 0000000..f13f0b4
Binary files /dev/null and b/gfx/hud/default/shield.tga differ
diff --git a/gfx/hud/default/statusbar.tga b/gfx/hud/default/statusbar.tga
new file mode 100644 (file)
index 0000000..987c8f5
Binary files /dev/null and b/gfx/hud/default/statusbar.tga differ
diff --git a/gfx/hud/default/statusbar_vertical.tga b/gfx/hud/default/statusbar_vertical.tga
new file mode 100644 (file)
index 0000000..e271438
Binary files /dev/null and b/gfx/hud/default/statusbar_vertical.tga differ
diff --git a/gfx/hud/default/strength.tga b/gfx/hud/default/strength.tga
new file mode 100644 (file)
index 0000000..b19019d
Binary files /dev/null and b/gfx/hud/default/strength.tga differ
diff --git a/gfx/hud/default/voteprogress_back.tga b/gfx/hud/default/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..2348be8
Binary files /dev/null and b/gfx/hud/default/voteprogress_back.tga differ
diff --git a/gfx/hud/default/voteprogress_prog.tga b/gfx/hud/default/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..574d5d7
Binary files /dev/null and b/gfx/hud/default/voteprogress_prog.tga differ
diff --git a/gfx/hud/default/voteprogress_voted.tga b/gfx/hud/default/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..ffc90a2
Binary files /dev/null and b/gfx/hud/default/voteprogress_voted.tga differ
diff --git a/gfx/hud/default/weapon_accuracy.tga b/gfx/hud/default/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..4a451b1
Binary files /dev/null and b/gfx/hud/default/weapon_accuracy.tga differ
diff --git a/gfx/hud/default/weapon_ammo.tga b/gfx/hud/default/weapon_ammo.tga
new file mode 100644 (file)
index 0000000..cb1d306
Binary files /dev/null and b/gfx/hud/default/weapon_ammo.tga differ
diff --git a/gfx/hud/default/weapon_complainbubble.tga b/gfx/hud/default/weapon_complainbubble.tga
new file mode 100644 (file)
index 0000000..a3c53a3
Binary files /dev/null and b/gfx/hud/default/weapon_complainbubble.tga differ
diff --git a/gfx/hud/default/weapon_current_bg.tga b/gfx/hud/default/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..5a8f936
Binary files /dev/null and b/gfx/hud/default/weapon_current_bg.tga differ
diff --git a/gfx/hud/default/weapon_hlacmod_renameit.tga b/gfx/hud/default/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..f11c173
Binary files /dev/null and b/gfx/hud/default/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/default/weaponcampingrifle.tga b/gfx/hud/default/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..fb6413b
Binary files /dev/null and b/gfx/hud/default/weaponcampingrifle.tga differ
diff --git a/gfx/hud/default/weaponcrylink.tga b/gfx/hud/default/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..e48ad4d
Binary files /dev/null and b/gfx/hud/default/weaponcrylink.tga differ
diff --git a/gfx/hud/default/weaponelectro.tga b/gfx/hud/default/weaponelectro.tga
new file mode 100644 (file)
index 0000000..73c791b
Binary files /dev/null and b/gfx/hud/default/weaponelectro.tga differ
diff --git a/gfx/hud/default/weaponfireball.tga b/gfx/hud/default/weaponfireball.tga
new file mode 100644 (file)
index 0000000..d7ea1fb
Binary files /dev/null and b/gfx/hud/default/weaponfireball.tga differ
diff --git a/gfx/hud/default/weapongrenadelauncher.tga b/gfx/hud/default/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..c09081b
Binary files /dev/null and b/gfx/hud/default/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/default/weaponhagar.tga b/gfx/hud/default/weaponhagar.tga
new file mode 100644 (file)
index 0000000..69a7b72
Binary files /dev/null and b/gfx/hud/default/weaponhagar.tga differ
diff --git a/gfx/hud/default/weaponhlac.tga b/gfx/hud/default/weaponhlac.tga
new file mode 100644 (file)
index 0000000..2ba3853
Binary files /dev/null and b/gfx/hud/default/weaponhlac.tga differ
diff --git a/gfx/hud/default/weaponhook.tga b/gfx/hud/default/weaponhook.tga
new file mode 100644 (file)
index 0000000..0c7fd40
Binary files /dev/null and b/gfx/hud/default/weaponhook.tga differ
diff --git a/gfx/hud/default/weaponlaser.tga b/gfx/hud/default/weaponlaser.tga
new file mode 100644 (file)
index 0000000..1f016e1
Binary files /dev/null and b/gfx/hud/default/weaponlaser.tga differ
diff --git a/gfx/hud/default/weaponminstanex.tga b/gfx/hud/default/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..26877c2
Binary files /dev/null and b/gfx/hud/default/weaponminstanex.tga differ
diff --git a/gfx/hud/default/weaponnex.tga b/gfx/hud/default/weaponnex.tga
new file mode 100644 (file)
index 0000000..4ed91bc
Binary files /dev/null and b/gfx/hud/default/weaponnex.tga differ
diff --git a/gfx/hud/default/weaponporto.tga b/gfx/hud/default/weaponporto.tga
new file mode 100644 (file)
index 0000000..46dd107
Binary files /dev/null and b/gfx/hud/default/weaponporto.tga differ
diff --git a/gfx/hud/default/weaponrocketlauncher.tga b/gfx/hud/default/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..f5449b3
Binary files /dev/null and b/gfx/hud/default/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/default/weaponseeker.tga b/gfx/hud/default/weaponseeker.tga
new file mode 100644 (file)
index 0000000..566ee86
Binary files /dev/null and b/gfx/hud/default/weaponseeker.tga differ
diff --git a/gfx/hud/default/weaponshotgun.tga b/gfx/hud/default/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..055841c
Binary files /dev/null and b/gfx/hud/default/weaponshotgun.tga differ
diff --git a/gfx/hud/default/weapontuba.tga b/gfx/hud/default/weapontuba.tga
new file mode 100644 (file)
index 0000000..8b80015
Binary files /dev/null and b/gfx/hud/default/weapontuba.tga differ
diff --git a/gfx/hud/default/weaponuzi.tga b/gfx/hud/default/weaponuzi.tga
new file mode 100644 (file)
index 0000000..c0e75d1
Binary files /dev/null and b/gfx/hud/default/weaponuzi.tga differ
diff --git a/gfx/hud/old/num_leading.tga b/gfx/hud/old/num_leading.tga
new file mode 100644 (file)
index 0000000..0e5233c
Binary files /dev/null and b/gfx/hud/old/num_leading.tga differ
diff --git a/gfx/hud/old/num_leading_1.tga b/gfx/hud/old/num_leading_1.tga
deleted file mode 100644 (file)
index 0e5233c..0000000
Binary files a/gfx/hud/old/num_leading_1.tga and /dev/null differ
diff --git a/gfx/hud/old/num_leading_2.tga b/gfx/hud/old/num_leading_2.tga
deleted file mode 100644 (file)
index 0629e49..0000000
Binary files a/gfx/hud/old/num_leading_2.tga and /dev/null differ
diff --git a/gfx/hud/old/num_leading_3.tga b/gfx/hud/old/num_leading_3.tga
deleted file mode 100644 (file)
index a6fb924..0000000
Binary files a/gfx/hud/old/num_leading_3.tga and /dev/null differ
index 0700cd5..360df33 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and b/gfx/hud/wickedhud/flag_blue_carrying.tga differ
index f0bb89d..1f037ce 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and b/gfx/hud/wickedhud/flag_blue_lost.tga differ
index e385437..1337e24 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and b/gfx/hud/wickedhud/flag_blue_shielded.tga differ
index e51e297..6df08ad 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and b/gfx/hud/wickedhud/flag_blue_taken.tga differ
index c28cea8..7a8b462 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and b/gfx/hud/wickedhud/flag_red_carrying.tga differ
index 93d5579..20380c0 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and b/gfx/hud/wickedhud/flag_red_lost.tga differ
index ed9994a..fe0a8ad 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and b/gfx/hud/wickedhud/flag_red_shielded.tga differ
index f999476..c1a560a 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and b/gfx/hud/wickedhud/flag_red_taken.tga differ
index 4de0f33..5588a4b 100644 (file)
Binary files a/gfx/hud/wickedhud/key_backward.tga and b/gfx/hud/wickedhud/key_backward.tga differ
index bef0d1c..8217ae3 100644 (file)
Binary files a/gfx/hud/wickedhud/key_backward_inv.tga and b/gfx/hud/wickedhud/key_backward_inv.tga differ
index 00b2dfe..386bba0 100644 (file)
Binary files a/gfx/hud/wickedhud/key_crouch.tga and b/gfx/hud/wickedhud/key_crouch.tga differ
index 2cdbda8..c2528a5 100644 (file)
Binary files a/gfx/hud/wickedhud/key_crouch_inv.tga and b/gfx/hud/wickedhud/key_crouch_inv.tga differ
index dfe2233..e33b59c 100644 (file)
Binary files a/gfx/hud/wickedhud/key_forward.tga and b/gfx/hud/wickedhud/key_forward.tga differ
index 7bbea60..ccc763e 100644 (file)
Binary files a/gfx/hud/wickedhud/key_forward_inv.tga and b/gfx/hud/wickedhud/key_forward_inv.tga differ
index d02b2db..d1ddcbb 100644 (file)
Binary files a/gfx/hud/wickedhud/key_jump.tga and b/gfx/hud/wickedhud/key_jump.tga differ
index c54bb37..d547980 100644 (file)
Binary files a/gfx/hud/wickedhud/key_jump_inv.tga and b/gfx/hud/wickedhud/key_jump_inv.tga differ
index 60fe71f..ed991f4 100644 (file)
Binary files a/gfx/hud/wickedhud/key_left.tga and b/gfx/hud/wickedhud/key_left.tga differ
index 92bc615..e607ddb 100644 (file)
Binary files a/gfx/hud/wickedhud/key_left_inv.tga and b/gfx/hud/wickedhud/key_left_inv.tga differ
index 308c03b..83baa31 100644 (file)
Binary files a/gfx/hud/wickedhud/key_right.tga and b/gfx/hud/wickedhud/key_right.tga differ
index 8f04be4..3bd8867 100644 (file)
Binary files a/gfx/hud/wickedhud/key_right_inv.tga and b/gfx/hud/wickedhud/key_right_inv.tga differ
diff --git a/gfx/hud/wickedhud/notify_blue_captured.tga b/gfx/hud/wickedhud/notify_blue_captured.tga
new file mode 100644 (file)
index 0000000..7cff17e
Binary files /dev/null and b/gfx/hud/wickedhud/notify_blue_captured.tga differ
diff --git a/gfx/hud/wickedhud/notify_blue_lost.tga b/gfx/hud/wickedhud/notify_blue_lost.tga
new file mode 100644 (file)
index 0000000..67d894d
Binary files /dev/null and b/gfx/hud/wickedhud/notify_blue_lost.tga differ
diff --git a/gfx/hud/wickedhud/notify_blue_returned.tga b/gfx/hud/wickedhud/notify_blue_returned.tga
new file mode 100644 (file)
index 0000000..8e8b67f
Binary files /dev/null and b/gfx/hud/wickedhud/notify_blue_returned.tga differ
diff --git a/gfx/hud/wickedhud/notify_blue_shielded.tga b/gfx/hud/wickedhud/notify_blue_shielded.tga
new file mode 100644 (file)
index 0000000..a8993f6
Binary files /dev/null and b/gfx/hud/wickedhud/notify_blue_shielded.tga differ
diff --git a/gfx/hud/wickedhud/notify_blue_taken.tga b/gfx/hud/wickedhud/notify_blue_taken.tga
new file mode 100644 (file)
index 0000000..6847e7c
Binary files /dev/null and b/gfx/hud/wickedhud/notify_blue_taken.tga differ
index 2766dd1..1454d5c 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_camping.tga and b/gfx/hud/wickedhud/notify_camping.tga differ
index d5e8045..b42738b 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_death.tga and b/gfx/hud/wickedhud/notify_death.tga differ
index 3976e8b..100c0fa 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_lava.tga and b/gfx/hud/wickedhud/notify_lava.tga differ
diff --git a/gfx/hud/wickedhud/notify_red_captured.tga b/gfx/hud/wickedhud/notify_red_captured.tga
new file mode 100644 (file)
index 0000000..72814ec
Binary files /dev/null and b/gfx/hud/wickedhud/notify_red_captured.tga differ
diff --git a/gfx/hud/wickedhud/notify_red_lost.tga b/gfx/hud/wickedhud/notify_red_lost.tga
new file mode 100644 (file)
index 0000000..f96e021
Binary files /dev/null and b/gfx/hud/wickedhud/notify_red_lost.tga differ
diff --git a/gfx/hud/wickedhud/notify_red_returned.tga b/gfx/hud/wickedhud/notify_red_returned.tga
new file mode 100644 (file)
index 0000000..deee468
Binary files /dev/null and b/gfx/hud/wickedhud/notify_red_returned.tga differ
diff --git a/gfx/hud/wickedhud/notify_red_shielded.tga b/gfx/hud/wickedhud/notify_red_shielded.tga
new file mode 100644 (file)
index 0000000..e7ec491
Binary files /dev/null and b/gfx/hud/wickedhud/notify_red_shielded.tga differ
diff --git a/gfx/hud/wickedhud/notify_red_taken.tga b/gfx/hud/wickedhud/notify_red_taken.tga
new file mode 100644 (file)
index 0000000..bf71977
Binary files /dev/null and b/gfx/hud/wickedhud/notify_red_taken.tga differ
index 646a1a2..b05b6af 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_selfkill.tga and b/gfx/hud/wickedhud/notify_selfkill.tga differ
index c08a6a3..68da649 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_slime.tga and b/gfx/hud/wickedhud/notify_slime.tga differ
diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga
deleted file mode 100644 (file)
index 0f28ebb..0000000
Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_teamkill_blue.tga b/gfx/hud/wickedhud/notify_teamkill_blue.tga
new file mode 100644 (file)
index 0000000..0ba677d
Binary files /dev/null and b/gfx/hud/wickedhud/notify_teamkill_blue.tga differ
diff --git a/gfx/hud/wickedhud/notify_teamkill_red.tga b/gfx/hud/wickedhud/notify_teamkill_red.tga
new file mode 100644 (file)
index 0000000..0ba677d
Binary files /dev/null and b/gfx/hud/wickedhud/notify_teamkill_red.tga differ
index 8315f12..6edb791 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_water.tga and b/gfx/hud/wickedhud/notify_water.tga differ
diff --git a/gfx/hud/wickedhud/num_leading.tga b/gfx/hud/wickedhud/num_leading.tga
new file mode 100644 (file)
index 0000000..f2f59d3
Binary files /dev/null and b/gfx/hud/wickedhud/num_leading.tga differ
diff --git a/gfx/hud/wickedhud/num_leading_1.tga b/gfx/hud/wickedhud/num_leading_1.tga
deleted file mode 100644 (file)
index f2f59d3..0000000
Binary files a/gfx/hud/wickedhud/num_leading_1.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_leading_2.tga b/gfx/hud/wickedhud/num_leading_2.tga
deleted file mode 100644 (file)
index a9be88c..0000000
Binary files a/gfx/hud/wickedhud/num_leading_2.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_leading_3.tga b/gfx/hud/wickedhud/num_leading_3.tga
deleted file mode 100644 (file)
index ebd35a4..0000000
Binary files a/gfx/hud/wickedhud/num_leading_3.tga and /dev/null differ
index cd1164b..89d0ec5 100644 (file)
Binary files a/gfx/hud/wickedhud/race_newfail.tga and b/gfx/hud/wickedhud/race_newfail.tga differ
index c8fa157..d3fe40d 100644 (file)
Binary files a/gfx/hud/wickedhud/race_newrankgreen.tga and b/gfx/hud/wickedhud/race_newrankgreen.tga differ
index 0af3c59..d3fe40d 100644 (file)
Binary files a/gfx/hud/wickedhud/race_newrankyellow.tga and b/gfx/hud/wickedhud/race_newrankyellow.tga differ
index aa8bae1..7c1e6db 100644 (file)
Binary files a/gfx/hud/wickedhud/race_newrecordserver.tga and b/gfx/hud/wickedhud/race_newrecordserver.tga differ
index c9647b9..1ec3047 100644 (file)
Binary files a/gfx/hud/wickedhud/race_newtime.tga and b/gfx/hud/wickedhud/race_newtime.tga differ
index fc031ce..3be8d40 100644 (file)
Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and b/gfx/hud/wickedhud/voteprogress_back.tga differ
index 9f3f614..f24f524 100644 (file)
Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and b/gfx/hud/wickedhud/voteprogress_prog.tga differ
index a21fe6a..ee06048 100644 (file)
Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and b/gfx/hud/wickedhud/voteprogress_voted.tga differ
diff --git a/gfx/hud/wickedhud/weapon_ammo.tga b/gfx/hud/wickedhud/weapon_ammo.tga
new file mode 100644 (file)
index 0000000..cb1d306
Binary files /dev/null and b/gfx/hud/wickedhud/weapon_ammo.tga differ
diff --git a/gfx/hud/wickedhud/weapon_complainbubble.tga b/gfx/hud/wickedhud/weapon_complainbubble.tga
new file mode 100644 (file)
index 0000000..73cce9d
Binary files /dev/null and b/gfx/hud/wickedhud/weapon_complainbubble.tga differ
index 6775942..79b0e83 100755 (executable)
Binary files a/gfx/menu/wickedx/colorpicker_m.tga and b/gfx/menu/wickedx/colorpicker_m.tga differ
diff --git a/gfx/menu/wickedx/colorpicker_selected.tga b/gfx/menu/wickedx/colorpicker_selected.tga
new file mode 100644 (file)
index 0000000..605e932
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker_selected.tga differ
diff --git a/gfx/menu/wickedx/cursor_move.tga b/gfx/menu/wickedx/cursor_move.tga
new file mode 100644 (file)
index 0000000..0264316
Binary files /dev/null and b/gfx/menu/wickedx/cursor_move.tga differ
diff --git a/gfx/menu/wickedx/cursor_resize.tga b/gfx/menu/wickedx/cursor_resize.tga
new file mode 100644 (file)
index 0000000..475e224
Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize.tga differ
diff --git a/gfx/menu/wickedx/cursor_resize2.tga b/gfx/menu/wickedx/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..6c97fb8
Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize2.tga differ
diff --git a/gfx/reticle_nex.tga b/gfx/reticle_nex.tga
new file mode 100644 (file)
index 0000000..3e0c142
Binary files /dev/null and b/gfx/reticle_nex.tga differ
diff --git a/gfx/reticle_normal.tga b/gfx/reticle_normal.tga
new file mode 100644 (file)
index 0000000..8b82ea8
Binary files /dev/null and b/gfx/reticle_normal.tga differ
diff --git a/hook-firing_swap.cfg b/hook-firing_swap.cfg
new file mode 100644 (file)
index 0000000..e556db7
--- /dev/null
@@ -0,0 +1,57 @@
+// This script allows swapping the primary and secondary fire buttons for any weapon
+//
+// To install, add
+//   exec hook-firing_swap.cfg
+// to your autoexec.cfg
+
+// NOTE: if combined with other scripts that also hook cl_hook_activeweapon, do
+//   alias cl_hook_activeweapon "firing_swap $1; commands of other scripts..."
+// after exec'ing them all from your autoexec.cfg
+
+// Set the cvars for each gun
+seta cl_swapattacks_tuba 0
+seta cl_swapattacks_laser 0
+seta cl_swapattacks_shotgun 0
+seta cl_swapattacks_uzi 0
+seta cl_swapattacks_campingrifle 0
+seta cl_swapattacks_grenadelauncher 0
+seta cl_swapattacks_electro 0
+seta cl_swapattacks_hlac 0
+seta cl_swapattacks_crylink 0
+seta cl_swapattacks_minstanex 0
+seta cl_swapattacks_nex 0
+seta cl_swapattacks_hagar 0
+seta cl_swapattacks_seeker 0
+seta cl_swapattacks_fireball 0
+seta cl_swapattacks_rocketlauncher 0
+seta cl_swapattacks_hook 0
+seta cl_swapattacks_porto 0
+
+// This part of the code is necessary to keep us firing when we switch weapons while holding a fire button pressed
+// Also updates the keys before firing, so we don't have to switch to another weapon and back to apply the changes
+set fire_last 0
+set fire2_last 0
+alias +fire "firing_swap_apply $firing_lastweapon; set fire_last 1; +checkattack"
+alias -fire "set fire_last 0; -checkattack"
+alias +fire2 "firing_swap_apply $firing_lastweapon; set fire2_last 1; +checkattack2"
+alias -fire2 "set fire2_last 0; -checkattack2"
+alias firing_switch_attack_0 ""
+alias firing_switch_attack2_0 ""
+alias firing_switch_attack_1 "+fire"
+alias firing_switch_attack2_1 "+fire2"
+alias firing_switch "-fire; -fire2; firing_switch_attack_$fire_last; firing_switch_attack2_$fire2_last;"
+
+// Now apply changes to the key binds and get the weapon we are using
+alias firing_decision_0 "alias +checkattack +attack; alias -checkattack -attack; alias +checkattack2 +attack2; alias -checkattack2 -attack2"
+alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack2; alias +checkattack2 +attack; alias -checkattack2 -attack"
+alias firing_swap_apply "firing_decision_${$1}"
+alias firing_swap "firing_swap_apply cl_swapattacks_$1; set firing_lastweapon cl_swapattacks_$1; firing_switch"
+
+// Not correct, but prevents firing from braking after executing the script until switching weapons
+alias +fire +attack
+alias -fire -attack
+alias +fire2 +attack2
+alias -fire2 -attack2
+
+// install
+alias cl_hook_activeweapon "firing_swap $1"
index 62d9d11..3c14d36 100644 (file)
@@ -20,22 +20,31 @@ seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar bac
 seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color"
 seta hud_progressbar_nexball_color "0.7 0.1 0" "R G B vector of the progress bar background color"
 
+seta _hud_panelorder "6 0 1 2 3 4 5 7 8 9 10 11 12 13 14" "contains order in which panels are to be drawn"
+
 seta hud_weaponicons 1 "enable/disable this panel"
 seta hud_weaponicons_pos "0.930000 0.090000" "position of this panel"
 seta hud_weaponicons_size "0.040000 0.490000" "size of this panel"
-seta hud_weaponicons_number 1 "show number of weapon"
-seta hud_weaponicons_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
 seta hud_weaponicons_bg "border_weaponicons" "if set to something else than \"\" = override default background"
 seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_weaponicons_bg_color_team "" "override panel color with team color in team based games"
 seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_weaponicons_aspect 2 "use this aspect on the items"
+seta hud_weaponicons_complainbubble 1 "complain bubble (out of ammo, weapon not available etc)"
+seta hud_weaponicons_complainbubble_padding -10 "padding for the complainbubble"
+seta hud_weaponicons_complainbubble_color_outofammo "0.8 0 0" "color of the complainbubble when showing out of ammo message"
+seta hud_weaponicons_complainbubble_color_donthave "0.8 0.5 0" "color of the complainbubble when showing don't have weapon message"
+seta hud_weaponicons_complainbubble_color_unavailable "0 0.3 0.8" "color of the complainbubble when showing weapon unavailable message"
+seta hud_weaponicons_ammo_color "0 1 0" "color of status bar"
+seta hud_weaponicons_ammo_alpha 1 "alpha of status bar"
 
 seta hud_inventory 1 "enable/disable this panel"
 seta hud_inventory_pos "0.190000 0.930000" "position of this panel"
 seta hud_inventory_size "0.093750 0.050000" "size of this panel"
 seta hud_inventory_onlycurrent 1 "1 = show only current ammo type"
+seta hud_inventory_iconalign 0 "0 = align icons to the left, 1 = align icons to the right"
 seta hud_inventory_bg "border_inventory" "if set to something else than \"\" = override default background"
 seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_inventory_bg_color_team "" "override panel color with team color in team based games"
@@ -47,7 +56,8 @@ seta hud_powerups 1 "enable/disable this panel"
 seta hud_powerups_pos "0.400000 0.130000" "position of this panel"
 seta hud_powerups_size "0.200000 0.050000" "size of this panel"
 seta hud_powerups_flip 1 "flip strength/shield positions"
-seta hud_powerups_mirror 0 "mirror alignment of panel items"
+seta hud_powerups_baralign 0 "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
+seta hud_powerups_iconalign 0 "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
 seta hud_powerups_bg "border_powerups" "if set to something else than \"\" = override default background"
 seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_powerups_bg_color_team "" "override panel color with team color in team based games"
@@ -59,7 +69,8 @@ seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor dis
 seta hud_healtharmor_pos "0.300000 0.930000" "position of this panel"
 seta hud_healtharmor_size "0.240000 0.050000" "size of this panel"
 seta hud_healtharmor_flip 0 "flip health/armor positions"
-seta hud_healtharmor_mirror 0 "mirror alignment of panel items"
+seta hud_healtharmor_baralign 0 "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
+seta hud_healtharmor_iconalign 0 "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
 seta hud_healtharmor_bg "border_healtharmor" "if set to something else than \"\" = override default background"
 seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_healtharmor_bg_color_team "" "override panel color with team color in team based games"
@@ -78,14 +89,10 @@ seta hud_notify_bg_border "" "if set to something else than \"\" = override defa
 seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_notify_flip 0 "order the list top to bottom instead of bottom to top"
 seta hud_notify_print 0 "also con_notify print the messages that are shown on the notify panel"
-seta hud_notify_time 10 "time that a new entry stays until it fades out"
-seta hud_notify_fadetime 3 "fade out time"
-seta hud_notify_info_top 1 "show info messages at top of panel"
 
 seta hud_timer 1 "enable/disable this panel"
 seta hud_timer_pos "0.880000 0.015000" "position of this base of the panel"
 seta hud_timer_size "0.100000 0.032520" "size of this panel"
-seta hud_timer_increment 0 "show elapsed time instead of remaining time"
 seta hud_timer_bg "border_timer" "if set to something else than \"\" = override default background"
 seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
 seta hud_timer_bg_color_team "" "override panel color with team color in team based games"
@@ -103,10 +110,6 @@ seta hud_radar_bg_alpha "" "if set to something else than \"\" = override defaul
 seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_radar_bg_padding "-3" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_radar_foreground_alpha 0.8    "alpha of the map"
-seta hud_radar_scale 4096 "distance you can see on the team radar"
-seta hud_radar_rotation 0      "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
-seta hud_radar_zoommode 0      "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
-alias hud_radar_rotate "toggle hud_radar_rotation 0 1 2 3 4"
 
 seta hud_score 1 "enable/disable this panel"
 seta hud_score_pos "0.020000 0.930000" "position of this base of the panel"
@@ -158,6 +161,7 @@ seta hud_pressedkeys_bg_color_team "" "override panel color with team color in t
 seta hud_pressedkeys_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
 seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_pressedkeys_aspect 1.6 "forced aspect on panel"
 
 seta hud_chat 1 "enable/disable this panel"
 seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel"
@@ -178,8 +182,14 @@ seta hud_engineinfo_bg_color_team "" "override panel color with team color in te
 seta hud_engineinfo_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
 seta hud_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
-seta hud_engineinfo_framecounter_decimals 0 "amount of decimals to show"
-seta hud_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
-seta hud_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
-seta hud_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
+
+seta hud_infomessages 1 "enable/disable this panel
+seta hud_infomessages_pos "0.020000 0.680000" "position of this base of the panel"
+seta hud_infomessages_size "0.320000 0.090000" "size of this panel"
+seta hud_infomessages_bg "border_modicons" "if set to something else than \"\" = override default background"
+seta hud_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_infomessages_bg_color_team "" "override panel color with team color in team based games"
+seta hud_infomessages_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
+seta hud_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_infomessages_flip 0 "1 = align the items to the right"
diff --git a/hud_wickedhud_minimalistic.cfg b/hud_wickedhud_minimalistic.cfg
new file mode 100644 (file)
index 0000000..ad2ae87
--- /dev/null
@@ -0,0 +1,173 @@
+seta hud_skin "wickedhud"
+seta hud_bg "border"
+seta hud_bg_color "0.875 0.375 0"
+seta hud_bg_color_team "0"
+seta hud_bg_alpha "1"
+seta hud_bg_border "6"
+seta hud_bg_padding "2"
+seta hud_fg_alpha "1"
+
+seta hud_dock ""
+seta hud_dock_color "0 0.1875 0.4375"
+seta hud_dock_color_team "0.700000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha 0.500000
+seta hud_progressbar_strength_color "0 0 0.6"
+seta hud_progressbar_shield_color "0.6 0 0.6"
+seta hud_progressbar_health_color "0.6 0 0"
+seta hud_progressbar_armor_color "0 0.6 0"
+seta hud_progressbar_fuel_color "0.6 0.6 0"
+seta hud_progressbar_nexball_color "0.7 0.1 0"
+
+seta hud_weaponicons 1
+seta hud_weaponicons_pos "0.940000 0.040000"
+seta hud_weaponicons_size "0.060000 0.630000"
+seta hud_weaponicons_bg "0"
+seta hud_weaponicons_bg_color ""
+seta hud_weaponicons_bg_color_team ""
+seta hud_weaponicons_bg_alpha ""
+seta hud_weaponicons_bg_border ""
+seta hud_weaponicons_bg_padding ""
+seta hud_weaponicons_accuracy_yellow 40
+
+seta hud_inventory 1
+seta hud_inventory_pos "0 0.810000"
+seta hud_inventory_size "0.090000 0.190000"
+seta hud_inventory_bg "0"
+seta hud_inventory_bg_color ""
+seta hud_inventory_bg_color_team ""
+seta hud_inventory_bg_alpha ""
+seta hud_inventory_bg_border ""
+seta hud_inventory_bg_padding ""
+seta hud_inventory_onlycurrent 0
+
+seta hud_powerups 1
+seta hud_powerups_pos "0.400000 0.130000"
+seta hud_powerups_size "0.200000 0.050000"
+seta hud_powerups_bg "0"
+seta hud_powerups_bg_color ""
+seta hud_powerups_bg_color_team ""
+seta hud_powerups_bg_alpha ""
+seta hud_powerups_bg_border ""
+seta hud_powerups_bg_padding ""
+seta hud_powerups_flip 1
+seta hud_powerups_mirror 0
+
+seta hud_healtharmor 1
+seta hud_healtharmor_pos "0.100000 0.920000"
+seta hud_healtharmor_size "0.560000 0.080000"
+seta hud_healtharmor_bg "0"
+seta hud_healtharmor_bg_color ""
+seta hud_healtharmor_bg_color_team ""
+seta hud_healtharmor_bg_alpha ""
+seta hud_healtharmor_bg_border ""
+seta hud_healtharmor_bg_padding ""
+seta hud_healtharmor_flip 0
+seta hud_healtharmor_mirror 1
+
+seta hud_notify 1
+seta hud_notify_pos "0.670000 0.680000"
+seta hud_notify_size "0.330000 0.230000"
+seta hud_notify_bg "border_modicons"
+seta hud_notify_bg_color ""
+seta hud_notify_bg_color_team ""
+seta hud_notify_bg_alpha "0"
+seta hud_notify_bg_border ""
+seta hud_notify_bg_padding ""
+seta hud_notify_flip 0
+seta hud_notify_info_top 1
+
+seta hud_timer 1
+seta hud_timer_pos "0.940000 0"
+seta hud_timer_size "0.060000 0.030000"
+seta hud_timer_bg "border_timer"
+seta hud_timer_bg_color ""
+seta hud_timer_bg_color_team ""
+seta hud_timer_bg_alpha ""
+seta hud_timer_bg_border ""
+seta hud_timer_bg_padding "0"
+
+seta hud_radar 0
+seta hud_radar_pos "0 0"
+seta hud_radar_size "0.190000 0.230000"
+seta hud_radar_bg "border_radar"
+seta hud_radar_bg_color ""
+seta hud_radar_bg_color_team ""
+seta hud_radar_bg_alpha ""
+seta hud_radar_bg_border ""
+seta hud_radar_bg_padding "-3"
+seta hud_radar_foreground_alpha 0.800000
+seta hud_radar_alreadyvoted_alpha 0
+
+seta hud_score 1
+seta hud_score_pos "0.830000 0.920000"
+seta hud_score_size "0.170000 0.060000"
+seta hud_score_bg "0"
+seta hud_score_bg_color ""
+seta hud_score_bg_color_team ""
+seta hud_score_bg_alpha ""
+seta hud_score_bg_border ""
+seta hud_score_bg_padding ""
+
+seta hud_racetimer 1
+seta hud_racetimer_pos "0.360000 0.010000"
+seta hud_racetimer_size "0.280000 0.093333"
+seta hud_racetimer_bg "border_timer"
+seta hud_racetimer_bg_color ""
+seta hud_racetimer_bg_color_team ""
+seta hud_racetimer_bg_alpha "0"
+seta hud_racetimer_bg_border ""
+seta hud_racetimer_bg_padding ""
+
+seta hud_vote 1
+seta hud_vote_pos "0.690000 0"
+seta hud_vote_size "0.240000 0.080000"
+seta hud_vote_bg "border_vote"
+seta hud_vote_bg_color ""
+seta hud_vote_bg_color_team ""
+seta hud_vote_bg_alpha ""
+seta hud_vote_bg_border ""
+seta hud_vote_bg_padding ""
+seta hud_vote_alreadyvoted_alpha 0.750000
+
+seta hud_modicons 1
+seta hud_modicons_pos "0.700000 0.920000"
+seta hud_modicons_size "0.120000 0.080000"
+seta hud_modicons_bg "border_modicons"
+seta hud_modicons_bg_color ""
+seta hud_modicons_bg_color_team ""
+seta hud_modicons_bg_alpha ""
+seta hud_modicons_bg_border ""
+seta hud_modicons_bg_padding ""
+
+seta hud_pressedkeys 0
+seta hud_pressedkeys_pos "0 0"
+seta hud_pressedkeys_size "0.080000 0.062912"
+seta hud_pressedkeys_bg "border_modicons"
+seta hud_pressedkeys_bg_color ""
+seta hud_pressedkeys_bg_color_team ""
+seta hud_pressedkeys_bg_alpha "0"
+seta hud_pressedkeys_bg_border ""
+seta hud_pressedkeys_bg_padding ""
+
+seta hud_chat 1
+seta hud_chat_pos "0.100000 0.790000"
+seta hud_chat_size "0.560000 0.120000"
+seta hud_chat_bg "border_chat"
+seta hud_chat_bg_color ""
+seta hud_chat_bg_color_team ""
+seta hud_chat_bg_alpha "0"
+seta hud_chat_bg_border ""
+seta hud_chat_bg_padding ""
+
+seta hud_engineinfo 0
+seta hud_engineinfo_pos "0 0"
+seta hud_engineinfo_size "0.130000 0.034667"
+seta hud_engineinfo_bg "border_modicons"
+seta hud_engineinfo_bg_color ""
+seta hud_engineinfo_bg_color_team ""
+seta hud_engineinfo_bg_alpha "0"
+seta hud_engineinfo_bg_border ""
+seta hud_engineinfo_bg_padding ""
+
index 1aee5d8..028547a 100644 (file)
@@ -8,8 +8,8 @@
 "+hook"                                 "off-hand hook / jet pack"
 ""                                      ""
 ""                                      "Attacking"
-"+attack"                               "primary fire"
-"+attack2"                              "secondary fire"
+"+fire"                                 "primary fire"
+"+fire2"                                "secondary fire"
 ""                                      ""
 ""                                      "Weapon switching"
 "weapprev"                              "previous"
diff --git a/loadfonts.cfg b/loadfonts.cfg
deleted file mode 100644 (file)
index dd3b637..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// When freetype support is in SVN, remove the space between vera-sans and the comma :)
-// like: loadfont user0 gfx/vera-sans,gfx/fallback 8 12 16 24 32
-// loadfont console     gfx/vera-mono,gfx/fallback $con_textsize 9 10 11
-// loadfont sbar        gfx/vera-mono
-loadfont notify      gfx/vera-sans,gfx/fallback 8 12 16 24 32
-loadfont chat        gfx/vera-sans,gfx/fallback 8 13 16 24 32
-// loadfont centerprint gfx/vera-mono
-// loadfont infobar     gfx/vera-mono
-loadfont user0       gfx/vera-sans,gfx/fallback 8 12 16 24 32
-
-// now create the real sbar_font alias
-alias sbar_font "loadfont user1 ${1},gfx/fallback ${2-}; loadfont user2 ${1}-big,gfx/fallback ${2-}; sbar_columns_set"
-// if _requested_sbar_font is empty, the string becaomse "nonempty: "
-// for the case "nonempty: " a default value is used
-// in any other case, the _requested_sbar_font is sued
-set _used_sbar_font "nonempty: $_requested_sbar_font"
-toggle _used_sbar_font "$_requested_sbar_font" "nonempty: " "gfx/vera-sans 8 12 16 24 32"
-toggle _requested_sbar_font "" "gfx/vera-sans 8 12 16 24 32" "gfx/vera-sans 8 12 16 24 32" "$_requested_sbar_font"
-sbar_font ${_requested_sbar_font asis}
-
-set menu_font_size_snapping_fix 1
index 28a3c07..ebd112b 100644 (file)
Binary files a/models/player/erebus.iqm and b/models/player/erebus.iqm differ
diff --git a/models/player/erebus.iqm_0.sounds b/models/player/erebus.iqm_0.sounds
new file mode 100644 (file)
index 0000000..831cc46
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: soldier
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/soldier/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/soldier/coms/attackinfive 0
+coverme sound/player/soldier/coms/coverme 0
+defend sound/player/soldier/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/soldier/coms/freelance 2
+getflag sound/player/soldier/player/getflag 0
+incoming sound/player/soldier/coms/incoming 0
+meet sound/player/soldier/coms/meet 0
+needhelp sound/player/soldier/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/soldier/coms/seenflag 0
+taunt sound/player/soldier/coms/taunt 3
+teamshoot sound/player/soldier/coms/teamshoot 3
+death sound/player/soldier/player/death 3
+drown sound/player/soldier/player/drown 0
+fall sound/player/soldier/player/fall 0
+falling sound/player/soldier/player/falling 0
+gasp sound/player/soldier/player/gasp 0
+jump sound/player/soldier/player/jump 0
+pain25 sound/player/soldier/player/pain25 0
+pain50 sound/player/soldier/player/pain50 0
+pain75 sound/player/soldier/player/pain75 0
+pain100 sound/player/soldier/player/pain100 0
index ee7fb58..4fedf77 100644 (file)
Binary files a/models/player/erebus.iqm_0.tga and b/models/player/erebus.iqm_0.tga differ
diff --git a/models/player/erebus_lod1.iqm b/models/player/erebus_lod1.iqm
new file mode 100644 (file)
index 0000000..21cd3d4
Binary files /dev/null and b/models/player/erebus_lod1.iqm differ
diff --git a/models/player/erebus_lod1.iqm.framegroups b/models/player/erebus_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/erebus_lod2.iqm b/models/player/erebus_lod2.iqm
new file mode 100644 (file)
index 0000000..34e7e80
Binary files /dev/null and b/models/player/erebus_lod2.iqm differ
diff --git a/models/player/erebus_lod2.iqm.framegroups b/models/player/erebus_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
index 22a1975..dccf325 100644 (file)
Binary files a/models/player/gak.iqm and b/models/player/gak.iqm differ
diff --git a/models/player/gak.iqm_0.sounds b/models/player/gak.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0
index 093b7f0..38a7273 100644 (file)
Binary files a/models/player/gak.iqm_0.tga and b/models/player/gak.iqm_0.tga differ
index 9df6bdb..c4b574a 100644 (file)
Binary files a/models/player/gakarmored.iqm and b/models/player/gakarmored.iqm differ
diff --git a/models/player/gakarmored.iqm_0.sounds b/models/player/gakarmored.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0
index b4a58ea..0fbb375 100644 (file)
Binary files a/models/player/gakarmored.iqm_0.tga and b/models/player/gakarmored.iqm_0.tga differ
index 275953d..646c628 100644 (file)
Binary files a/models/player/gakmasked.iqm and b/models/player/gakmasked.iqm differ
diff --git a/models/player/gakmasked.iqm_0.sounds b/models/player/gakmasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0
index 40d2958..7b30802 100644 (file)
Binary files a/models/player/gakmasked.iqm_0.tga and b/models/player/gakmasked.iqm_0.tga differ
index cccb00c..2e47493 100644 (file)
Binary files a/models/player/ignis.iqm and b/models/player/ignis.iqm differ
diff --git a/models/player/ignis.iqm_0.sounds b/models/player/ignis.iqm_0.sounds
new file mode 100644 (file)
index 0000000..952ba1c
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: insurrectionist
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/insurrectionist/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/insurrectionist/coms/attackinfive 0
+coverme sound/player/insurrectionist/coms/coverme 0
+defend sound/player/insurrectionist/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/insurrectionist/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/insurrectionist/coms/incoming 0
+meet sound/player/insurrectionist/coms/meet 0
+needhelp sound/player/insurrectionist/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/insurrectionist/coms/seenflag 0
+taunt sound/player/insurrectionist/coms/taunt 4
+teamshoot sound/player/insurrectionist/coms/teamshoot 3
+death sound/player/insurrectionist/player/death 3
+drown sound/player/insurrectionist/player/drown 0
+fall sound/player/insurrectionist/player/fall 0
+falling sound/player/insurrectionist/player/falling 0
+gasp sound/player/insurrectionist/player/gasp 0
+jump sound/player/insurrectionist/player/jump 0
+pain25 sound/player/insurrectionist/player/pain25 0
+pain50 sound/player/insurrectionist/player/pain50 0
+pain75 sound/player/insurrectionist/player/pain75 0
+pain100 sound/player/insurrectionist/player/pain100 0
index 9905384..3ad24e0 100644 (file)
Binary files a/models/player/ignis.iqm_0.tga and b/models/player/ignis.iqm_0.tga differ
diff --git a/models/player/ignis_lod1.iqm b/models/player/ignis_lod1.iqm
new file mode 100644 (file)
index 0000000..38a6b3b
Binary files /dev/null and b/models/player/ignis_lod1.iqm differ
diff --git a/models/player/ignis_lod1.iqm.framegroups b/models/player/ignis_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/ignis_lod2.iqm b/models/player/ignis_lod2.iqm
new file mode 100644 (file)
index 0000000..ac9a406
Binary files /dev/null and b/models/player/ignis_lod2.iqm differ
diff --git a/models/player/ignis_lod2.iqm.framegroups b/models/player/ignis_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
index 5a823e2..7f5a512 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ
diff --git a/models/player/ignishalfmasked.iqm_0.sounds b/models/player/ignishalfmasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..952ba1c
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: insurrectionist
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/insurrectionist/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/insurrectionist/coms/attackinfive 0
+coverme sound/player/insurrectionist/coms/coverme 0
+defend sound/player/insurrectionist/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/insurrectionist/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/insurrectionist/coms/incoming 0
+meet sound/player/insurrectionist/coms/meet 0
+needhelp sound/player/insurrectionist/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/insurrectionist/coms/seenflag 0
+taunt sound/player/insurrectionist/coms/taunt 4
+teamshoot sound/player/insurrectionist/coms/teamshoot 3
+death sound/player/insurrectionist/player/death 3
+drown sound/player/insurrectionist/player/drown 0
+fall sound/player/insurrectionist/player/fall 0
+falling sound/player/insurrectionist/player/falling 0
+gasp sound/player/insurrectionist/player/gasp 0
+jump sound/player/insurrectionist/player/jump 0
+pain25 sound/player/insurrectionist/player/pain25 0
+pain50 sound/player/insurrectionist/player/pain50 0
+pain75 sound/player/insurrectionist/player/pain75 0
+pain100 sound/player/insurrectionist/player/pain100 0
index c0beb4a..487a131 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm_0.tga and b/models/player/ignishalfmasked.iqm_0.tga differ
index 39c488c..fd72a02 100644 (file)
@@ -1,4 +1,4 @@
-name Ignis - HalfMasked
+name Ignis - Half Masked
 species human
 sex Male
 weight 90
diff --git a/models/player/ignishalfmasked_lod1.iqm.framegroups b/models/player/ignishalfmasked_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/ignishalfmasked_lod2.iqm.framegroups b/models/player/ignishalfmasked_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
index a165aac..fbf2b00 100644 (file)
Binary files a/models/player/ignismasked.iqm and b/models/player/ignismasked.iqm differ
diff --git a/models/player/ignismasked.iqm_0.sounds b/models/player/ignismasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..37d416d
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: marine
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/marine/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/marine/coms/attackinfive 0
+coverme sound/player/marine/coms/coverme 0
+defend sound/player/marine/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/marine/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/marine/coms/incoming 0
+meet sound/player/marine/coms/meet 0
+needhelp sound/player/marine/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/marine/coms/seenflag 0
+taunt sound/player/marine/coms/taunt 3
+teamshoot sound/player/marine/coms/teamshoot 4
+death sound/player/marine/player/death 3
+drown sound/player/marine/player/drown 0
+fall sound/player/marine/player/fall 0
+falling sound/player/marine/player/falling 0
+gasp sound/player/marine/player/gasp 0
+jump sound/player/marine/player/jump 0
+pain25 sound/player/marine/player/pain25 0
+pain50 sound/player/marine/player/pain50 0
+pain75 sound/player/marine/player/pain75 0
+pain100 sound/player/marine/player/pain100 0
index 572e8fe..8a29f81 100644 (file)
Binary files a/models/player/ignismasked.iqm_0.tga and b/models/player/ignismasked.iqm_0.tga differ
diff --git a/models/player/ignismasked_lod1.iqm b/models/player/ignismasked_lod1.iqm
new file mode 100644 (file)
index 0000000..44633d5
Binary files /dev/null and b/models/player/ignismasked_lod1.iqm differ
diff --git a/models/player/ignismasked_lod1.iqm.framegroups b/models/player/ignismasked_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/ignismasked_lod2.iqm b/models/player/ignismasked_lod2.iqm
new file mode 100644 (file)
index 0000000..a913231
Binary files /dev/null and b/models/player/ignismasked_lod2.iqm differ
diff --git a/models/player/ignismasked_lod2.iqm.framegroups b/models/player/ignismasked_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
index 85cc5f5..505fcb9 100644 (file)
Binary files a/models/player/nyx.iqm and b/models/player/nyx.iqm differ
diff --git a/models/player/nyx.iqm_0.sounds b/models/player/nyx.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0
index da5cbe7..f6bcb01 100644 (file)
Binary files a/models/player/nyx.iqm_0.tga and b/models/player/nyx.iqm_0.tga differ
index c4e7539..ef2ef05 100644 (file)
Binary files a/models/player/pyria.iqm and b/models/player/pyria.iqm differ
index 691c58f..3953ebc 100644 (file)
@@ -3,14 +3,14 @@
 attack sound/player/pyria-skadi/coms/attack 2
 //attacking sound/player/carni-lycan/player/attacking 0
 attackinfive sound/player/pyria-skadi/coms/attackinfive 0
-//coverme sound/player/pyria-skadi/coms/coverme 0
-//defend sound/player/pyria-skadi/coms/defend 0
+coverme sound/player/pyria-skadi/coms/coverme 0
+defend sound/player/pyria-skadi/coms/defend 0
 //defending sound/player/carni-lycan/player/defending 0
 //droppedflag sound/player/carni-lycan/player/droppedflag 0
 //flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
 freelance sound/player/pyria-skadi/coms/freelance 2
 //getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/pyria-skadi/coms/incoming 0
+incoming sound/player/pyria-skadi/coms/incoming 0
 meet sound/player/pyria-skadi/coms/meet 0
 needhelp sound/player/pyria-skadi/coms/needhelp 2
 //negative sound/player/carni-lycan/player/negative 0
@@ -22,7 +22,7 @@ taunt sound/player/pyria-skadi/coms/taunt 5
 teamshoot sound/player/pyria-skadi/coms/teamshoot 4
 death sound/player/pyria-skadi/player/death 3
 drown sound/player/pyria-skadi/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
+fall sound/player/pyria-skadi/player/fall 0
 falling sound/player/pyria-skadi/player/falling 0
 gasp sound/player/pyria-skadi/player/gasp 0
 jump sound/player/pyria-skadi/player/jump 0
index b155a57..730ade3 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ
diff --git a/models/player/pyria_lod1.iqm b/models/player/pyria_lod1.iqm
deleted file mode 100644 (file)
index 5364a05..0000000
Binary files a/models/player/pyria_lod1.iqm and /dev/null differ
diff --git a/models/player/pyria_lod2.iqm b/models/player/pyria_lod2.iqm
deleted file mode 100644 (file)
index 3179c71..0000000
Binary files a/models/player/pyria_lod2.iqm and /dev/null differ
index 716bcc0..7e6dbc2 100644 (file)
Binary files a/models/player/seraphina.iqm and b/models/player/seraphina.iqm differ
diff --git a/models/player/seraphina.iqm_0.sounds b/models/player/seraphina.iqm_0.sounds
new file mode 100644 (file)
index 0000000..3953ebc
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/pyria-skadi/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0
+coverme sound/player/pyria-skadi/coms/coverme 0
+defend sound/player/pyria-skadi/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
+freelance sound/player/pyria-skadi/coms/freelance 2
+//getflag sound/player/carni-lycan/player/getflag 0
+incoming sound/player/pyria-skadi/coms/incoming 0
+meet sound/player/pyria-skadi/coms/meet 0
+needhelp sound/player/pyria-skadi/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/pyria-skadi/coms/seenflag 0
+taunt sound/player/pyria-skadi/coms/taunt 5
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4
+death sound/player/pyria-skadi/player/death 3
+drown sound/player/pyria-skadi/player/drown 0
+fall sound/player/pyria-skadi/player/fall 0
+falling sound/player/pyria-skadi/player/falling 0
+gasp sound/player/pyria-skadi/player/gasp 0
+jump sound/player/pyria-skadi/player/jump 0
+pain25 sound/player/pyria-skadi/player/pain25 0
+pain50 sound/player/pyria-skadi/player/pain50 0
+pain75 sound/player/pyria-skadi/player/pain75 0
+pain100 sound/player/pyria-skadi/player/pain100 0
index 299f5a3..4a0215b 100644 (file)
Binary files a/models/player/seraphina.iqm_0.tga and b/models/player/seraphina.iqm_0.tga differ
diff --git a/models/player/seraphina_lod1.iqm b/models/player/seraphina_lod1.iqm
new file mode 100644 (file)
index 0000000..d16f225
Binary files /dev/null and b/models/player/seraphina_lod1.iqm differ
diff --git a/models/player/seraphina_lod1.iqm.framegroups b/models/player/seraphina_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/seraphina_lod2.iqm b/models/player/seraphina_lod2.iqm
new file mode 100644 (file)
index 0000000..f6ca53a
Binary files /dev/null and b/models/player/seraphina_lod2.iqm differ
diff --git a/models/player/seraphina_lod2.iqm.framegroups b/models/player/seraphina_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
index 98f29be..f65dce6 100644 (file)
Binary files a/models/player/seraphinamasked.iqm and b/models/player/seraphinamasked.iqm differ
diff --git a/models/player/seraphinamasked.iqm_0.sounds b/models/player/seraphinamasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0
index e5a61db..7a2dc98 100644 (file)
Binary files a/models/player/seraphinamasked.iqm_0.tga and b/models/player/seraphinamasked.iqm_0.tga differ
diff --git a/models/player/seraphinamasked_lod1.iqm b/models/player/seraphinamasked_lod1.iqm
new file mode 100644 (file)
index 0000000..5a99524
Binary files /dev/null and b/models/player/seraphinamasked_lod1.iqm differ
diff --git a/models/player/seraphinamasked_lod1.iqm.framegroups b/models/player/seraphinamasked_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/seraphinamasked_lod2.iqm b/models/player/seraphinamasked_lod2.iqm
new file mode 100644 (file)
index 0000000..927d56c
Binary files /dev/null and b/models/player/seraphinamasked_lod2.iqm differ
diff --git a/models/player/seraphinamasked_lod2.iqm.framegroups b/models/player/seraphinamasked_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
index 2b53ad2..f43ad67 100644 (file)
Binary files a/models/player/umbra.iqm and b/models/player/umbra.iqm differ
diff --git a/models/player/umbra.iqm_0.sounds b/models/player/umbra.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0
index d3b3cc4..4fb0941 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ
index 1df904f..5594558 100644 (file)
Binary files a/models/weapons/g_nex.md3 and b/models/weapons/g_nex.md3 differ
index 2d4e970..c7da48e 100644 (file)
Binary files a/models/weapons/h_campingrifle.iqm and b/models/weapons/h_campingrifle.iqm differ
index ef0c7e2..8ae8898 100644 (file)
Binary files a/models/weapons/h_electro.iqm and b/models/weapons/h_electro.iqm differ
index 22642ef..8b52897 100644 (file)
Binary files a/models/weapons/h_nex.iqm and b/models/weapons/h_nex.iqm differ
index 9144fa0..1d45edb 100644 (file)
Binary files a/models/weapons/v_nex.md3 and b/models/weapons/v_nex.md3 differ
index b34e843..de5aad9 100644 (file)
@@ -183,6 +183,7 @@ void CSQC_Init(void)
        minimapname = strzone(minimapname);
 
        WarpZone_Init();
+       hud_configure_prev = -1;
 }
 
 // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
@@ -212,9 +213,9 @@ void CSQC_Shutdown(void)
        if not(isdemo())
        {
                if not(calledhooks & HOOK_START)
-                       localcmd("\n_cl_hook_gamestart nop;");
+                       localcmd("\n_cl_hook_gamestart nop\n");
                if not(calledhooks & HOOK_END)
-                       localcmd("\ncl_hook_gameend;");
+                       localcmd("\ncl_hook_gameend\n");
        }
 }
 
@@ -964,7 +965,7 @@ void Gamemode_Init()
 
        if not(isdemo())
        {
-               localcmd("\n_cl_hook_gamestart ", GametypeNameFromType(gametype), ";");
+               localcmd("\n_cl_hook_gamestart ", GametypeNameFromType(gametype), "\n");
                calledhooks |= HOOK_START;
        }
 }
@@ -1223,13 +1224,13 @@ void Net_ReadPingPLReport()
 
 void Net_VoteDialog(float highlight) {
        if(highlight) {
-               vote_highlighted = ReadShort();
+               vote_highlighted = ReadByte();
                return;
        }
 
-       vote_yescount = ReadShort();
-       vote_nocount = ReadShort();
-       vote_needed = ReadShort();
+       vote_yescount = ReadByte();
+       vote_nocount = ReadByte();
+       vote_needed = ReadByte();
        vote_active = 1;
 }
 
@@ -1251,6 +1252,18 @@ void Net_Notify() {
        }
 }
 
+void Net_WeaponComplain() {
+       complain_weapon = ReadByte();
+
+       if(complain_weapon_name)
+               strunzone(complain_weapon_name);
+       complain_weapon_name = strzone(ReadString());
+
+       complain_weapon_type = ReadByte();
+
+       complain_weapon_time = time;
+}
+
 // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
 // You must ALWAYS first acquire the temporary ID, which is sent as a byte.
 // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
@@ -1321,6 +1334,10 @@ float CSQC_Parse_TempEntity()
                        Net_Notify();
                        bHandled = true;
                        break;
+               case TE_CSQC_WEAPONCOMPLAIN:
+                       Net_WeaponComplain();
+                       bHandled = true;
+                       break;
                default:
                        // No special logic for this temporary entity; return 0 so the engine can handle it
                        bHandled = false;
index 1056fd5..8c64241 100644 (file)
@@ -341,6 +341,7 @@ void CSQC_Demo_Camera();
 float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
+float reticle_type;
 string NextFrameCommand;
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
@@ -354,6 +355,8 @@ void CSQC_UpdateView(float w, float h)
        float f, i, j;
        vector v, vo;
 
+       vector reticle_pos, reticle_size;
+
        WaypointSprite_Load();
 
        if(spectatee_status)
@@ -372,7 +375,7 @@ void CSQC_UpdateView(float w, float h)
        input_angles = warpzone_fixview_cl_viewangles;
        view_angles = warpzone_fixview_angles;
 
-       if(cvar("cl_lockview") || hud_configure)
+       if(cvar("cl_lockview") || autocvar__hud_configure)
        {
                pmove_org = freeze_pmove_org;
                input_angles = view_angles = freeze_input_angles;
@@ -432,7 +435,7 @@ void CSQC_UpdateView(float w, float h)
        if(intermission && !isdemo() && !(calledhooks & HOOK_END))
                if(calledhooks & HOOK_START)
                {
-                       localcmd("\ncl_hook_gameend;");
+                       localcmd("\ncl_hook_gameend\n");
                        calledhooks |= HOOK_END;
                }
 
@@ -474,6 +477,13 @@ void CSQC_UpdateView(float w, float h)
        if(last_weapon != activeweapon) {
                weapontime = time;
                last_weapon = activeweapon;
+
+               entity e;
+               e = get_weaponinfo(activeweapon);
+               if(e.netname != "")
+                       localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n");
+               else
+                       localcmd("\ncl_hook_activeweapon none\n");
        }
 
        // ALWAYS Clear Current Scene First
@@ -549,6 +559,45 @@ void CSQC_UpdateView(float w, float h)
        // next R_RenderScene call
        drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
+       // Draw the aiming reticle for weapons that use it
+       // reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
+       // It must be a persisted float for fading out to work properly (you let go of the zoom button for
+       // the view to go back to normal, so reticle_type would become 0 as we fade out)
+       if(spectatee_status || getstati(STAT_HEALTH) <= 0)
+               reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
+       else if(button_zoom)
+               reticle_type = 1; // normal zoom
+       else if(activeweapon == WEP_NEX && button_attack2)
+               reticle_type = 2; // nex zoom
+
+       if(cvar("cl_reticle_stretch"))
+       {
+               reticle_size_x = vid_conwidth;
+               reticle_size_y = vid_conheight;
+               reticle_pos_x = 0;
+               reticle_pos_y = 0;
+       }
+       else
+       {
+               reticle_size_x = max(vid_conwidth, vid_conheight);
+               reticle_size_y = max(vid_conwidth, vid_conheight);
+               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
+               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       }
+
+       if(cvar("cl_reticle_item_normal"))
+       {
+               precache_pic("gfx/reticle_normal");
+               if(reticle_type == 1 && current_zoomfraction)
+                       drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
+       }
+       if(cvar("cl_reticle_item_nex"))
+       {
+               precache_pic("gfx/reticle_nex");
+               if(reticle_type == 2 && current_zoomfraction)
+                       drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
+       }
+
        // Draw the mouse cursor
        // NOTE: drawpic must happen after R_RenderScene for some reason
        //drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);
@@ -830,7 +879,7 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("vid_conheight", h0);
        }
 
-       if(hud_configure)
+       if(autocvar__hud_configure)
                HUD_Panel_Mouse();
        // be safe against triggerbots until everyone has the fixed engine
        // this call is meant to overwrite the trace globals by something
index 83cdc12..640a8e2 100644 (file)
@@ -5,3 +5,227 @@ var float autocvar_cl_gibs_sloppy = 1;
 
 var float autocvar_cl_casings_ticrate = 0.1;
 var float autocvar_cl_casings_sloppy = 1;
+
+var float autocvar_cl_gentle;
+var float autocvar_cl_gentle_gibs;
+var float autocvar_cl_gentle_messages;
+
+var float autocvar__menu_alpha;
+
+var float autocvar__hud_configure;
+var float autocvar_hud_configure_teamcolorforced;
+var float autocvar_hud_configure_checkcollisions;
+var float autocvar_hud_configure_bg_minalpha;
+var float autocvar_hud_configure_grid;
+var float autocvar_hud_configure_grid_xsize;
+var float autocvar_hud_configure_grid_ysize;
+var float autocvar_hud_configure_grid_alpha;
+
+var string autocvar__hud_panelorder;
+
+var string autocvar_hud_skin;
+var string autocvar_hud_dock;
+var string autocvar_hud_dock_color;
+var float autocvar_hud_dock_color_team;
+var float autocvar_hud_dock_alpha;
+
+var float autocvar_hud_progressbar_alpha;
+var vector autocvar_hud_progressbar_strength_color;
+var vector autocvar_hud_progressbar_shield_color;
+var vector autocvar_hud_progressbar_health_color;
+var vector autocvar_hud_progressbar_armor_color;
+var vector autocvar_hud_progressbar_fuel_color;
+var vector autocvar_hud_progressbar_nexball_color;
+
+var string autocvar_hud_bg;
+var vector autocvar_hud_bg_color;
+var float autocvar_hud_bg_color_team;
+var float autocvar_hud_bg_alpha;
+var float autocvar_hud_bg_border;
+var float autocvar_hud_bg_padding;
+var float autocvar_hud_fg_alpha;
+
+var float autocvar_hud_weaponicons;
+var vector autocvar_hud_weaponicons_pos;
+var vector autocvar_hud_weaponicons_size;
+var string autocvar_hud_weaponicons_bg;
+var string autocvar_hud_weaponicons_bg_color;
+var string autocvar_hud_weaponicons_bg_color_team;
+var string autocvar_hud_weaponicons_bg_alpha;
+var string autocvar_hud_weaponicons_bg_border;
+var string autocvar_hud_weaponicons_bg_padding;
+var float autocvar_hud_weaponicons_aspect;
+var float autocvar_hud_weaponicons_accuracy;
+var float autocvar_hud_weaponicons_accuracy_yellow;
+var float autocvar_hud_weaponicons_ammo;
+var vector autocvar_hud_weaponicons_ammo_color;
+var float autocvar_hud_weaponicons_ammo_alpha;
+var float autocvar_hud_weaponicons_ammo_full_shells;
+var float autocvar_hud_weaponicons_ammo_full_nails;
+var float autocvar_hud_weaponicons_ammo_full_rockets;
+var float autocvar_hud_weaponicons_ammo_full_cells;
+var float autocvar_hud_weaponicons_ammo_full_fuel;
+var float autocvar_hud_weaponicons_number;
+var float autocvar_hud_weaponicons_complainbubble;
+var float autocvar_hud_weaponicons_complainbubble_padding;
+var float autocvar_hud_weaponicons_complainbubble_time;
+var float autocvar_hud_weaponicons_complainbubble_fadetime;
+var vector autocvar_hud_weaponicons_complainbubble_color_outofammo;
+var vector autocvar_hud_weaponicons_complainbubble_color_donthave;
+var vector autocvar_hud_weaponicons_complainbubble_color_unavailable;
+
+var float autocvar_hud_inventory;
+var vector autocvar_hud_inventory_pos;
+var vector autocvar_hud_inventory_size;
+var string autocvar_hud_inventory_bg;
+var string autocvar_hud_inventory_bg_color;
+var string autocvar_hud_inventory_bg_color_team;
+var string autocvar_hud_inventory_bg_alpha;
+var string autocvar_hud_inventory_bg_border;
+var string autocvar_hud_inventory_bg_padding;
+var float autocvar_hud_inventory_onlycurrent;
+var float autocvar_hud_inventory_iconalign;
+
+var float autocvar_hud_powerups;
+var vector autocvar_hud_powerups_pos;
+var vector autocvar_hud_powerups_size;
+var string autocvar_hud_powerups_bg;
+var string autocvar_hud_powerups_bg_color;
+var string autocvar_hud_powerups_bg_color_team;
+var string autocvar_hud_powerups_bg_alpha;
+var string autocvar_hud_powerups_bg_border;
+var string autocvar_hud_powerups_bg_padding;
+var float autocvar_hud_powerups_flip;
+var float autocvar_hud_powerups_iconalign;
+var float autocvar_hud_powerups_baralign;
+
+var float autocvar_hud_healtharmor;
+var vector autocvar_hud_healtharmor_pos;
+var vector autocvar_hud_healtharmor_size;
+var string autocvar_hud_healtharmor_bg;
+var string autocvar_hud_healtharmor_bg_color;
+var string autocvar_hud_healtharmor_bg_color_team;
+var string autocvar_hud_healtharmor_bg_alpha;
+var string autocvar_hud_healtharmor_bg_border;
+var string autocvar_hud_healtharmor_bg_padding;
+var float autocvar_hud_healtharmor_flip;
+var float autocvar_hud_healtharmor_iconalign;
+var float autocvar_hud_healtharmor_baralign;
+
+var float autocvar_hud_notify;
+var vector autocvar_hud_notify_pos;
+var vector autocvar_hud_notify_size;
+var string autocvar_hud_notify_bg;
+var string autocvar_hud_notify_bg_color;
+var string autocvar_hud_notify_bg_color_team;
+var string autocvar_hud_notify_bg_alpha;
+var string autocvar_hud_notify_bg_border;
+var string autocvar_hud_notify_bg_padding;
+var float autocvar_hud_notify_print;
+var float autocvar_hud_notify_time;
+var float autocvar_hud_notify_fadetime;
+var float autocvar_hud_notify_flip;
+
+var float autocvar_hud_timer;
+var vector autocvar_hud_timer_pos;
+var vector autocvar_hud_timer_size;
+var string autocvar_hud_timer_bg;
+var string autocvar_hud_timer_bg_color;
+var string autocvar_hud_timer_bg_color_team;
+var string autocvar_hud_timer_bg_alpha;
+var string autocvar_hud_timer_bg_border;
+var string autocvar_hud_timer_bg_padding;
+var float autocvar_hud_timer_increment;
+
+var float autocvar_hud_radar;
+var vector autocvar_hud_radar_pos;
+var vector autocvar_hud_radar_size;
+var string autocvar_hud_radar_bg;
+var string autocvar_hud_radar_bg_color;
+var string autocvar_hud_radar_bg_color_team;
+var string autocvar_hud_radar_bg_alpha;
+var string autocvar_hud_radar_bg_border;
+var string autocvar_hud_radar_bg_padding;
+
+var float autocvar_hud_score;
+var vector autocvar_hud_score_pos;
+var vector autocvar_hud_score_size;
+var string autocvar_hud_score_bg;
+var string autocvar_hud_score_bg_color;
+var string autocvar_hud_score_bg_color_team;
+var string autocvar_hud_score_bg_alpha;
+var string autocvar_hud_score_bg_border;
+var string autocvar_hud_score_bg_padding;
+
+var float autocvar_hud_racetimer;
+var vector autocvar_hud_racetimer_pos;
+var vector autocvar_hud_racetimer_size;
+var string autocvar_hud_racetimer_bg;
+var string autocvar_hud_racetimer_bg_color;
+var string autocvar_hud_racetimer_bg_color_team;
+var string autocvar_hud_racetimer_bg_alpha;
+var string autocvar_hud_racetimer_bg_border;
+var string autocvar_hud_racetimer_bg_padding;
+
+var float autocvar_hud_vote;
+var vector autocvar_hud_vote_pos;
+var vector autocvar_hud_vote_size;
+var string autocvar_hud_vote_bg;
+var string autocvar_hud_vote_bg_color;
+var string autocvar_hud_vote_bg_color_team;
+var string autocvar_hud_vote_bg_alpha;
+var string autocvar_hud_vote_bg_border;
+var string autocvar_hud_vote_bg_padding;
+var float autocvar_hud_vote_alreadyvoted_alpha;
+
+var float autocvar_hud_modicons;
+var vector autocvar_hud_modicons_pos;
+var vector autocvar_hud_modicons_size;
+var string autocvar_hud_modicons_bg;
+var string autocvar_hud_modicons_bg_color;
+var string autocvar_hud_modicons_bg_color_team;
+var string autocvar_hud_modicons_bg_alpha;
+var string autocvar_hud_modicons_bg_border;
+var string autocvar_hud_modicons_bg_padding;
+
+var float autocvar_hud_pressedkeys;
+var vector autocvar_hud_pressedkeys_pos;
+var vector autocvar_hud_pressedkeys_size;
+var string autocvar_hud_pressedkeys_bg;
+var string autocvar_hud_pressedkeys_bg_color;
+var string autocvar_hud_pressedkeys_bg_color_team;
+var string autocvar_hud_pressedkeys_bg_alpha;
+var string autocvar_hud_pressedkeys_bg_border;
+var string autocvar_hud_pressedkeys_bg_padding;
+var float autocvar_hud_pressedkeys_aspect;
+
+var float autocvar_hud_chat;
+var vector autocvar_hud_chat_pos;
+var vector autocvar_hud_chat_size;
+var string autocvar_hud_chat_bg;
+var string autocvar_hud_chat_bg_color;
+var string autocvar_hud_chat_bg_color_team;
+var string autocvar_hud_chat_bg_alpha;
+var string autocvar_hud_chat_bg_border;
+var string autocvar_hud_chat_bg_padding;
+
+var float autocvar_hud_engineinfo;
+var vector autocvar_hud_engineinfo_pos;
+var vector autocvar_hud_engineinfo_size;
+var string autocvar_hud_engineinfo_bg;
+var string autocvar_hud_engineinfo_bg_color;
+var string autocvar_hud_engineinfo_bg_color_team;
+var string autocvar_hud_engineinfo_bg_alpha;
+var string autocvar_hud_engineinfo_bg_border;
+var string autocvar_hud_engineinfo_bg_padding;
+
+var float autocvar_hud_infomessages;
+var vector autocvar_hud_infomessages_pos;
+var vector autocvar_hud_infomessages_size;
+var string autocvar_hud_infomessages_bg;
+var string autocvar_hud_infomessages_bg_color;
+var string autocvar_hud_infomessages_bg_color_team;
+var string autocvar_hud_infomessages_bg_alpha;
+var string autocvar_hud_infomessages_bg_border;
+var string autocvar_hud_infomessages_bg_padding;
+var float autocvar_hud_infomessages_flip;
index a92567e..f395fb6 100644 (file)
@@ -151,16 +151,16 @@ void Ent_GibSplash(float isNew)
        org_z = ReadShort() * 4 + 2;
        vel = decompressShortVector(ReadShort());
 
-       if(cvar("cl_gentle"))
+       if(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
                type |= 0x80; // set gentle bit
 
        if(type & 0x80)
        {
-               if(cvar("cl_gentle") == 2)
+               if(cvar("cl_gentle_gibs") == 2)
                        gentle_prefix = "";
-               else if(cvar("cl_gentle") == 3) 
+               else if(cvar("cl_gentle_gibs") == 3) 
                        gentle_prefix = "happy_";
-               else if(cvar("cl_gentle"))
+               else
                        gentle_prefix = "morphed_";
        }
        else if(cvar("cl_particlegibs"))
@@ -169,7 +169,7 @@ void Ent_GibSplash(float isNew)
                gentle_prefix = "particlegibs_";
        }
 
-       if not(cvar("cl_gentle"))
+       if not(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
                amount *= 1 - cvar("cl_nogibs");
 
        if(cvar("ekg"))
index 9dfae2c..96d5a33 100644 (file)
@@ -82,170 +82,6 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
        }
 }
 
-// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
-void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
-       vector imgsize;
-       imgsize = drawgetimagesize(pic);
-       float imgaspect;
-       imgaspect = imgsize_x/imgsize_y;
-
-       vector oldsz;
-       oldsz = sz;
-       float aspect;
-       aspect = sz_x/sz_y;
-
-       if(aspect > imgaspect) {
-               sz_x = sz_y * imgaspect;
-               drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);
-       } else {
-               sz_y = sz_x / imgaspect; 
-               drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);
-       }
-}
-
-// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
-void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
-       drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag);
-}
-
-// TODO: aspect!
-void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-       drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
-}
-
-void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-       drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
-}
-
-// return HUD background color
-vector HUD_GetBgColor()
-{
-       vector color;
-       if (teamplay)
-               GetTeamRGB(myteam) * hud_color_bg_team;
-       else {
-               // allow custom HUD colors in non-teamgames
-               color_x = cvar("hud_color_bg_r");
-               color_y = cvar("hud_color_bg_g");
-               color_z = cvar("hud_color_bg_b");
-       }
-       return color;
-}
-
-// return accuracy text color
-vector HUD_AccuracyColor(float accuracy)
-{
-       vector rgb;
-       float yellow_accuracy = cvar("hud_weaponicons_accuracy_yellow"); // value at which this function returns yellow
-       if(accuracy >= 100) {
-               rgb_x = 0;
-               rgb_y = 1;
-       }
-       else if(accuracy > yellow_accuracy) {
-               rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0
-               rgb_y = 1;
-       }
-       else {
-               rgb_x = 1;
-               rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1
-       }
-       rgb_z = 0;
-       return rgb;
-}
-
-// draw number in the XSCALE font
-void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
-{
-       float l, i;
-       string str, tmp, l_length;
-       float minus, plus;
-       vector vsize, num_color;
-
-       vsize_x = vsize_y = lettersize;
-       vsize_z = 0;
-
-       // showsign 1: always prefix with minus sign (useful in race distribution display)
-       // showsign 2: always prefix with plus sign (useful in race distribution display)
-       // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-       if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
-       {
-               plus = true;
-               pos_x -= lettersize;
-       } else
-               plus = false;
-
-       if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
-       {
-               minus = true;
-               num = -num;
-               pos_x -= lettersize;
-       } else
-               minus = false;
-
-       if(digits < 0)
-       {
-               tmp = ftos(num);
-               digits = -digits;
-               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
-       } else
-               str = ftos(num);
-
-       l = strlen(str);
-       l_length = ftos(l);
-
-       if(l > digits)
-       {
-               str = substring(str, l-digits, 999);
-               l = strlen(str);
-       } else if(l < digits)
-               pos_x += (digits-l) * lettersize;
-
-       if (highlighted == 1) {
-               vector hl_size;
-               hl_size_x = vsize_x * l + vsize_x * 0.2;
-               hl_size_y = vsize_y * 1.1;
-               hl_size_z = 0;
-               if(minus)
-                       hl_size_x = hl_size_x + vsize_x;
-
-               vector hl_pos;
-               hl_pos_x = pos_x - lettersize/10;
-               hl_pos_y = pos_y - lettersize/20;
-               hl_pos_z = 0;
-
-               drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags);
-       }
-
-       if (stroke == 1)
-               num_color = '1 1 1';
-       else
-               num_color = rgb;
-
-       if(minus)
-       {
-               if (stroke == 1)
-                       drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags);
-               drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       } else if(plus)
-       {
-               if (stroke == 1)
-                       drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags);
-               drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-
-       for(i = 0; i < l; ++i)
-       {
-               tmp = substring(str, i, 1);
-               if (stroke == 1)
-                       drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-               drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-}
-
 vector HUD_Get_Num_Color (float x, float maxvalue)
 {
        vector color;
@@ -281,13 +117,6 @@ vector HUD_Get_Num_Color (float x, float maxvalue)
        }
        return color;
 }
-// color the number differently based on how big it is (used in the health/armor panel)
-void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha)
-{
-       vector color;
-       color = HUD_Get_Num_Color (x, 200);
-       HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
 
 float stringwidth_colors(string s, vector theSize)
 {
@@ -469,7 +298,6 @@ void HUD_DrawCenterPrint (void)
                ts = centerprint_messages[i];
                if (ts != "")
                {
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
                        drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
                        //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
                        pos_y = pos_y + centerprint_fontsize_y;
@@ -589,7 +417,7 @@ HUD panels
 void HUD_Panel_ExportCfg(string cfgname)
 {
        float fh;
-       fh = fopen(strcat("hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg"), FILE_WRITE);
+       fh = fopen(strcat("hud_", autocvar_hud_skin, "_", cfgname, ".cfg"), FILE_WRITE);
        if(fh >= 0)
        {
                fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n"));
@@ -605,10 +433,10 @@ void HUD_Panel_ExportCfg(string cfgname)
                fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));
                fputs(fh, strcat("seta hud_dock_color \"", cvar_string("hud_dock_color"), "\"", "\n"));
                fputs(fh, strcat("seta hud_dock_color_team \"", cvar_string("hud_dock_color_team"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_dock_alpha \"", ftos(cvar("hud_dock_alpha")), "\"", "\n"));
+               fputs(fh, strcat("seta hud_dock_alpha \"", cvar_string("hud_dock_alpha"), "\"", "\n"));
                fputs(fh, "\n");
 
-               fputs(fh, strcat("seta hud_progressbar_alpha ", ftos(cvar("hud_progressbar_alpha")), "\n"));
+               fputs(fh, strcat("seta hud_progressbar_alpha \"", cvar_string("hud_progressbar_alpha"), "\"", "\n"));
                fputs(fh, strcat("seta hud_progressbar_strength_color \"", cvar_string("hud_progressbar_strength_color"), "\"", "\n"));
                fputs(fh, strcat("seta hud_progressbar_shield_color \"", cvar_string("hud_progressbar_shield_color"), "\"", "\n"));
                fputs(fh, strcat("seta hud_progressbar_health_color \"", cvar_string("hud_progressbar_health_color"), "\"", "\n"));
@@ -617,296 +445,136 @@ void HUD_Panel_ExportCfg(string cfgname)
                fputs(fh, strcat("seta hud_progressbar_nexball_color \"", cvar_string("hud_progressbar_nexball_color"), "\"", "\n"));
                fputs(fh, "\n");
 
+               fputs(fh, strcat("seta _hud_panelorder \"", cvar_string("_hud_panelorder"), "\"", "\n"));
+               fputs(fh, "\n");
+
                // common cvars for all panels
                float i;
                for (i = 0; i < HUD_PANEL_NUM; ++i)
                {
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), " ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i)))), "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_pos \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_pos")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color_team \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color_team")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")), "\"", "\n"));
-                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_padding \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_padding")), "\"", "\n"));
+                       HUD_Panel_GetName(i)
+
+                       fputs(fh, strcat("seta hud_", panel_name, " ", cvar_string(strcat("hud_", panel_name)), "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_pos \"", cvar_string(strcat("hud_", panel_name, "_pos")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_size \"", cvar_string(strcat("hud_", panel_name, "_size")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg \"", cvar_string(strcat("hud_", panel_name, "_bg")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_color \"", cvar_string(strcat("hud_", panel_name, "_bg_color")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_", panel_name, "_bg_color_team")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_", panel_name, "_bg_alpha")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_border \"", cvar_string(strcat("hud_", panel_name, "_bg_border")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_", panel_name, "_bg_padding")), "\"", "\n"));
                        switch(i) {
-                               case 0:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_accuracy_yellow ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_accuracy_yellow"))), "\n"));
+                               case HUD_PANEL_WEAPONICONS:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble \"", cvar_string(strcat("hud_", panel_name, "_complainbubble")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_padding \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_padding")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_color_outofammo \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_color_outofammo")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_color_donthave \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_color_donthave")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_", panel_name, "_ammo_color")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_", panel_name, "_ammo_alpha")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_aspect \"", cvar_string(strcat("hud_", panel_name, "_ammo_alpha")), "\"", "\n"));
                                        break;
-                               case 1:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_onlycurrent ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_onlycurrent"))), "\n"));
+                               case HUD_PANEL_INVENTORY:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_", panel_name, "_onlycurrent")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n"));
                                        break;
-                               case 2:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n"));
+                               case HUD_PANEL_POWERUPS:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\n"));
                                        break;
-                               case 3:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n"));
+                               case HUD_PANEL_HEALTHARMOR:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_iconalign \"", cvar_string(strcat("hud_", panel_name, "_iconalign")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_baralign \"", cvar_string(strcat("hud_", panel_name, "_baralign")), "\"", "\n"));
                                        break;
-                               case 4:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_info_top ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_info_top"))), "\n"));
+                               case HUD_PANEL_NOTIFY:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_flip \"", cvar_string(strcat("hud_", panel_name, "_flip")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_", panel_name, "_print \"", cvar_string(strcat("hud_", panel_name, "_print")), "\"", "\n"));
                                        break;
-                               case 6:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_foreground_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_foreground_alpha"))), "\n"));
-                               case 9:
-                                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha"))), "\n"));
+                               case HUD_PANEL_RADAR:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_foreground_alpha \"", cvar_string(strcat("hud_", panel_name, "_foreground_alpha")), "\"", "\n"));
+                                       break;
+                               case HUD_PANEL_VOTE:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha \"", cvar_string(strcat("hud_", panel_name, "_alreadyvoted_alpha")), "\"", "\n"));
+                                       break;
+                               case HUD_PANEL_PRESSEDKEYS:
+                                       fputs(fh, strcat("seta hud_", panel_name, "_aspect \"", cvar_string(strcat("hud_", panel_name, "_aspect")), "\"", "\n"));
                                        break;
                        }
                        fputs(fh, "\n");
                }
 
-               print("^2Successfully exported to hud_", cvar_string("hud_skin"), "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n");
+               print("^2Successfully exported to hud_", autocvar_hud_skin, "_", cfgname, ".cfg! (Note: It's saved in data/data/)\n");
        }
        fclose(fh);
 }
 
-// return active status of panel
-float HUD_Panel_CheckActive(float id)
-{
-       if (cvar_or(strcat("hud_", HUD_Panel_GetName(id)), 1))
-               return 1;
-       return 0;
-}
-
-// return size of given panel
-vector HUD_Panel_GetSize(float id)
-{
-       vector mySize;
-       mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
-
-       mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight;
-
-       if(disable_menu_alphacheck == 2 && id == highlightedPanel)
-       {
-               vector menu_enable_maxsize, menu_enable_size;
-               menu_enable_maxsize = '0 0 0'; // shut up FTEQCC
-               menu_enable_maxsize_x = 0.3 * vid_conwidth;
-               menu_enable_maxsize_y = 0.18 * vid_conheight;
-               if(mySize_x > mySize_y)
-               {
-                       if(mySize_y > menu_enable_maxsize_y)
-                       {
-                               menu_enable_size_y = menu_enable_maxsize_y;
-                               menu_enable_size_x = mySize_x * (menu_enable_maxsize_y/mySize_y);
-                               mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
-                       }
-               }
-               else
-               {
-                       if(mySize_x > menu_enable_maxsize_x)
-                       {
-                               menu_enable_size_x = menu_enable_maxsize_x;
-                               menu_enable_size_y = mySize_y * (menu_enable_maxsize_x/mySize_x);
-                               mySize = (1 - cvar("_menu_alpha")) * mySize + (cvar("_menu_alpha")) * menu_enable_size;
-                       }
-               }
-       }
-       return mySize;
-}
-
-// return pos of given panel
-vector HUD_Panel_GetPos(float id)
+const float hlBorderSize = 4;
+const string hlBorder = "gfx/hud/default/border_highlighted";
+const string hlBorder2 = "gfx/hud/default/border_highlighted2";
+void HUD_Panel_HlBorder(float myBorder, vector color, float alpha)
 {
-       vector pos;
-       pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos")));
-
-       pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight;
-
-       if(disable_menu_alphacheck == 2 && id == highlightedPanel)
-       {
-               vector mySize, menu_enable_panelpos;
-               mySize = HUD_Panel_GetSize(id);
-               if(mySize_x > mySize_y)
-                       menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight;
-               else
-                       menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * mySize_y + eX * 0.7 * vid_conwidth;
-               pos = (1 - cvar("_menu_alpha")) * pos + (cvar("_menu_alpha")) * menu_enable_panelpos;
-       }
-       return pos;
+       drawfill(panel_pos - '1 1 0' * myBorder, panel_size + '2 2 0' * myBorder, '0 0.5 1', .5 * alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder, hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
+       drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
 }
 
-float HUD_Panel_GetBorder(float id)
-{
-       string border;
-       border = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_border"));
-       if(border == "")
-               border = cvar_string("hud_bg_border");
-       return stof(border);
-}
+// draw the background/borders
+#define HUD_Panel_DrawBg(alpha)\
+if(panel_bg != "0")\
+       draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * alpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\
+if(highlightedPanel_prev == active_panel && autocvar__hud_configure)\
+       HUD_Panel_HlBorder(panel_bg_border + 1.5 * hlBorderSize, '0 0.5 1', 0.25 * (1 - autocvar__menu_alpha) * alpha);
 
-vector HUD_Panel_GetColor(float id)
+void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
 {
-       float f;
-       vector color_vec;
-       string color;
+       if(!alpha)
+               return;
 
-       // fetch per-panel color
-       if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")));
-       }
-       else
-               color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color"));
-       color_vec = stov(color);
-
-       if(color == "") { // fetch default color
-               color = cvar_string("hud_bg_color");
-               color_vec = stov(color);
-               if(teamplay && cvar(strcat("hud_bg_color_team"))) {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
-                       color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team");
-               }
-               else if(color == "shirt") {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
-                       color_vec = colormapPaletteColor(floor(f / 16), 0);
+       string pic;
+       if(vertical) {
+               pic = strcat(hud_skin_path, "/statusbar_vertical");
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/statusbar_vertical";
                }
-               else if(color == "pants") {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
-                       color_vec = colormapPaletteColor(mod(f, 16), 1);
+               drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0 0', '1 0.25 0', color, alpha, drawflag);
+               if(mySize_y/mySize_x > 2)
+                       drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, pic, '0 0.25 0', '1 0.5 0', color, alpha, drawflag);
+               drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, pic, '0 0.75 0', '1 0.25 0', color, alpha, drawflag);
+       } else {
+               pic = strcat(hud_skin_path, "/statusbar");
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/statusbar";
                }
+               drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag);
+               if(mySize_x/mySize_y > 2)
+                       drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
+               drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
        }
-       else if(color == "shirt") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(floor(f / 16), 0);
-       }
-       else if(color == "pants") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(mod(f, 16), 1);
-       }
-       return color_vec;
-}
-
-vector HUD_Panel_Dock_GetColor(void)
-{
-       float f;
-       vector color_vec;
-       string color;
-       color = cvar_string("hud_dock_color");
-       color_vec = stov(color);
-       if(teamplay && cvar(strcat("hud_dock_color_team"))) {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team");
-       }
-       else if(color == "shirt") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(floor(f / 16), 0);
-       }
-       else if(color == "pants") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
-               color_vec = colormapPaletteColor(mod(f, 16), 1);
-       }
-       return color_vec;
-}
-
-float HUD_Panel_GetBgAlpha(float id)
-{
-       string alpha;
-       alpha = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha"));
-       if(alpha == "")
-               alpha = cvar_string("hud_bg_alpha");
-
-       if(hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == id) // do not set a minalpha cap when showing the config dialog for this panel
-               alpha = ftos((1 - cvar("_menu_alpha")) * max(cvar("hud_configure_bg_minalpha"), stof(alpha)) + (cvar("_menu_alpha")) * stof(alpha));
-       else if(hud_configure)
-               alpha = ftos(max(cvar("hud_configure_bg_minalpha"), stof(alpha)));
-
-       if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
-               return 0.25;
-
-       if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
-               return stof(alpha);
-       else
-               return stof(alpha) * menu_fade_alpha;
-}
-
-float HUD_Panel_GetFgAlpha(float id)
-{
-       float alpha;
-       alpha = hud_fg_alpha;
-
-       if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
-               return 0.25;
-
-       if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
-               return alpha;
-       else
-               return alpha * menu_fade_alpha;
-}
-
-float HUD_Panel_GetPadding(float id)
-{
-       string padding;
-       padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
-       if(padding == "")
-               padding = cvar_string("hud_bg_padding");
-
-       vector mySize;
-       mySize = HUD_Panel_GetSize(id);
-       float smallestsize;
-       smallestsize = min(mySize_x, mySize_y);
-       return min(smallestsize/2 - 5, stof(padding));
 }
 
-// draw the background/borders
-void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha)
+void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float alpha, float drawflag)
 {
-       if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
+       if(!alpha)
                return;
 
-       string bg;
-       bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg"));
-       if(bg == "")
-               bg = cvar_string("hud_bg");
-
-       if(bg == "0" && hud_configure) {
-               bg = "border"; // we probably want to see a background in config mode at all times...
-       }
-
-       if(bg != "0")
-       {
-               float border;
-               border = HUD_Panel_GetBorder(id);
-
-               vector color;
-               color = HUD_Panel_GetColor(id);
-
-               if(alpha)
-                       alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value
-               else
-                       alpha = HUD_Panel_GetBgAlpha(id);
-
-               draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", cvar_string("hud_skin"), "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
-       }
-}
-
-void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
-{
-//float        drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328;
        string pic;
-       pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/");
-       if(vertical) {
-               drawsubpic(pos, eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0 0', '1 0.25 0', color, alpha, drawflag);
-               if(mySize_y/mySize_x > 2)
-                       drawsubpic(pos + eY * mySize_x, eY * (mySize_y - 2 * mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.25 0', '1 0.5 0', color, alpha, drawflag);
-               drawsubpic(pos + eY * mySize_y - eY * min(mySize_y * 0.5, mySize_x), eY * min(mySize_y * 0.5, mySize_x) + eX * mySize_x, strcat(pic, "statusbar_vertical"), '0 0.75 0', '1 0.25 0', color, alpha, drawflag);
-       } else {
-               drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0 0 0', '0.25 1 0', color, alpha, drawflag);
-               if(mySize_x/mySize_y > 2)
-                       drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
-               drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, strcat(pic, "statusbar"), '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
+       pic = strcat(hud_skin_path, "/num_leading");
+       if(precache_pic(pic) == "") {
+               pic = "gfx/hud/default/num_leading";
        }
-}
 
-vector HUD_Panel_GetProgressBarColor(string item)
-{
-       return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
+       drawsubpic(pos, eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0 0 0', '0.25 1 0', color, alpha, drawflag);
+       if(mySize_x/mySize_y > 2)
+               drawsubpic(pos + eX * mySize_y, eX * (mySize_x - 2 * mySize_y) + eY * mySize_y, pic, '0.25 0 0', '0.5 1 0', color, alpha, drawflag);
+       drawsubpic(pos + eX * mySize_x - eX * min(mySize_x * 0.5, mySize_y), eX * min(mySize_x * 0.5, mySize_y) + eY * mySize_y, pic, '0.75 0 0', '0.25 1 0', color, alpha, drawflag);
 }
 
 // check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
-vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
+vector HUD_Panel_CheckMove(vector myPos, vector mySize)
 {
        float i;
 
@@ -921,20 +589,22 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
        targCenter = '0 0 0'; // shut up fteqcc, there IS a reference
 
        for (i = 0; i < HUD_PANEL_NUM; ++i) {
-               if(i == id || !HUD_Panel_CheckActive(i))
+               if(i == highlightedPanel || !panel_enabled)
                        continue;
 
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id);
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id);
+               HUD_Panel_UpdatePosSizeForId(i)
+
+               panel_pos -= '1 1 0' * panel_bg_border;
+               panel_size += '2 2 0' * panel_bg_border;
 
-               if(myPos_y + mySize_y < targPos_y)
+               if(myPos_y + mySize_y < panel_pos_y)
                        continue;
-               if(myPos_y > targPos_y + targSize_y)
+               if(myPos_y > panel_pos_y + panel_size_y)
                        continue;
 
-               if(myPos_x + mySize_x < targPos_x)
+               if(myPos_x + mySize_x < panel_pos_x)
                        continue;
-               if(myPos_x > targPos_x + targSize_x)
+               if(myPos_x > panel_pos_x + panel_size_x)
                        continue;
 
                // OK, there IS a collision.
@@ -942,70 +612,74 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
                myCenter_x = myPos_x + 0.5 * mySize_x;
                myCenter_y = myPos_y + 0.5 * mySize_y;
 
-               targCenter_x = targPos_x + 0.5 * targSize_x;
-               targCenter_y = targPos_y + 0.5 * targSize_y;
+               targCenter_x = panel_pos_x + 0.5 * panel_size_x;
+               targCenter_y = panel_pos_y + 0.5 * panel_size_y;
 
                if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of the target panel)
                {
-                       if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
-                               myTarget_x = targPos_x - mySize_x;
+                       if(myPos_x + mySize_x - panel_pos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side
+                               myTarget_x = panel_pos_x - mySize_x;
                        else // push it upwards
-                               myTarget_y = targPos_y - mySize_y;
+                               myTarget_y = panel_pos_y - mySize_y;
                }
                else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right
                {
-                       if(targPos_x + targSize_x - myPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
-                               myTarget_x = targPos_x + targSize_x;
+                       if(panel_pos_x + panel_size_x - myPos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side
+                               myTarget_x = panel_pos_x + panel_size_x;
                        else // push it upwards
-                               myTarget_y = targPos_y - mySize_y;
+                               myTarget_y = panel_pos_y - mySize_y;
                }
                else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left
                {
-                       if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side
-                               myTarget_x = targPos_x - mySize_x;
+                       if(myPos_x + mySize_x - panel_pos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side
+                               myTarget_x = panel_pos_x - mySize_x;
                        else // push it downwards
-                               myTarget_y = targPos_y + targSize_y;
+                               myTarget_y = panel_pos_y + panel_size_y;
                }
                else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y) // bottom right
                {
-                       if(targPos_x + targSize_x - myPos_x < targPos_y + targSize_y - myPos_y) // push it to the side
-                               myTarget_x = targPos_x + targSize_x;
+                       if(panel_pos_x + panel_size_x - myPos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side
+                               myTarget_x = panel_pos_x + panel_size_x;
                        else // push it downwards
-                               myTarget_y = targPos_y + targSize_y;
+                               myTarget_y = panel_pos_y + panel_size_y;
                }
+               if(cvar("hud_configure_checkcollisions_debug"))
+                       drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL);
        }
 
        return myTarget;
 }
 
-void HUD_Panel_SetPos(float id, vector pos)
+void HUD_Panel_SetPos(vector pos)
 {
-       vector oldPos;
-       oldPos = HUD_Panel_GetPos(id);
-
+       HUD_Panel_UpdatePosSizeForId(highlightedPanel)
        vector mySize;
-       mySize = HUD_Panel_GetSize(id);
+       mySize = panel_size;
+
+       if(cvar("hud_configure_checkcollisions_debug"))
+               drawfill(pos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
+
+       if(autocvar_hud_configure_grid)
+       {
+               pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
+       }
 
        if(hud_configure_checkcollisions)
-               pos = HUD_Panel_CheckMove(id, pos, mySize);
+               pos = HUD_Panel_CheckMove(pos, mySize);
 
        pos_x = bound(0, pos_x, vid_conwidth - mySize_x);
        pos_y = bound(0, pos_y, vid_conheight - mySize_y);
 
-       if(cvar("hud_configure_grid"))
-       {
-               pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
-               pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
-       }
-
        string s;
        s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight));
 
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+       HUD_Panel_GetName(highlightedPanel);
+       cvar_set(strcat("hud_", panel_name, "_pos"), s);
 }
 
 // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
-vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
+vector HUD_Panel_CheckResize(vector mySize, vector resizeorigin) {
        float i;
 
        float targBorder;
@@ -1018,24 +692,26 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
        ratio = mySize_x/mySize_y;
 
        for (i = 0; i < HUD_PANEL_NUM; ++i) {
-               if(i == id || !HUD_Panel_CheckActive(i))
+               if(i == highlightedPanel || !panel_enabled)
                        continue;
 
-               targBorder = HUD_Panel_GetBorder(i);
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * targBorder;
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * targBorder;
-               targEndPos = targPos + targSize;
+               HUD_Panel_UpdatePosSizeForId(i)
+
+               panel_pos -= '1 1 0' * panel_bg_border;
+               panel_size += '2 2 0' * panel_bg_border;
+
+               targEndPos = panel_pos + panel_size;
 
                // resizeorigin is WITHIN target panel, just abort any collision testing against that particular panel to produce expected behaviour!
-               if(resizeorigin_x > targPos_x && resizeorigin_x < targEndPos_x && resizeorigin_y > targPos_y && resizeorigin_y < targEndPos_y)
+               if(resizeorigin_x > panel_pos_x && resizeorigin_x < targEndPos_x && resizeorigin_y > panel_pos_y && resizeorigin_y < targEndPos_y)
                        continue;
 
                if (resizeCorner == 1)
                {
                        // check if this panel is on our way
-                       if (resizeorigin_x <= targPos_x)
+                       if (resizeorigin_x <= panel_pos_x)
                                continue;
-                       if (resizeorigin_y <= targPos_y)
+                       if (resizeorigin_y <= panel_pos_y)
                                continue;
                        if (targEndPos_x <= resizeorigin_x - mySize_x)
                                continue;
@@ -1050,7 +726,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
                        // in this case resizeorigin (bottom-right point) and the bottom-right point of the panel
                        dist_x = resizeorigin_x - targEndPos_x;
                        dist_y = resizeorigin_y - targEndPos_y;
-                       if (dist_y < 0 || dist_x / dist_y > ratio)
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
@@ -1059,34 +735,34 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
                {
                        if (resizeorigin_x >= targEndPos_x)
                                continue;
-                       if (resizeorigin_y <= targPos_y)
+                       if (resizeorigin_y <= panel_pos_y)
                                continue;
-                       if (targPos_x >= resizeorigin_x + mySize_x)
+                       if (panel_pos_x >= resizeorigin_x + mySize_x)
                                continue;
                        if (targEndPos_y <= resizeorigin_y - mySize_y)
                                continue;
 
-                       dist_x = targPos_x - resizeorigin_x;
+                       dist_x = panel_pos_x - resizeorigin_x;
                        dist_y = resizeorigin_y - targEndPos_y;
-                       if (dist_y < 0 || dist_x / dist_y > ratio)
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
                }
                else if (resizeCorner == 3)
                {
-                       if (resizeorigin_x <= targPos_x)
+                       if (resizeorigin_x <= panel_pos_x)
                                continue;
                        if (resizeorigin_y >= targEndPos_y)
                                continue;
                        if (targEndPos_x <= resizeorigin_x - mySize_x)
                                continue;
-                       if (targPos_y >= resizeorigin_y + mySize_y)
+                       if (panel_pos_y >= resizeorigin_y + mySize_y)
                                continue;
 
                        dist_x = resizeorigin_x - targEndPos_x;
-                       dist_y = targPos_y - resizeorigin_y;
-                       if (dist_y < 0 || dist_x / dist_y > ratio)
+                       dist_y = panel_pos_y - resizeorigin_y;
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
@@ -1097,27 +773,28 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
                                continue;
                        if (resizeorigin_y >= targEndPos_y)
                                continue;
-                       if (targPos_x >= resizeorigin_x + mySize_x)
+                       if (panel_pos_x >= resizeorigin_x + mySize_x)
                                continue;
-                       if (targPos_y >= resizeorigin_y + mySize_y)
+                       if (panel_pos_y >= resizeorigin_y + mySize_y)
                                continue;
 
-                       dist_x = targPos_x - resizeorigin_x;
-                       dist_y = targPos_y - resizeorigin_y;
-                       if (dist_y < 0 || dist_x / dist_y > ratio)
+                       dist_x = panel_pos_x - resizeorigin_x;
+                       dist_y = panel_pos_y - resizeorigin_y;
+                       if (dist_y <= 0 || dist_x / dist_y > ratio)
                                mySize_x = min(mySize_x, dist_x);
                        else
                                mySize_y = min(mySize_y, dist_y);
                }
                if(cvar("hud_configure_checkcollisions_debug"))
-                       drawfill(targPos + '1 1 0' * targBorder, targSize - '2 2 0' * targBorder, '1 1 0', .3, DRAWFLAG_NORMAL);
+                       drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL);
        }
 
        return mySize;
 }
 
-void HUD_Panel_SetPosSize(float id, vector mySize)
+void HUD_Panel_SetPosSize(vector mySize)
 {
+       HUD_Panel_UpdatePosSizeForId(highlightedPanel)
        vector resizeorigin;
        resizeorigin = panel_click_resizeorigin;
        vector myPos;
@@ -1126,10 +803,10 @@ void HUD_Panel_SetPosSize(float id, vector mySize)
        mySize_x = max(0.025 * vid_conwidth, mySize_x);
        mySize_y = max(0.025 * vid_conheight, mySize_y);
 
-       if(id == 12) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
+       if(highlightedPanel == HUD_PANEL_CHAT) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
        {
                mySize_x = max(17 * cvar("con_chatsize"), mySize_x);
-               mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y);
+               mySize_y = max(2 * cvar("con_chatsize") + 2 * panel_bg_padding, mySize_y);
        }
 
        // collision testing|
@@ -1166,14 +843,14 @@ void HUD_Panel_SetPosSize(float id, vector mySize)
                drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
 
        // before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
-       if(cvar("hud_configure_grid"))
+       if(autocvar_hud_configure_grid)
        {
-               mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
-               mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
+               mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_xsize, 0.2) * vid_conwidth;
+               mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_ysize, 0.2) * vid_conheight;
        }
 
        if(hud_configure_checkcollisions)
-               mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin);
+               mySize = HUD_Panel_CheckResize(mySize, resizeorigin);
 
        // minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then)
        mySize_x = max(0.025 * vid_conwidth, mySize_x);
@@ -1197,34 +874,64 @@ void HUD_Panel_SetPosSize(float id, vector mySize)
        if(cvar("hud_configure_checkcollisions_debug"))
                drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL);
 
+       HUD_Panel_GetName(highlightedPanel);
        string s;
        s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight));
-       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s);
+       cvar_set(strcat("hud_", panel_name, "_size"), s);
 
        s = strcat(ftos(