Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 17 Jul 2010 15:02:52 +0000 (18:02 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 17 Jul 2010 15:02:52 +0000 (18:02 +0300)
285 files changed:
_hud_descriptions.cfg [new file with mode: 0644]
defaultXonotic.cfg
gfx/hud/default/flag_blue_captured.tga [deleted file]
gfx/hud/default/flag_blue_returned.tga [deleted file]
gfx/hud/default/flag_red_captured.tga [deleted file]
gfx/hud/default/flag_red_returned.tga [deleted file]
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_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_teamkill.tga [deleted file]
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/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_bullets.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_cells.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_current_bg.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_fuel.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_rockets.tga [new file with mode: 0644]
gfx/hud/luminos/ammo_shells.tga [new file with mode: 0644]
gfx/hud/luminos/armor.tga [new file with mode: 0644]
gfx/hud/luminos/border_highlighted.tga [new file with mode: 0644]
gfx/hud/luminos/border_highlighted2.tga [new file with mode: 0644]
gfx/hud/luminos/border_horizontal.tga [new file with mode: 0644]
gfx/hud/luminos/border_vertical.tga [new file with mode: 0644]
gfx/hud/luminos/dock.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_lost.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/flag_blue_taken.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_lost.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/flag_red_taken.tga [new file with mode: 0644]
gfx/hud/luminos/health.tga [new file with mode: 0644]
gfx/hud/luminos/key_backward.tga [new file with mode: 0644]
gfx/hud/luminos/key_backward_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_crouch.tga [new file with mode: 0644]
gfx/hud/luminos/key_crouch_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_forward.tga [new file with mode: 0644]
gfx/hud/luminos/key_forward_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_jump.tga [new file with mode: 0644]
gfx/hud/luminos/key_jump_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_left.tga [new file with mode: 0644]
gfx/hud/luminos/key_left_inv.tga [new file with mode: 0644]
gfx/hud/luminos/key_right.tga [new file with mode: 0644]
gfx/hud/luminos/key_right_inv.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_captured.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_lost.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_returned.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/notify_blue_taken.tga [new file with mode: 0644]
gfx/hud/luminos/notify_camping.tga [new file with mode: 0644]
gfx/hud/luminos/notify_death.tga [new file with mode: 0644]
gfx/hud/luminos/notify_fall.tga [new file with mode: 0644]
gfx/hud/luminos/notify_lava.tga [new file with mode: 0644]
gfx/hud/luminos/notify_outofammo.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_captured.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_carrying.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_lost.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_returned.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_shielded.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_taken.tga [new file with mode: 0644]
gfx/hud/luminos/notify_selfkill.tga [new file with mode: 0644]
gfx/hud/luminos/notify_shootingstar.tga [new file with mode: 0644]
gfx/hud/luminos/notify_slime.tga [new file with mode: 0644]
gfx/hud/luminos/notify_teamkill.tga [new file with mode: 0644]
gfx/hud/luminos/notify_teamkill_blue.tga [new file with mode: 0644]
gfx/hud/luminos/notify_teamkill_red.tga [new file with mode: 0644]
gfx/hud/luminos/notify_void.tga [new file with mode: 0644]
gfx/hud/luminos/notify_water.tga [new file with mode: 0644]
gfx/hud/luminos/num_leading.tga [new file with mode: 0644]
gfx/hud/luminos/race_newfail.tga [new file with mode: 0644]
gfx/hud/luminos/race_newrankgreen.tga [new file with mode: 0644]
gfx/hud/luminos/race_newrankyellow.tga [new file with mode: 0644]
gfx/hud/luminos/race_newrecordserver.tga [new file with mode: 0644]
gfx/hud/luminos/race_newtime.tga [new file with mode: 0644]
gfx/hud/luminos/statusbar.tga [new file with mode: 0644]
gfx/hud/luminos/statusbar_vertical.tga [new file with mode: 0644]
gfx/hud/luminos/voteprogress_back.tga [new file with mode: 0644]
gfx/hud/luminos/voteprogress_prog.tga [new file with mode: 0644]
gfx/hud/luminos/voteprogress_voted.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_accuracy.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_ammo.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_current_bg.tga [new file with mode: 0644]
gfx/hud/luminos/weapon_hlacmod_renameit.tga [new file with mode: 0644]
gfx/hud/luminos/weaponcampingrifle.tga [new file with mode: 0644]
gfx/hud/luminos/weaponcrylink.tga [new file with mode: 0644]
gfx/hud/luminos/weaponelectro.tga [new file with mode: 0644]
gfx/hud/luminos/weaponfireball.tga [new file with mode: 0644]
gfx/hud/luminos/weapongrenadelauncher.tga [new file with mode: 0644]
gfx/hud/luminos/weaponhagar.tga [new file with mode: 0644]
gfx/hud/luminos/weaponhlac.tga [new file with mode: 0644]
gfx/hud/luminos/weaponhook.tga [new file with mode: 0644]
gfx/hud/luminos/weaponlaser.tga [new file with mode: 0644]
gfx/hud/luminos/weaponminstanex.tga [new file with mode: 0644]
gfx/hud/luminos/weaponnex.tga [new file with mode: 0644]
gfx/hud/luminos/weaponporto.tga [new file with mode: 0644]
gfx/hud/luminos/weaponrocketlauncher.tga [new file with mode: 0644]
gfx/hud/luminos/weaponseeker.tga [new file with mode: 0644]
gfx/hud/luminos/weaponshotgun.tga [new file with mode: 0644]
gfx/hud/luminos/weapontuba.tga [new file with mode: 0644]
gfx/hud/luminos/weaponuzi.tga [new file with mode: 0644]
gfx/hud/wickedhud/ammo_bullets.tga [deleted file]
gfx/hud/wickedhud/ammo_cells.tga [deleted file]
gfx/hud/wickedhud/ammo_current_bg.tga [deleted file]
gfx/hud/wickedhud/ammo_fuel.tga [deleted file]
gfx/hud/wickedhud/ammo_rockets.tga [deleted file]
gfx/hud/wickedhud/ammo_shells.tga [deleted file]
gfx/hud/wickedhud/armor.tga [deleted file]
gfx/hud/wickedhud/border.tga [deleted file]
gfx/hud/wickedhud/border_chat.tga [deleted file]
gfx/hud/wickedhud/border_healtharmor.tga [deleted file]
gfx/hud/wickedhud/border_inventory.tga [deleted file]
gfx/hud/wickedhud/border_modicons.tga [deleted file]
gfx/hud/wickedhud/border_powerups.tga [deleted file]
gfx/hud/wickedhud/border_radar.tga [deleted file]
gfx/hud/wickedhud/border_score.tga [deleted file]
gfx/hud/wickedhud/border_timer.tga [deleted file]
gfx/hud/wickedhud/border_vote.tga [deleted file]
gfx/hud/wickedhud/border_weaponicons.tga [deleted file]
gfx/hud/wickedhud/dock.tga [deleted file]
gfx/hud/wickedhud/dock_small.tga [deleted file]
gfx/hud/wickedhud/flag_blue_captured.tga [deleted file]
gfx/hud/wickedhud/flag_blue_carrying.tga [deleted file]
gfx/hud/wickedhud/flag_blue_lost.tga [deleted file]
gfx/hud/wickedhud/flag_blue_returned.tga [deleted file]
gfx/hud/wickedhud/flag_blue_shielded.tga [deleted file]
gfx/hud/wickedhud/flag_blue_taken.tga [deleted file]
gfx/hud/wickedhud/flag_red_captured.tga [deleted file]
gfx/hud/wickedhud/flag_red_carrying.tga [deleted file]
gfx/hud/wickedhud/flag_red_lost.tga [deleted file]
gfx/hud/wickedhud/flag_red_returned.tga [deleted file]
gfx/hud/wickedhud/flag_red_shielded.tga [deleted file]
gfx/hud/wickedhud/flag_red_taken.tga [deleted file]
gfx/hud/wickedhud/health.tga [deleted file]
gfx/hud/wickedhud/key_backward.tga [deleted file]
gfx/hud/wickedhud/key_backward_inv.tga [deleted file]
gfx/hud/wickedhud/key_crouch.tga [deleted file]
gfx/hud/wickedhud/key_crouch_inv.tga [deleted file]
gfx/hud/wickedhud/key_forward.tga [deleted file]
gfx/hud/wickedhud/key_forward_inv.tga [deleted file]
gfx/hud/wickedhud/key_jump.tga [deleted file]
gfx/hud/wickedhud/key_jump_inv.tga [deleted file]
gfx/hud/wickedhud/key_left.tga [deleted file]
gfx/hud/wickedhud/key_left_inv.tga [deleted file]
gfx/hud/wickedhud/key_right.tga [deleted file]
gfx/hud/wickedhud/key_right_inv.tga [deleted file]
gfx/hud/wickedhud/kh_blue.tga [deleted file]
gfx/hud/wickedhud/kh_bluearrow.tga [deleted file]
gfx/hud/wickedhud/kh_pink.tga [deleted file]
gfx/hud/wickedhud/kh_pinkarrow.tga [deleted file]
gfx/hud/wickedhud/kh_red.tga [deleted file]
gfx/hud/wickedhud/kh_redarrow.tga [deleted file]
gfx/hud/wickedhud/kh_yellow.tga [deleted file]
gfx/hud/wickedhud/kh_yellowarrow.tga [deleted file]
gfx/hud/wickedhud/nexball_carrying.tga [deleted file]
gfx/hud/wickedhud/notify_camping.tga [deleted file]
gfx/hud/wickedhud/notify_death.tga [deleted file]
gfx/hud/wickedhud/notify_fall.tga [deleted file]
gfx/hud/wickedhud/notify_lava.tga [deleted file]
gfx/hud/wickedhud/notify_outofammo.tga [deleted file]
gfx/hud/wickedhud/notify_selfkill.tga [deleted file]
gfx/hud/wickedhud/notify_shootingstar.tga [deleted file]
gfx/hud/wickedhud/notify_slime.tga [deleted file]
gfx/hud/wickedhud/notify_teamkill.tga [deleted file]
gfx/hud/wickedhud/notify_void.tga [deleted file]
gfx/hud/wickedhud/notify_water.tga [deleted file]
gfx/hud/wickedhud/num_0.tga [deleted file]
gfx/hud/wickedhud/num_0_stroke.tga [deleted file]
gfx/hud/wickedhud/num_1.tga [deleted file]
gfx/hud/wickedhud/num_1_stroke.tga [deleted file]
gfx/hud/wickedhud/num_2.tga [deleted file]
gfx/hud/wickedhud/num_2_stroke.tga [deleted file]
gfx/hud/wickedhud/num_3.tga [deleted file]
gfx/hud/wickedhud/num_3_stroke.tga [deleted file]
gfx/hud/wickedhud/num_4.tga [deleted file]
gfx/hud/wickedhud/num_4_stroke.tga [deleted file]
gfx/hud/wickedhud/num_5.tga [deleted file]
gfx/hud/wickedhud/num_5_stroke.tga [deleted file]
gfx/hud/wickedhud/num_6.tga [deleted file]
gfx/hud/wickedhud/num_6_stroke.tga [deleted file]
gfx/hud/wickedhud/num_7.tga [deleted file]
gfx/hud/wickedhud/num_7_stroke.tga [deleted file]
gfx/hud/wickedhud/num_8.tga [deleted file]
gfx/hud/wickedhud/num_8_stroke.tga [deleted file]
gfx/hud/wickedhud/num_9.tga [deleted file]
gfx/hud/wickedhud/num_9_stroke.tga [deleted file]
gfx/hud/wickedhud/num_colon.tga [deleted file]
gfx/hud/wickedhud/num_colon_stroke.tga [deleted file]
gfx/hud/wickedhud/num_dot.tga [deleted file]
gfx/hud/wickedhud/num_dot_stroke.tga [deleted file]
gfx/hud/wickedhud/num_leading.tga [deleted file]
gfx/hud/wickedhud/num_minus.tga [deleted file]
gfx/hud/wickedhud/num_minus_stroke.tga [deleted file]
gfx/hud/wickedhud/num_plus.tga [deleted file]
gfx/hud/wickedhud/num_plus_stroke.tga [deleted file]
gfx/hud/wickedhud/race_newfail.tga [deleted file]
gfx/hud/wickedhud/race_newrankgreen.tga [deleted file]
gfx/hud/wickedhud/race_newrankyellow.tga [deleted file]
gfx/hud/wickedhud/race_newrecordserver.tga [deleted file]
gfx/hud/wickedhud/race_newtime.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_1.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_2.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_3.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_4.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_5.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_6.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_7.tga [deleted file]
gfx/hud/wickedhud/rifle_ring_8.tga [deleted file]
gfx/hud/wickedhud/shield.tga [deleted file]
gfx/hud/wickedhud/statusbar.tga [deleted file]
gfx/hud/wickedhud/statusbar_vertical.tga [deleted file]
gfx/hud/wickedhud/strength.tga [deleted file]
gfx/hud/wickedhud/voteprogress_back.tga [deleted file]
gfx/hud/wickedhud/voteprogress_prog.tga [deleted file]
gfx/hud/wickedhud/voteprogress_voted.tga [deleted file]
gfx/hud/wickedhud/weapon_accuracy.tga [deleted file]
gfx/hud/wickedhud/weapon_current_bg.tga [deleted file]
gfx/hud/wickedhud/weapon_hlacmod_renameit.tga [deleted file]
gfx/hud/wickedhud/weaponcampingrifle.tga [deleted file]
gfx/hud/wickedhud/weaponcrylink.tga [deleted file]
gfx/hud/wickedhud/weaponelectro.tga [deleted file]
gfx/hud/wickedhud/weaponfireball.tga [deleted file]
gfx/hud/wickedhud/weapongrenadelauncher.tga [deleted file]
gfx/hud/wickedhud/weaponhagar.tga [deleted file]
gfx/hud/wickedhud/weaponhlac.tga [deleted file]
gfx/hud/wickedhud/weaponhook.tga [deleted file]
gfx/hud/wickedhud/weaponlaser.tga [deleted file]
gfx/hud/wickedhud/weaponminstanex.tga [deleted file]
gfx/hud/wickedhud/weaponnex.tga [deleted file]
gfx/hud/wickedhud/weaponporto.tga [deleted file]
gfx/hud/wickedhud/weaponrocketlauncher.tga [deleted file]
gfx/hud/wickedhud/weaponseeker.tga [deleted file]
gfx/hud/wickedhud/weaponshotgun.tga [deleted file]
gfx/hud/wickedhud/weapontuba.tga [deleted file]
gfx/hud/wickedhud/weaponuzi.tga [deleted file]
gfx/menu/default/cursor_move.tga [new file with mode: 0644]
gfx/menu/default/cursor_resize.tga [new file with mode: 0644]
gfx/menu/default/cursor_resize2.tga [new file with mode: 0644]
gfx/menu/wickedx/colorpicker_m.tga
gfx/menu/wickedx/colorpicker_selected.tga [new file with mode: 0644]
hud_luminos_default.cfg [new file with mode: 0644]
hud_wickedhud_big.cfg [deleted file]
hud_wickedhud_default.cfg [deleted file]
hud_wickedhud_minimalistic.cfg [deleted file]
models/misc/chatbubble.spr_0.tga
physicsNoQWBunny_easy.cfg [new file with mode: 0644]
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/menu/classes.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/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/mainwindow.c
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/ctf.qc
qcsrc/server/t_items.qc
xonotic-credits.txt

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
new file mode 100644 (file)
index 0000000..d4ac109
--- /dev/null
@@ -0,0 +1,197 @@
+// this is a dummy skin that contains only the cvar descriptions, so that we can leave them out from the real skin files themselves.
+// please add any new cvars into this file, with null string values
+seta hud_skin "" "skin folder where to look for images"
+seta hud_bg "" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
+seta hud_bg_color "" "default background color for the panels, accepts \"shirt\" and \"pants\""
+seta hud_bg_color_team "" "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
+seta hud_bg_alpha "" "default alpha of the background"
+seta hud_bg_border "" "default border size for the panels"
+seta hud_bg_padding "" "default padding of contents from the border"
+seta hud_fg_alpha "" "alpha of the foreground"
+
+seta hud_dock "" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
+seta hud_dock_color "" "dock color, accepts \"shirt\" and \"pants\""
+seta hud_dock_color_team "" "override dock color with team color in team games"
+seta hud_dock_alpha "" "alpha of the dock"
+
+seta hud_progressbar_alpha "" "alpha of progressbars"
+seta hud_progressbar_strength_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_shield_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_health_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_armor_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_fuel_color "" "R G B vector of the progress bar background color"
+seta hud_progressbar_nexball_color "" "R G B vector of the progress bar background color"
+
+seta _hud_panelorder "" "contains order in which panels are to be drawn"
+
+seta hud_weaponicons "" "enable/disable this panel"
+seta hud_weaponicons_pos "" "position of this panel"
+seta hud_weaponicons_size "" "size of this panel"
+seta hud_weaponicons_bg "" "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 "" "use this aspect on the items"
+seta hud_weaponicons_complainbubble "" "complain bubble (out of ammo, weapon not available etc)"
+seta hud_weaponicons_complainbubble_padding "" "padding for the complainbubble"
+seta hud_weaponicons_complainbubble_color_outofammo "" "color of the complainbubble when showing out of ammo message"
+seta hud_weaponicons_complainbubble_color_donthave "" "color of the complainbubble when showing don't have weapon message"
+seta hud_weaponicons_complainbubble_color_unavailable "" "color of the complainbubble when showing weapon unavailable message"
+seta hud_weaponicons_ammo_color "" "color of status bar"
+seta hud_weaponicons_ammo_alpha "" "alpha of status bar"
+
+seta hud_inventory "" "enable/disable this panel"
+seta hud_inventory_pos "" "position of this panel"
+seta hud_inventory_size "" "size of this panel"
+seta hud_inventory_onlycurrent "" "1 = show only current ammo type"
+seta hud_inventory_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
+seta hud_inventory_bg "" "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"
+seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_inventory_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_powerups "" "enable/disable this panel"
+seta hud_powerups_pos "" "position of this panel"
+seta hud_powerups_size "" "size of this panel"
+seta hud_powerups_flip "" "flip strength/shield positions"
+seta hud_powerups_baralign "" "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 = 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 "" "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"
+seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
+seta hud_healtharmor_pos "" "position of this panel"
+seta hud_healtharmor_size "" "size of this panel"
+seta hud_healtharmor_flip "" "flip health/armor positions"
+seta hud_healtharmor_baralign "" "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 = 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 "" "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"
+seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_notify "" "enable/disable this panel"
+seta hud_notify_pos "" "position of this base of the panel"
+seta hud_notify_size "" "size of this panel with all notifications on"
+seta hud_notify_bg "" "if set to something else than \"\" = override default background"
+seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_notify_bg_color_team "" "override panel color with team color in team based games"
+seta hud_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_notify_flip "" "order the list top to bottom instead of bottom to top"
+seta hud_notify_print "" "also con_notify print the messages that are shown on the notify panel"
+
+seta hud_timer "" "enable/disable this panel"
+seta hud_timer_pos "" "position of this base of the panel"
+seta hud_timer_size "" "size of this panel"
+seta hud_timer_bg "" "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"
+seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
+seta hud_radar_pos "" "position of this base of the panel"
+seta hud_radar_size "" "size of this panel"
+seta hud_radar_bg "" "if set to something else than \"\" = override default background"
+seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_radar_bg_color_team "" "override panel color with team color in team based games"
+seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_radar_foreground_alpha "" "alpha of the map"
+
+seta hud_score "" "enable/disable this panel"
+seta hud_score_pos "" "position of this base of the panel"
+seta hud_score_size "" "size of this panel"
+seta hud_score_bg "" "if set to something else than \"\" = override default background"
+seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_score_bg_color_team "" "override panel color with team color in team based games"
+seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_racetimer "" "enable/disable this panel"
+seta hud_racetimer_pos "" "position of this base of the panel"
+seta hud_racetimer_size "" "size of this panel"
+seta hud_racetimer_bg "" "if set to something else than \"\" = override default background"
+seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_vote "" "enable/disable this panel"
+seta hud_vote_pos "" "position of this base of the panel"
+seta hud_vote_size "" "size of this panel"
+seta hud_vote_alreadyvoted_alpha "" "alpha of the vote dialog after you have voted"
+seta hud_vote_bg "" "if set to something else than \"\" = override default background"
+seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_vote_bg_color_team "" "override panel color with team color in team based games"
+seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_modicons "" "enable/disable this panel"
+seta hud_modicons_pos "" "position of this base of the panel"
+seta hud_modicons_size "" "size of this panel"
+seta hud_modicons_bg "" "if set to something else than \"\" = override default background"
+seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_modicons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
+seta hud_pressedkeys_pos "" "position of this base of the panel"
+seta hud_pressedkeys_size "" "size of this panel"
+seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background"
+seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
+seta hud_pressedkeys_bg_alpha "" "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 "" "forced aspect on panel"
+
+seta hud_chat "" "enable/disable this panel"
+seta hud_chat_pos "" "position of this base of the panel"
+seta hud_chat_size "" "size of this panel"
+seta hud_chat_bg "" "if set to something else than \"\" = override default background"
+seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_chat_bg_color_team "" "override panel color with team color in team based games"
+seta hud_chat_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_engineinfo "" "enable/disable this panel
+seta hud_engineinfo_pos "" "position of this base of the panel"
+seta hud_engineinfo_size "" "size of this panel"
+seta hud_engineinfo_bg "" "if set to something else than \"\" = override default background"
+seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games"
+seta hud_engineinfo_bg_alpha "" "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_infomessages "" "enable/disable this panel
+seta hud_infomessages_pos "" "position of this base of the panel"
+seta hud_infomessages_size "" "size of this panel"
+seta hud_infomessages_bg "" "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 "" "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 "" "1 = align the items to the right"
index cc131c9f4faf6d6ce5d0393bc486e4eea3839931..7ab3f4c03601840d01bb4d452f516db8078db478 100644 (file)
@@ -1324,6 +1324,7 @@ 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"
@@ -1333,13 +1334,26 @@ seta hud_configure_grid_alpha 0.15 "alpha for visible grid when in configure mod
 
 seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info prints"
 
-exec hud_wickedhud_default.cfg
+// hud cvar descriptions
+exec _hud_descriptions.cfg
+// exec the default skin config
+exec hud_luminos_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_yellow 40 "percentage at which the accuracy color is yellow"
+seta hud_weaponicons_accuracy 1 "show accuracy color as the weapon icon background"
+seta hud_weaponicons_accuracy_color0 "1 0 0"
+seta hud_weaponicons_accuracy_color1 "1 1 0"
+seta hud_weaponicons_accuracy_color2 "0 1 0"
+seta hud_weaponicons_accuracy_color_levels "0 20 100" "accuracy values at which a specified color (hud_weaponicons_accuracy_color<X>) will be used. If your accuracy is between 2 of these values then a mix of the Xth and X+1th colors will be used. You can specify up to 10 values, in increasing order"
+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"
diff --git a/gfx/hud/default/flag_blue_captured.tga b/gfx/hud/default/flag_blue_captured.tga
deleted file mode 100644 (file)
index 7cff17e..0000000
Binary files a/gfx/hud/default/flag_blue_captured.tga and /dev/null differ
diff --git a/gfx/hud/default/flag_blue_returned.tga b/gfx/hud/default/flag_blue_returned.tga
deleted file mode 100644 (file)
index 8e8b67f..0000000
Binary files a/gfx/hud/default/flag_blue_returned.tga and /dev/null differ
diff --git a/gfx/hud/default/flag_red_captured.tga b/gfx/hud/default/flag_red_captured.tga
deleted file mode 100644 (file)
index 72814ec..0000000
Binary files a/gfx/hud/default/flag_red_captured.tga and /dev/null differ
diff --git a/gfx/hud/default/flag_red_returned.tga b/gfx/hud/default/flag_red_returned.tga
deleted file mode 100644 (file)
index deee468..0000000
Binary files a/gfx/hud/default/flag_red_returned.tga and /dev/null 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_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_teamkill.tga b/gfx/hud/default/notify_teamkill.tga
deleted file mode 100644 (file)
index a40920b..0000000
Binary files a/gfx/hud/default/notify_teamkill.tga and /dev/null 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/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/luminos/ammo_bullets.tga b/gfx/hud/luminos/ammo_bullets.tga
new file mode 100644 (file)
index 0000000..8f3739d
Binary files /dev/null and b/gfx/hud/luminos/ammo_bullets.tga differ
diff --git a/gfx/hud/luminos/ammo_cells.tga b/gfx/hud/luminos/ammo_cells.tga
new file mode 100644 (file)
index 0000000..4850763
Binary files /dev/null and b/gfx/hud/luminos/ammo_cells.tga differ
diff --git a/gfx/hud/luminos/ammo_current_bg.tga b/gfx/hud/luminos/ammo_current_bg.tga
new file mode 100644 (file)
index 0000000..7036279
Binary files /dev/null and b/gfx/hud/luminos/ammo_current_bg.tga differ
diff --git a/gfx/hud/luminos/ammo_fuel.tga b/gfx/hud/luminos/ammo_fuel.tga
new file mode 100644 (file)
index 0000000..4a3a2d5
Binary files /dev/null and b/gfx/hud/luminos/ammo_fuel.tga differ
diff --git a/gfx/hud/luminos/ammo_rockets.tga b/gfx/hud/luminos/ammo_rockets.tga
new file mode 100644 (file)
index 0000000..9b34ea7
Binary files /dev/null and b/gfx/hud/luminos/ammo_rockets.tga differ
diff --git a/gfx/hud/luminos/ammo_shells.tga b/gfx/hud/luminos/ammo_shells.tga
new file mode 100644 (file)
index 0000000..f62c715
Binary files /dev/null and b/gfx/hud/luminos/ammo_shells.tga differ
diff --git a/gfx/hud/luminos/armor.tga b/gfx/hud/luminos/armor.tga
new file mode 100644 (file)
index 0000000..f9e4701
Binary files /dev/null and b/gfx/hud/luminos/armor.tga differ
diff --git a/gfx/hud/luminos/border_highlighted.tga b/gfx/hud/luminos/border_highlighted.tga
new file mode 100644 (file)
index 0000000..542f82a
Binary files /dev/null and b/gfx/hud/luminos/border_highlighted.tga differ
diff --git a/gfx/hud/luminos/border_highlighted2.tga b/gfx/hud/luminos/border_highlighted2.tga
new file mode 100644 (file)
index 0000000..7e460e5
Binary files /dev/null and b/gfx/hud/luminos/border_highlighted2.tga differ
diff --git a/gfx/hud/luminos/border_horizontal.tga b/gfx/hud/luminos/border_horizontal.tga
new file mode 100644 (file)
index 0000000..b628060
Binary files /dev/null and b/gfx/hud/luminos/border_horizontal.tga differ
diff --git a/gfx/hud/luminos/border_vertical.tga b/gfx/hud/luminos/border_vertical.tga
new file mode 100644 (file)
index 0000000..3b76811
Binary files /dev/null and b/gfx/hud/luminos/border_vertical.tga differ
diff --git a/gfx/hud/luminos/dock.tga b/gfx/hud/luminos/dock.tga
new file mode 100644 (file)
index 0000000..3163382
Binary files /dev/null and b/gfx/hud/luminos/dock.tga differ
diff --git a/gfx/hud/luminos/flag_blue_carrying.tga b/gfx/hud/luminos/flag_blue_carrying.tga
new file mode 100644 (file)
index 0000000..1ddcbfa
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_carrying.tga differ
diff --git a/gfx/hud/luminos/flag_blue_lost.tga b/gfx/hud/luminos/flag_blue_lost.tga
new file mode 100644 (file)
index 0000000..b37ccd0
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_lost.tga differ
diff --git a/gfx/hud/luminos/flag_blue_shielded.tga b/gfx/hud/luminos/flag_blue_shielded.tga
new file mode 100644 (file)
index 0000000..c1e89c5
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_shielded.tga differ
diff --git a/gfx/hud/luminos/flag_blue_taken.tga b/gfx/hud/luminos/flag_blue_taken.tga
new file mode 100644 (file)
index 0000000..70079ca
Binary files /dev/null and b/gfx/hud/luminos/flag_blue_taken.tga differ
diff --git a/gfx/hud/luminos/flag_red_carrying.tga b/gfx/hud/luminos/flag_red_carrying.tga
new file mode 100644 (file)
index 0000000..8fda6e1
Binary files /dev/null and b/gfx/hud/luminos/flag_red_carrying.tga differ
diff --git a/gfx/hud/luminos/flag_red_lost.tga b/gfx/hud/luminos/flag_red_lost.tga
new file mode 100644 (file)
index 0000000..083ac46
Binary files /dev/null and b/gfx/hud/luminos/flag_red_lost.tga differ
diff --git a/gfx/hud/luminos/flag_red_shielded.tga b/gfx/hud/luminos/flag_red_shielded.tga
new file mode 100644 (file)
index 0000000..550d0b7
Binary files /dev/null and b/gfx/hud/luminos/flag_red_shielded.tga differ
diff --git a/gfx/hud/luminos/flag_red_taken.tga b/gfx/hud/luminos/flag_red_taken.tga
new file mode 100644 (file)
index 0000000..a21a5ee
Binary files /dev/null and b/gfx/hud/luminos/flag_red_taken.tga differ
diff --git a/gfx/hud/luminos/health.tga b/gfx/hud/luminos/health.tga
new file mode 100644 (file)
index 0000000..26e4086
Binary files /dev/null and b/gfx/hud/luminos/health.tga differ
diff --git a/gfx/hud/luminos/key_backward.tga b/gfx/hud/luminos/key_backward.tga
new file mode 100644 (file)
index 0000000..2a2cbab
Binary files /dev/null and b/gfx/hud/luminos/key_backward.tga differ
diff --git a/gfx/hud/luminos/key_backward_inv.tga b/gfx/hud/luminos/key_backward_inv.tga
new file mode 100644 (file)
index 0000000..1b6b973
Binary files /dev/null and b/gfx/hud/luminos/key_backward_inv.tga differ
diff --git a/gfx/hud/luminos/key_crouch.tga b/gfx/hud/luminos/key_crouch.tga
new file mode 100644 (file)
index 0000000..7016441
Binary files /dev/null and b/gfx/hud/luminos/key_crouch.tga differ
diff --git a/gfx/hud/luminos/key_crouch_inv.tga b/gfx/hud/luminos/key_crouch_inv.tga
new file mode 100644 (file)
index 0000000..0f47c09
Binary files /dev/null and b/gfx/hud/luminos/key_crouch_inv.tga differ
diff --git a/gfx/hud/luminos/key_forward.tga b/gfx/hud/luminos/key_forward.tga
new file mode 100644 (file)
index 0000000..0354b18
Binary files /dev/null and b/gfx/hud/luminos/key_forward.tga differ
diff --git a/gfx/hud/luminos/key_forward_inv.tga b/gfx/hud/luminos/key_forward_inv.tga
new file mode 100644 (file)
index 0000000..47c6154
Binary files /dev/null and b/gfx/hud/luminos/key_forward_inv.tga differ
diff --git a/gfx/hud/luminos/key_jump.tga b/gfx/hud/luminos/key_jump.tga
new file mode 100644 (file)
index 0000000..70a92fa
Binary files /dev/null and b/gfx/hud/luminos/key_jump.tga differ
diff --git a/gfx/hud/luminos/key_jump_inv.tga b/gfx/hud/luminos/key_jump_inv.tga
new file mode 100644 (file)
index 0000000..a62bcf2
Binary files /dev/null and b/gfx/hud/luminos/key_jump_inv.tga differ
diff --git a/gfx/hud/luminos/key_left.tga b/gfx/hud/luminos/key_left.tga
new file mode 100644 (file)
index 0000000..4bcf85f
Binary files /dev/null and b/gfx/hud/luminos/key_left.tga differ
diff --git a/gfx/hud/luminos/key_left_inv.tga b/gfx/hud/luminos/key_left_inv.tga
new file mode 100644 (file)
index 0000000..b6d6a2d
Binary files /dev/null and b/gfx/hud/luminos/key_left_inv.tga differ
diff --git a/gfx/hud/luminos/key_right.tga b/gfx/hud/luminos/key_right.tga
new file mode 100644 (file)
index 0000000..4d4ee21
Binary files /dev/null and b/gfx/hud/luminos/key_right.tga differ
diff --git a/gfx/hud/luminos/key_right_inv.tga b/gfx/hud/luminos/key_right_inv.tga
new file mode 100644 (file)
index 0000000..f6fe631
Binary files /dev/null and b/gfx/hud/luminos/key_right_inv.tga differ
diff --git a/gfx/hud/luminos/notify_blue_captured.tga b/gfx/hud/luminos/notify_blue_captured.tga
new file mode 100644 (file)
index 0000000..04e9230
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_captured.tga differ
diff --git a/gfx/hud/luminos/notify_blue_carrying.tga b/gfx/hud/luminos/notify_blue_carrying.tga
new file mode 100644 (file)
index 0000000..109ba09
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_carrying.tga differ
diff --git a/gfx/hud/luminos/notify_blue_lost.tga b/gfx/hud/luminos/notify_blue_lost.tga
new file mode 100644 (file)
index 0000000..435928d
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_lost.tga differ
diff --git a/gfx/hud/luminos/notify_blue_returned.tga b/gfx/hud/luminos/notify_blue_returned.tga
new file mode 100644 (file)
index 0000000..c75de3b
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_returned.tga differ
diff --git a/gfx/hud/luminos/notify_blue_shielded.tga b/gfx/hud/luminos/notify_blue_shielded.tga
new file mode 100644 (file)
index 0000000..977fe9a
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_shielded.tga differ
diff --git a/gfx/hud/luminos/notify_blue_taken.tga b/gfx/hud/luminos/notify_blue_taken.tga
new file mode 100644 (file)
index 0000000..43f73aa
Binary files /dev/null and b/gfx/hud/luminos/notify_blue_taken.tga differ
diff --git a/gfx/hud/luminos/notify_camping.tga b/gfx/hud/luminos/notify_camping.tga
new file mode 100644 (file)
index 0000000..a11e324
Binary files /dev/null and b/gfx/hud/luminos/notify_camping.tga differ
diff --git a/gfx/hud/luminos/notify_death.tga b/gfx/hud/luminos/notify_death.tga
new file mode 100644 (file)
index 0000000..3a32ae3
Binary files /dev/null and b/gfx/hud/luminos/notify_death.tga differ
diff --git a/gfx/hud/luminos/notify_fall.tga b/gfx/hud/luminos/notify_fall.tga
new file mode 100644 (file)
index 0000000..98a7f49
Binary files /dev/null and b/gfx/hud/luminos/notify_fall.tga differ
diff --git a/gfx/hud/luminos/notify_lava.tga b/gfx/hud/luminos/notify_lava.tga
new file mode 100644 (file)
index 0000000..1c77758
Binary files /dev/null and b/gfx/hud/luminos/notify_lava.tga differ
diff --git a/gfx/hud/luminos/notify_outofammo.tga b/gfx/hud/luminos/notify_outofammo.tga
new file mode 100644 (file)
index 0000000..ecacf50
Binary files /dev/null and b/gfx/hud/luminos/notify_outofammo.tga differ
diff --git a/gfx/hud/luminos/notify_red_captured.tga b/gfx/hud/luminos/notify_red_captured.tga
new file mode 100644 (file)
index 0000000..052be13
Binary files /dev/null and b/gfx/hud/luminos/notify_red_captured.tga differ
diff --git a/gfx/hud/luminos/notify_red_carrying.tga b/gfx/hud/luminos/notify_red_carrying.tga
new file mode 100644 (file)
index 0000000..0e17a56
Binary files /dev/null and b/gfx/hud/luminos/notify_red_carrying.tga differ
diff --git a/gfx/hud/luminos/notify_red_lost.tga b/gfx/hud/luminos/notify_red_lost.tga
new file mode 100644 (file)
index 0000000..ffc7dc0
Binary files /dev/null and b/gfx/hud/luminos/notify_red_lost.tga differ
diff --git a/gfx/hud/luminos/notify_red_returned.tga b/gfx/hud/luminos/notify_red_returned.tga
new file mode 100644 (file)
index 0000000..c5c23de
Binary files /dev/null and b/gfx/hud/luminos/notify_red_returned.tga differ
diff --git a/gfx/hud/luminos/notify_red_shielded.tga b/gfx/hud/luminos/notify_red_shielded.tga
new file mode 100644 (file)
index 0000000..d3cef48
Binary files /dev/null and b/gfx/hud/luminos/notify_red_shielded.tga differ
diff --git a/gfx/hud/luminos/notify_red_taken.tga b/gfx/hud/luminos/notify_red_taken.tga
new file mode 100644 (file)
index 0000000..9fa31f1
Binary files /dev/null and b/gfx/hud/luminos/notify_red_taken.tga differ
diff --git a/gfx/hud/luminos/notify_selfkill.tga b/gfx/hud/luminos/notify_selfkill.tga
new file mode 100644 (file)
index 0000000..98e62cf
Binary files /dev/null and b/gfx/hud/luminos/notify_selfkill.tga differ
diff --git a/gfx/hud/luminos/notify_shootingstar.tga b/gfx/hud/luminos/notify_shootingstar.tga
new file mode 100644 (file)
index 0000000..c8077a2
Binary files /dev/null and b/gfx/hud/luminos/notify_shootingstar.tga differ
diff --git a/gfx/hud/luminos/notify_slime.tga b/gfx/hud/luminos/notify_slime.tga
new file mode 100644 (file)
index 0000000..11ae58b
Binary files /dev/null and b/gfx/hud/luminos/notify_slime.tga differ
diff --git a/gfx/hud/luminos/notify_teamkill.tga b/gfx/hud/luminos/notify_teamkill.tga
new file mode 100644 (file)
index 0000000..a2dc308
Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill.tga differ
diff --git a/gfx/hud/luminos/notify_teamkill_blue.tga b/gfx/hud/luminos/notify_teamkill_blue.tga
new file mode 100644 (file)
index 0000000..885b929
Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill_blue.tga differ
diff --git a/gfx/hud/luminos/notify_teamkill_red.tga b/gfx/hud/luminos/notify_teamkill_red.tga
new file mode 100644 (file)
index 0000000..96f007a
Binary files /dev/null and b/gfx/hud/luminos/notify_teamkill_red.tga differ
diff --git a/gfx/hud/luminos/notify_void.tga b/gfx/hud/luminos/notify_void.tga
new file mode 100644 (file)
index 0000000..2a613b6
Binary files /dev/null and b/gfx/hud/luminos/notify_void.tga differ
diff --git a/gfx/hud/luminos/notify_water.tga b/gfx/hud/luminos/notify_water.tga
new file mode 100644 (file)
index 0000000..f04b3e5
Binary files /dev/null and b/gfx/hud/luminos/notify_water.tga differ
diff --git a/gfx/hud/luminos/num_leading.tga b/gfx/hud/luminos/num_leading.tga
new file mode 100644 (file)
index 0000000..668fbc6
Binary files /dev/null and b/gfx/hud/luminos/num_leading.tga differ
diff --git a/gfx/hud/luminos/race_newfail.tga b/gfx/hud/luminos/race_newfail.tga
new file mode 100644 (file)
index 0000000..360d68a
Binary files /dev/null and b/gfx/hud/luminos/race_newfail.tga differ
diff --git a/gfx/hud/luminos/race_newrankgreen.tga b/gfx/hud/luminos/race_newrankgreen.tga
new file mode 100644 (file)
index 0000000..ec3e225
Binary files /dev/null and b/gfx/hud/luminos/race_newrankgreen.tga differ
diff --git a/gfx/hud/luminos/race_newrankyellow.tga b/gfx/hud/luminos/race_newrankyellow.tga
new file mode 100644 (file)
index 0000000..ec3e225
Binary files /dev/null and b/gfx/hud/luminos/race_newrankyellow.tga differ
diff --git a/gfx/hud/luminos/race_newrecordserver.tga b/gfx/hud/luminos/race_newrecordserver.tga
new file mode 100644 (file)
index 0000000..99ed22b
Binary files /dev/null and b/gfx/hud/luminos/race_newrecordserver.tga differ
diff --git a/gfx/hud/luminos/race_newtime.tga b/gfx/hud/luminos/race_newtime.tga
new file mode 100644 (file)
index 0000000..ab2f905
Binary files /dev/null and b/gfx/hud/luminos/race_newtime.tga differ
diff --git a/gfx/hud/luminos/statusbar.tga b/gfx/hud/luminos/statusbar.tga
new file mode 100644 (file)
index 0000000..987c8f5
Binary files /dev/null and b/gfx/hud/luminos/statusbar.tga differ
diff --git a/gfx/hud/luminos/statusbar_vertical.tga b/gfx/hud/luminos/statusbar_vertical.tga
new file mode 100644 (file)
index 0000000..3c2d1a8
Binary files /dev/null and b/gfx/hud/luminos/statusbar_vertical.tga differ
diff --git a/gfx/hud/luminos/voteprogress_back.tga b/gfx/hud/luminos/voteprogress_back.tga
new file mode 100644 (file)
index 0000000..0ba103e
Binary files /dev/null and b/gfx/hud/luminos/voteprogress_back.tga differ
diff --git a/gfx/hud/luminos/voteprogress_prog.tga b/gfx/hud/luminos/voteprogress_prog.tga
new file mode 100644 (file)
index 0000000..f24f524
Binary files /dev/null and b/gfx/hud/luminos/voteprogress_prog.tga differ
diff --git a/gfx/hud/luminos/voteprogress_voted.tga b/gfx/hud/luminos/voteprogress_voted.tga
new file mode 100644 (file)
index 0000000..ee06048
Binary files /dev/null and b/gfx/hud/luminos/voteprogress_voted.tga differ
diff --git a/gfx/hud/luminos/weapon_accuracy.tga b/gfx/hud/luminos/weapon_accuracy.tga
new file mode 100644 (file)
index 0000000..8dcf3aa
Binary files /dev/null and b/gfx/hud/luminos/weapon_accuracy.tga differ
diff --git a/gfx/hud/luminos/weapon_ammo.tga b/gfx/hud/luminos/weapon_ammo.tga
new file mode 100644 (file)
index 0000000..de4148c
Binary files /dev/null and b/gfx/hud/luminos/weapon_ammo.tga differ
diff --git a/gfx/hud/luminos/weapon_current_bg.tga b/gfx/hud/luminos/weapon_current_bg.tga
new file mode 100644 (file)
index 0000000..688d805
Binary files /dev/null and b/gfx/hud/luminos/weapon_current_bg.tga differ
diff --git a/gfx/hud/luminos/weapon_hlacmod_renameit.tga b/gfx/hud/luminos/weapon_hlacmod_renameit.tga
new file mode 100644 (file)
index 0000000..601f3d7
Binary files /dev/null and b/gfx/hud/luminos/weapon_hlacmod_renameit.tga differ
diff --git a/gfx/hud/luminos/weaponcampingrifle.tga b/gfx/hud/luminos/weaponcampingrifle.tga
new file mode 100644 (file)
index 0000000..f5c2e55
Binary files /dev/null and b/gfx/hud/luminos/weaponcampingrifle.tga differ
diff --git a/gfx/hud/luminos/weaponcrylink.tga b/gfx/hud/luminos/weaponcrylink.tga
new file mode 100644 (file)
index 0000000..e7e283f
Binary files /dev/null and b/gfx/hud/luminos/weaponcrylink.tga differ
diff --git a/gfx/hud/luminos/weaponelectro.tga b/gfx/hud/luminos/weaponelectro.tga
new file mode 100644 (file)
index 0000000..75cdf02
Binary files /dev/null and b/gfx/hud/luminos/weaponelectro.tga differ
diff --git a/gfx/hud/luminos/weaponfireball.tga b/gfx/hud/luminos/weaponfireball.tga
new file mode 100644 (file)
index 0000000..05fc4fe
Binary files /dev/null and b/gfx/hud/luminos/weaponfireball.tga differ
diff --git a/gfx/hud/luminos/weapongrenadelauncher.tga b/gfx/hud/luminos/weapongrenadelauncher.tga
new file mode 100644 (file)
index 0000000..24135f3
Binary files /dev/null and b/gfx/hud/luminos/weapongrenadelauncher.tga differ
diff --git a/gfx/hud/luminos/weaponhagar.tga b/gfx/hud/luminos/weaponhagar.tga
new file mode 100644 (file)
index 0000000..5c04c8f
Binary files /dev/null and b/gfx/hud/luminos/weaponhagar.tga differ
diff --git a/gfx/hud/luminos/weaponhlac.tga b/gfx/hud/luminos/weaponhlac.tga
new file mode 100644 (file)
index 0000000..5375ab4
Binary files /dev/null and b/gfx/hud/luminos/weaponhlac.tga differ
diff --git a/gfx/hud/luminos/weaponhook.tga b/gfx/hud/luminos/weaponhook.tga
new file mode 100644 (file)
index 0000000..eaee838
Binary files /dev/null and b/gfx/hud/luminos/weaponhook.tga differ
diff --git a/gfx/hud/luminos/weaponlaser.tga b/gfx/hud/luminos/weaponlaser.tga
new file mode 100644 (file)
index 0000000..0afbb37
Binary files /dev/null and b/gfx/hud/luminos/weaponlaser.tga differ
diff --git a/gfx/hud/luminos/weaponminstanex.tga b/gfx/hud/luminos/weaponminstanex.tga
new file mode 100644 (file)
index 0000000..3618778
Binary files /dev/null and b/gfx/hud/luminos/weaponminstanex.tga differ
diff --git a/gfx/hud/luminos/weaponnex.tga b/gfx/hud/luminos/weaponnex.tga
new file mode 100644 (file)
index 0000000..b4e2949
Binary files /dev/null and b/gfx/hud/luminos/weaponnex.tga differ
diff --git a/gfx/hud/luminos/weaponporto.tga b/gfx/hud/luminos/weaponporto.tga
new file mode 100644 (file)
index 0000000..3fbccf9
Binary files /dev/null and b/gfx/hud/luminos/weaponporto.tga differ
diff --git a/gfx/hud/luminos/weaponrocketlauncher.tga b/gfx/hud/luminos/weaponrocketlauncher.tga
new file mode 100644 (file)
index 0000000..0fea766
Binary files /dev/null and b/gfx/hud/luminos/weaponrocketlauncher.tga differ
diff --git a/gfx/hud/luminos/weaponseeker.tga b/gfx/hud/luminos/weaponseeker.tga
new file mode 100644 (file)
index 0000000..5630d52
Binary files /dev/null and b/gfx/hud/luminos/weaponseeker.tga differ
diff --git a/gfx/hud/luminos/weaponshotgun.tga b/gfx/hud/luminos/weaponshotgun.tga
new file mode 100644 (file)
index 0000000..438b121
Binary files /dev/null and b/gfx/hud/luminos/weaponshotgun.tga differ
diff --git a/gfx/hud/luminos/weapontuba.tga b/gfx/hud/luminos/weapontuba.tga
new file mode 100644 (file)
index 0000000..1617b7f
Binary files /dev/null and b/gfx/hud/luminos/weapontuba.tga differ
diff --git a/gfx/hud/luminos/weaponuzi.tga b/gfx/hud/luminos/weaponuzi.tga
new file mode 100644 (file)
index 0000000..4c03732
Binary files /dev/null and b/gfx/hud/luminos/weaponuzi.tga differ
diff --git a/gfx/hud/wickedhud/ammo_bullets.tga b/gfx/hud/wickedhud/ammo_bullets.tga
deleted file mode 100644 (file)
index e7cd01a..0000000
Binary files a/gfx/hud/wickedhud/ammo_bullets.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_cells.tga b/gfx/hud/wickedhud/ammo_cells.tga
deleted file mode 100644 (file)
index 664eb23..0000000
Binary files a/gfx/hud/wickedhud/ammo_cells.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_current_bg.tga b/gfx/hud/wickedhud/ammo_current_bg.tga
deleted file mode 100644 (file)
index bd07205..0000000
Binary files a/gfx/hud/wickedhud/ammo_current_bg.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_fuel.tga b/gfx/hud/wickedhud/ammo_fuel.tga
deleted file mode 100644 (file)
index 8450a2f..0000000
Binary files a/gfx/hud/wickedhud/ammo_fuel.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_rockets.tga b/gfx/hud/wickedhud/ammo_rockets.tga
deleted file mode 100644 (file)
index c37f077..0000000
Binary files a/gfx/hud/wickedhud/ammo_rockets.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/ammo_shells.tga b/gfx/hud/wickedhud/ammo_shells.tga
deleted file mode 100644 (file)
index 59bea4b..0000000
Binary files a/gfx/hud/wickedhud/ammo_shells.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/armor.tga b/gfx/hud/wickedhud/armor.tga
deleted file mode 100644 (file)
index 92046b4..0000000
Binary files a/gfx/hud/wickedhud/armor.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border.tga b/gfx/hud/wickedhud/border.tga
deleted file mode 100644 (file)
index 8ceee44..0000000
Binary files a/gfx/hud/wickedhud/border.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_chat.tga b/gfx/hud/wickedhud/border_chat.tga
deleted file mode 100644 (file)
index 1cd065e..0000000
Binary files a/gfx/hud/wickedhud/border_chat.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_healtharmor.tga b/gfx/hud/wickedhud/border_healtharmor.tga
deleted file mode 100644 (file)
index 7109ab5..0000000
Binary files a/gfx/hud/wickedhud/border_healtharmor.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_inventory.tga b/gfx/hud/wickedhud/border_inventory.tga
deleted file mode 100644 (file)
index 20ae8f6..0000000
Binary files a/gfx/hud/wickedhud/border_inventory.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_modicons.tga b/gfx/hud/wickedhud/border_modicons.tga
deleted file mode 100644 (file)
index 5437b04..0000000
Binary files a/gfx/hud/wickedhud/border_modicons.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_powerups.tga b/gfx/hud/wickedhud/border_powerups.tga
deleted file mode 100644 (file)
index f8fbf44..0000000
Binary files a/gfx/hud/wickedhud/border_powerups.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_radar.tga b/gfx/hud/wickedhud/border_radar.tga
deleted file mode 100644 (file)
index a300f52..0000000
Binary files a/gfx/hud/wickedhud/border_radar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_score.tga b/gfx/hud/wickedhud/border_score.tga
deleted file mode 100644 (file)
index a4d8b6c..0000000
Binary files a/gfx/hud/wickedhud/border_score.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_timer.tga b/gfx/hud/wickedhud/border_timer.tga
deleted file mode 100644 (file)
index c657136..0000000
Binary files a/gfx/hud/wickedhud/border_timer.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_vote.tga b/gfx/hud/wickedhud/border_vote.tga
deleted file mode 100644 (file)
index 13b948e..0000000
Binary files a/gfx/hud/wickedhud/border_vote.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/border_weaponicons.tga b/gfx/hud/wickedhud/border_weaponicons.tga
deleted file mode 100644 (file)
index 08e8dcd..0000000
Binary files a/gfx/hud/wickedhud/border_weaponicons.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/dock.tga b/gfx/hud/wickedhud/dock.tga
deleted file mode 100644 (file)
index 9dd4e2f..0000000
Binary files a/gfx/hud/wickedhud/dock.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/dock_small.tga b/gfx/hud/wickedhud/dock_small.tga
deleted file mode 100644 (file)
index 5135876..0000000
Binary files a/gfx/hud/wickedhud/dock_small.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_captured.tga b/gfx/hud/wickedhud/flag_blue_captured.tga
deleted file mode 100644 (file)
index 7cff17e..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_captured.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_carrying.tga b/gfx/hud/wickedhud/flag_blue_carrying.tga
deleted file mode 100644 (file)
index ace6a5f..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_lost.tga b/gfx/hud/wickedhud/flag_blue_lost.tga
deleted file mode 100644 (file)
index 67d894d..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_returned.tga b/gfx/hud/wickedhud/flag_blue_returned.tga
deleted file mode 100644 (file)
index 8e8b67f..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_returned.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_shielded.tga b/gfx/hud/wickedhud/flag_blue_shielded.tga
deleted file mode 100644 (file)
index a8993f6..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_blue_taken.tga b/gfx/hud/wickedhud/flag_blue_taken.tga
deleted file mode 100644 (file)
index 6847e7c..0000000
Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_captured.tga b/gfx/hud/wickedhud/flag_red_captured.tga
deleted file mode 100644 (file)
index 72814ec..0000000
Binary files a/gfx/hud/wickedhud/flag_red_captured.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_carrying.tga b/gfx/hud/wickedhud/flag_red_carrying.tga
deleted file mode 100644 (file)
index 3393083..0000000
Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_lost.tga b/gfx/hud/wickedhud/flag_red_lost.tga
deleted file mode 100644 (file)
index f96e021..0000000
Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_returned.tga b/gfx/hud/wickedhud/flag_red_returned.tga
deleted file mode 100644 (file)
index deee468..0000000
Binary files a/gfx/hud/wickedhud/flag_red_returned.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_shielded.tga b/gfx/hud/wickedhud/flag_red_shielded.tga
deleted file mode 100644 (file)
index e7ec491..0000000
Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/flag_red_taken.tga b/gfx/hud/wickedhud/flag_red_taken.tga
deleted file mode 100644 (file)
index bf71977..0000000
Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/health.tga b/gfx/hud/wickedhud/health.tga
deleted file mode 100644 (file)
index 0ed8a90..0000000
Binary files a/gfx/hud/wickedhud/health.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_backward.tga b/gfx/hud/wickedhud/key_backward.tga
deleted file mode 100644 (file)
index 4de0f33..0000000
Binary files a/gfx/hud/wickedhud/key_backward.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_backward_inv.tga b/gfx/hud/wickedhud/key_backward_inv.tga
deleted file mode 100644 (file)
index bef0d1c..0000000
Binary files a/gfx/hud/wickedhud/key_backward_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_crouch.tga b/gfx/hud/wickedhud/key_crouch.tga
deleted file mode 100644 (file)
index 00b2dfe..0000000
Binary files a/gfx/hud/wickedhud/key_crouch.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_crouch_inv.tga b/gfx/hud/wickedhud/key_crouch_inv.tga
deleted file mode 100644 (file)
index 2cdbda8..0000000
Binary files a/gfx/hud/wickedhud/key_crouch_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_forward.tga b/gfx/hud/wickedhud/key_forward.tga
deleted file mode 100644 (file)
index dfe2233..0000000
Binary files a/gfx/hud/wickedhud/key_forward.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_forward_inv.tga b/gfx/hud/wickedhud/key_forward_inv.tga
deleted file mode 100644 (file)
index 7bbea60..0000000
Binary files a/gfx/hud/wickedhud/key_forward_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_jump.tga b/gfx/hud/wickedhud/key_jump.tga
deleted file mode 100644 (file)
index d02b2db..0000000
Binary files a/gfx/hud/wickedhud/key_jump.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_jump_inv.tga b/gfx/hud/wickedhud/key_jump_inv.tga
deleted file mode 100644 (file)
index c54bb37..0000000
Binary files a/gfx/hud/wickedhud/key_jump_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_left.tga b/gfx/hud/wickedhud/key_left.tga
deleted file mode 100644 (file)
index 60fe71f..0000000
Binary files a/gfx/hud/wickedhud/key_left.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_left_inv.tga b/gfx/hud/wickedhud/key_left_inv.tga
deleted file mode 100644 (file)
index 92bc615..0000000
Binary files a/gfx/hud/wickedhud/key_left_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_right.tga b/gfx/hud/wickedhud/key_right.tga
deleted file mode 100644 (file)
index 308c03b..0000000
Binary files a/gfx/hud/wickedhud/key_right.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/key_right_inv.tga b/gfx/hud/wickedhud/key_right_inv.tga
deleted file mode 100644 (file)
index 8f04be4..0000000
Binary files a/gfx/hud/wickedhud/key_right_inv.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_blue.tga b/gfx/hud/wickedhud/kh_blue.tga
deleted file mode 100644 (file)
index 467b229..0000000
Binary files a/gfx/hud/wickedhud/kh_blue.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_bluearrow.tga b/gfx/hud/wickedhud/kh_bluearrow.tga
deleted file mode 100644 (file)
index b686d1b..0000000
Binary files a/gfx/hud/wickedhud/kh_bluearrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_pink.tga b/gfx/hud/wickedhud/kh_pink.tga
deleted file mode 100644 (file)
index b40967a..0000000
Binary files a/gfx/hud/wickedhud/kh_pink.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_pinkarrow.tga b/gfx/hud/wickedhud/kh_pinkarrow.tga
deleted file mode 100644 (file)
index 17427e5..0000000
Binary files a/gfx/hud/wickedhud/kh_pinkarrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_red.tga b/gfx/hud/wickedhud/kh_red.tga
deleted file mode 100644 (file)
index 3201f8a..0000000
Binary files a/gfx/hud/wickedhud/kh_red.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_redarrow.tga b/gfx/hud/wickedhud/kh_redarrow.tga
deleted file mode 100644 (file)
index edd1fab..0000000
Binary files a/gfx/hud/wickedhud/kh_redarrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_yellow.tga b/gfx/hud/wickedhud/kh_yellow.tga
deleted file mode 100644 (file)
index bb83475..0000000
Binary files a/gfx/hud/wickedhud/kh_yellow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/kh_yellowarrow.tga b/gfx/hud/wickedhud/kh_yellowarrow.tga
deleted file mode 100644 (file)
index 8e754cc..0000000
Binary files a/gfx/hud/wickedhud/kh_yellowarrow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/nexball_carrying.tga b/gfx/hud/wickedhud/nexball_carrying.tga
deleted file mode 100644 (file)
index 04ada8c..0000000
Binary files a/gfx/hud/wickedhud/nexball_carrying.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_camping.tga b/gfx/hud/wickedhud/notify_camping.tga
deleted file mode 100644 (file)
index 2766dd1..0000000
Binary files a/gfx/hud/wickedhud/notify_camping.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_death.tga b/gfx/hud/wickedhud/notify_death.tga
deleted file mode 100644 (file)
index d5e8045..0000000
Binary files a/gfx/hud/wickedhud/notify_death.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_fall.tga b/gfx/hud/wickedhud/notify_fall.tga
deleted file mode 100644 (file)
index febd1d0..0000000
Binary files a/gfx/hud/wickedhud/notify_fall.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_lava.tga b/gfx/hud/wickedhud/notify_lava.tga
deleted file mode 100644 (file)
index 3976e8b..0000000
Binary files a/gfx/hud/wickedhud/notify_lava.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_outofammo.tga b/gfx/hud/wickedhud/notify_outofammo.tga
deleted file mode 100644 (file)
index 82a11dd..0000000
Binary files a/gfx/hud/wickedhud/notify_outofammo.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_selfkill.tga b/gfx/hud/wickedhud/notify_selfkill.tga
deleted file mode 100644 (file)
index 646a1a2..0000000
Binary files a/gfx/hud/wickedhud/notify_selfkill.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_shootingstar.tga b/gfx/hud/wickedhud/notify_shootingstar.tga
deleted file mode 100644 (file)
index 048e015..0000000
Binary files a/gfx/hud/wickedhud/notify_shootingstar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_slime.tga b/gfx/hud/wickedhud/notify_slime.tga
deleted file mode 100644 (file)
index c08a6a3..0000000
Binary files a/gfx/hud/wickedhud/notify_slime.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga
deleted file mode 100644 (file)
index a40920b..0000000
Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_void.tga b/gfx/hud/wickedhud/notify_void.tga
deleted file mode 100644 (file)
index 1e2d280..0000000
Binary files a/gfx/hud/wickedhud/notify_void.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/notify_water.tga b/gfx/hud/wickedhud/notify_water.tga
deleted file mode 100644 (file)
index 8315f12..0000000
Binary files a/gfx/hud/wickedhud/notify_water.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_0.tga b/gfx/hud/wickedhud/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/wickedhud/num_0.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_0_stroke.tga b/gfx/hud/wickedhud/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/wickedhud/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_1.tga b/gfx/hud/wickedhud/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/wickedhud/num_1.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_1_stroke.tga b/gfx/hud/wickedhud/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/wickedhud/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_2.tga b/gfx/hud/wickedhud/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/wickedhud/num_2.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_2_stroke.tga b/gfx/hud/wickedhud/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/wickedhud/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_3.tga b/gfx/hud/wickedhud/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/wickedhud/num_3.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_3_stroke.tga b/gfx/hud/wickedhud/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/wickedhud/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_4.tga b/gfx/hud/wickedhud/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/wickedhud/num_4.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_4_stroke.tga b/gfx/hud/wickedhud/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/wickedhud/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_5.tga b/gfx/hud/wickedhud/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/wickedhud/num_5.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_5_stroke.tga b/gfx/hud/wickedhud/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/wickedhud/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_6.tga b/gfx/hud/wickedhud/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/wickedhud/num_6.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_6_stroke.tga b/gfx/hud/wickedhud/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/wickedhud/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_7.tga b/gfx/hud/wickedhud/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/wickedhud/num_7.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_7_stroke.tga b/gfx/hud/wickedhud/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/wickedhud/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_8.tga b/gfx/hud/wickedhud/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/wickedhud/num_8.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_8_stroke.tga b/gfx/hud/wickedhud/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/wickedhud/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_9.tga b/gfx/hud/wickedhud/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/wickedhud/num_9.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_9_stroke.tga b/gfx/hud/wickedhud/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/wickedhud/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_colon.tga b/gfx/hud/wickedhud/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/wickedhud/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_colon_stroke.tga b/gfx/hud/wickedhud/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/wickedhud/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_dot.tga b/gfx/hud/wickedhud/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/wickedhud/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_dot_stroke.tga b/gfx/hud/wickedhud/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/wickedhud/num_dot_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_leading.tga b/gfx/hud/wickedhud/num_leading.tga
deleted file mode 100644 (file)
index f2f59d3..0000000
Binary files a/gfx/hud/wickedhud/num_leading.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_minus.tga b/gfx/hud/wickedhud/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/wickedhud/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_minus_stroke.tga b/gfx/hud/wickedhud/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/wickedhud/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_plus.tga b/gfx/hud/wickedhud/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/wickedhud/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/num_plus_stroke.tga b/gfx/hud/wickedhud/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/wickedhud/num_plus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newfail.tga b/gfx/hud/wickedhud/race_newfail.tga
deleted file mode 100644 (file)
index cd1164b..0000000
Binary files a/gfx/hud/wickedhud/race_newfail.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newrankgreen.tga b/gfx/hud/wickedhud/race_newrankgreen.tga
deleted file mode 100644 (file)
index c8fa157..0000000
Binary files a/gfx/hud/wickedhud/race_newrankgreen.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newrankyellow.tga b/gfx/hud/wickedhud/race_newrankyellow.tga
deleted file mode 100644 (file)
index 0af3c59..0000000
Binary files a/gfx/hud/wickedhud/race_newrankyellow.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newrecordserver.tga b/gfx/hud/wickedhud/race_newrecordserver.tga
deleted file mode 100644 (file)
index aa8bae1..0000000
Binary files a/gfx/hud/wickedhud/race_newrecordserver.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/race_newtime.tga b/gfx/hud/wickedhud/race_newtime.tga
deleted file mode 100644 (file)
index c9647b9..0000000
Binary files a/gfx/hud/wickedhud/race_newtime.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_1.tga b/gfx/hud/wickedhud/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_2.tga b/gfx/hud/wickedhud/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_3.tga b/gfx/hud/wickedhud/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_4.tga b/gfx/hud/wickedhud/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_5.tga b/gfx/hud/wickedhud/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_6.tga b/gfx/hud/wickedhud/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_7.tga b/gfx/hud/wickedhud/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/rifle_ring_8.tga b/gfx/hud/wickedhud/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/wickedhud/rifle_ring_8.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/shield.tga b/gfx/hud/wickedhud/shield.tga
deleted file mode 100644 (file)
index f13f0b4..0000000
Binary files a/gfx/hud/wickedhud/shield.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/statusbar.tga b/gfx/hud/wickedhud/statusbar.tga
deleted file mode 100644 (file)
index 987c8f5..0000000
Binary files a/gfx/hud/wickedhud/statusbar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/statusbar_vertical.tga b/gfx/hud/wickedhud/statusbar_vertical.tga
deleted file mode 100644 (file)
index e271438..0000000
Binary files a/gfx/hud/wickedhud/statusbar_vertical.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/strength.tga b/gfx/hud/wickedhud/strength.tga
deleted file mode 100644 (file)
index b19019d..0000000
Binary files a/gfx/hud/wickedhud/strength.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/voteprogress_back.tga b/gfx/hud/wickedhud/voteprogress_back.tga
deleted file mode 100644 (file)
index 2348be8..0000000
Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/voteprogress_prog.tga b/gfx/hud/wickedhud/voteprogress_prog.tga
deleted file mode 100644 (file)
index 574d5d7..0000000
Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/voteprogress_voted.tga b/gfx/hud/wickedhud/voteprogress_voted.tga
deleted file mode 100644 (file)
index ffc90a2..0000000
Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapon_accuracy.tga b/gfx/hud/wickedhud/weapon_accuracy.tga
deleted file mode 100644 (file)
index 4a451b1..0000000
Binary files a/gfx/hud/wickedhud/weapon_accuracy.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapon_current_bg.tga b/gfx/hud/wickedhud/weapon_current_bg.tga
deleted file mode 100644 (file)
index 5a8f936..0000000
Binary files a/gfx/hud/wickedhud/weapon_current_bg.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga b/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga
deleted file mode 100644 (file)
index f11c173..0000000
Binary files a/gfx/hud/wickedhud/weapon_hlacmod_renameit.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponcampingrifle.tga b/gfx/hud/wickedhud/weaponcampingrifle.tga
deleted file mode 100644 (file)
index fb6413b..0000000
Binary files a/gfx/hud/wickedhud/weaponcampingrifle.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponcrylink.tga b/gfx/hud/wickedhud/weaponcrylink.tga
deleted file mode 100644 (file)
index e48ad4d..0000000
Binary files a/gfx/hud/wickedhud/weaponcrylink.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponelectro.tga b/gfx/hud/wickedhud/weaponelectro.tga
deleted file mode 100644 (file)
index 73c791b..0000000
Binary files a/gfx/hud/wickedhud/weaponelectro.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponfireball.tga b/gfx/hud/wickedhud/weaponfireball.tga
deleted file mode 100644 (file)
index d7ea1fb..0000000
Binary files a/gfx/hud/wickedhud/weaponfireball.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapongrenadelauncher.tga b/gfx/hud/wickedhud/weapongrenadelauncher.tga
deleted file mode 100644 (file)
index c09081b..0000000
Binary files a/gfx/hud/wickedhud/weapongrenadelauncher.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponhagar.tga b/gfx/hud/wickedhud/weaponhagar.tga
deleted file mode 100644 (file)
index 69a7b72..0000000
Binary files a/gfx/hud/wickedhud/weaponhagar.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponhlac.tga b/gfx/hud/wickedhud/weaponhlac.tga
deleted file mode 100644 (file)
index 2ba3853..0000000
Binary files a/gfx/hud/wickedhud/weaponhlac.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponhook.tga b/gfx/hud/wickedhud/weaponhook.tga
deleted file mode 100644 (file)
index 0c7fd40..0000000
Binary files a/gfx/hud/wickedhud/weaponhook.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponlaser.tga b/gfx/hud/wickedhud/weaponlaser.tga
deleted file mode 100644 (file)
index 1f016e1..0000000
Binary files a/gfx/hud/wickedhud/weaponlaser.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponminstanex.tga b/gfx/hud/wickedhud/weaponminstanex.tga
deleted file mode 100644 (file)
index 26877c2..0000000
Binary files a/gfx/hud/wickedhud/weaponminstanex.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponnex.tga b/gfx/hud/wickedhud/weaponnex.tga
deleted file mode 100644 (file)
index 4ed91bc..0000000
Binary files a/gfx/hud/wickedhud/weaponnex.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponporto.tga b/gfx/hud/wickedhud/weaponporto.tga
deleted file mode 100644 (file)
index 46dd107..0000000
Binary files a/gfx/hud/wickedhud/weaponporto.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponrocketlauncher.tga b/gfx/hud/wickedhud/weaponrocketlauncher.tga
deleted file mode 100644 (file)
index f5449b3..0000000
Binary files a/gfx/hud/wickedhud/weaponrocketlauncher.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponseeker.tga b/gfx/hud/wickedhud/weaponseeker.tga
deleted file mode 100644 (file)
index 566ee86..0000000
Binary files a/gfx/hud/wickedhud/weaponseeker.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponshotgun.tga b/gfx/hud/wickedhud/weaponshotgun.tga
deleted file mode 100644 (file)
index 055841c..0000000
Binary files a/gfx/hud/wickedhud/weaponshotgun.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weapontuba.tga b/gfx/hud/wickedhud/weapontuba.tga
deleted file mode 100644 (file)
index 8b80015..0000000
Binary files a/gfx/hud/wickedhud/weapontuba.tga and /dev/null differ
diff --git a/gfx/hud/wickedhud/weaponuzi.tga b/gfx/hud/wickedhud/weaponuzi.tga
deleted file mode 100644 (file)
index c0e75d1..0000000
Binary files a/gfx/hud/wickedhud/weaponuzi.tga and /dev/null differ
diff --git a/gfx/menu/default/cursor_move.tga b/gfx/menu/default/cursor_move.tga
new file mode 100644 (file)
index 0000000..0264316
Binary files /dev/null and b/gfx/menu/default/cursor_move.tga differ
diff --git a/gfx/menu/default/cursor_resize.tga b/gfx/menu/default/cursor_resize.tga
new file mode 100644 (file)
index 0000000..475e224
Binary files /dev/null and b/gfx/menu/default/cursor_resize.tga differ
diff --git a/gfx/menu/default/cursor_resize2.tga b/gfx/menu/default/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..6c97fb8
Binary files /dev/null and b/gfx/menu/default/cursor_resize2.tga differ
index 6775942eeca3197348cf8eb13f29523321223271..79b0e83b7d43330ca4c777f5a3e27c1706792a13 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/hud_luminos_default.cfg b/hud_luminos_default.cfg
new file mode 100644 (file)
index 0000000..e5c137e
--- /dev/null
@@ -0,0 +1,195 @@
+seta hud_skin "luminos"
+seta hud_bg "border_horizontal"
+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 "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_panelorder "6 5 9 3 1 7 12 0 4 10 2 11 14 8 13 "
+
+seta hud_weaponicons 1
+seta hud_weaponicons_pos "0.908906 0.088047"
+seta hud_weaponicons_size "0.066564 0.641367"
+seta hud_weaponicons_bg "border_vertical"
+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_complainbubble "1"
+seta hud_weaponicons_complainbubble_padding "-10"
+seta hud_weaponicons_complainbubble_color_outofammo "0.8 0 0"
+seta hud_weaponicons_complainbubble_color_donthave "0.8 0.5 0"
+seta hud_weaponicons_complainbubble_color_unavailable "0 0.3 0.8"
+seta hud_weaponicons_ammo_color "0 1 0"
+seta hud_weaponicons_ammo_alpha "1"
+seta hud_weaponicons_aspect "1"
+
+seta hud_inventory 1
+seta hud_inventory_pos "0.193516 0.925605"
+seta hud_inventory_size "0.093750 0.061719"
+seta hud_inventory_bg ""
+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 "1"
+seta hud_inventory_iconalign "0"
+
+seta hud_powerups 1
+seta hud_powerups_pos "0.363282 0.015742"
+seta hud_powerups_size "0.262500 0.048047"
+seta hud_powerups_bg ""
+seta hud_powerups_bg_color ""
+seta hud_powerups_bg_color_team ""
+seta hud_powerups_bg_alpha "0"
+seta hud_powerups_bg_border ""
+seta hud_powerups_bg_padding ""
+seta hud_powerups_flip "1"
+seta hud_powerups_iconalign "0"
+seta hud_powerups_baralign "0"
+
+seta hud_healtharmor 1
+seta hud_healtharmor_pos "0.305859 0.925606"
+seta hud_healtharmor_size "0.311485 0.061230"
+seta hud_healtharmor_bg ""
+seta hud_healtharmor_bg_color ""
+seta hud_healtharmor_bg_color_team "0"
+seta hud_healtharmor_bg_alpha "1"
+seta hud_healtharmor_bg_border ""
+seta hud_healtharmor_bg_padding ""
+seta hud_healtharmor_flip "0
+seta hud_healtharmor_iconalign "0"
+seta hud_healtharmor_baralign "0"
+
+seta hud_notify 1
+seta hud_notify_pos "0.700625 0.747950"
+seta hud_notify_size "0.282500 0.180586"
+seta hud_notify_bg ""
+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_print "0"
+
+seta hud_timer 1
+seta hud_timer_pos "0.880000 0.012070"
+seta hud_timer_size "0.100000 0.032520"
+seta hud_timer_bg ""
+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 1
+seta hud_radar_pos "0.023750 0.024395"
+seta hud_radar_size "0.182969 0.224140"
+seta hud_radar_bg "border_vertical"
+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_score 1
+seta hud_score_pos "0.023516 0.925605"
+seta hud_score_size "0.152344 0.060254"
+seta hud_score_bg ""
+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.354531 0.206289"
+seta hud_racetimer_size "0.280000 0.093333"
+seta hud_racetimer_bg ""
+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.021094 0.650586"
+seta hud_vote_size "0.264218 0.102462"
+seta hud_vote_bg ""
+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.036563 0.271796"
+seta hud_modicons_size "0.084766 0.199903"
+seta hud_modicons_bg ""
+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 1
+seta hud_pressedkeys_pos "0.411562 0.545429"
+seta hud_pressedkeys_size "0.177656 0.120531"
+seta hud_pressedkeys_bg ""
+seta hud_pressedkeys_bg_color ""
+seta hud_pressedkeys_bg_color_team "0"
+seta hud_pressedkeys_bg_alpha "0"
+seta hud_pressedkeys_bg_border ""
+seta hud_pressedkeys_bg_padding ""
+seta hud_pressedkeys_aspect "1.600000"
+
+seta hud_chat 1
+seta hud_chat_pos "0.020000 0.774374"
+seta hud_chat_size "0.627968 0.112696"
+seta hud_chat_bg ""
+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 1
+seta hud_engineinfo_pos "0.860000 0.950000"
+seta hud_engineinfo_size "0.130000 0.034667"
+seta hud_engineinfo_bg ""
+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 ""
+
+seta hud_infomessages 1
+seta hud_infomessages_pos "0.388751 0.378243"
+seta hud_infomessages_size "0.233282 0.061679"
+seta hud_infomessages_bg ""
+seta hud_infomessages_bg_color ""
+seta hud_infomessages_bg_color_team ""
+seta hud_infomessages_bg_alpha "0"
+seta hud_infomessages_bg_border ""
+seta hud_infomessages_bg_padding ""
+
diff --git a/hud_wickedhud_big.cfg b/hud_wickedhud_big.cfg
deleted file mode 100644 (file)
index f41dcb5..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-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 "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.110000"
-seta hud_weaponicons_size "0.040000 0.440000"
-seta hud_weaponicons_bg "border_weaponicons"
-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.710000 0.900000"
-seta hud_inventory_size "0.150000 0.080000"
-seta hud_inventory_bg "border_inventory"
-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 "border_powerups"
-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.330000 0.850000"
-seta hud_healtharmor_size "0.340000 0.090000"
-seta hud_healtharmor_bg "border_healtharmor"
-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 0
-
-seta hud_notify 1
-seta hud_notify_pos "0.710000 0.570000"
-seta hud_notify_size "0.270000 0.280000"
-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.820000 0.017967"
-seta hud_timer_size "0.160000 0.052033"
-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 2
-seta hud_radar_pos "0.030000 0.080000"
-seta hud_radar_size "0.210000 0.250000"
-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.050000 0.900000"
-seta hud_score_size "0.240000 0.080000"
-seta hud_score_bg "border_score"
-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.020000 0.600000"
-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.880000 0.900000"
-seta hud_modicons_size "0.105000 0.070000"
-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 1
-seta hud_pressedkeys_pos "0.460000 0.740000"
-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.020000 0.710000"
-seta hud_chat_size "0.360000 0.100000"
-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 1
-seta hud_engineinfo_pos "0.020000 0.820000"
-seta hud_engineinfo_size "0.112500 0.030000"
-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 ""
-
diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg
deleted file mode 100644 (file)
index 7fc2584..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-seta hud_skin "wickedhud" "skin folder where to look for images"
-seta hud_bg "border" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
-seta hud_bg_color "0.875 0.375 0" "default background color for the panels, accepts \"shirt\" and \"pants\""
-seta hud_bg_color_team 0 "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
-seta hud_bg_alpha 1 "default alpha of the background"
-seta hud_bg_border 6 "default border size for the panels"
-seta hud_bg_padding 2 "default padding of contents from the border"
-seta hud_fg_alpha 1 "alpha of the foreground"
-
-seta hud_dock "dock_small" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
-seta hud_dock_color "0 0.1875 0.4375" "dock color, accepts \"shirt\" and \"pants\""
-seta hud_dock_color_team 0.7 "override dock color with team color in team games"
-seta hud_dock_alpha 1 "alpha of the dock"
-
-seta hud_progressbar_alpha "0.5" "alpha of progressbars"
-seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
-seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
-seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color"
-seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color"
-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_complainbubble 1 "complain bubble (out of ammo, weapon not available etc)"
-seta hud_weaponicons_complainbubble_padding -10 "padding for the complainbubble"
-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_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"
-seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_inventory_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-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_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"
-seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_healtharmor 1 "enable/disable this panel, 2 = combined health/armor display"
-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_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"
-seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_notify 1 "enable/disable this panel"
-seta hud_notify_pos "0.660000 0.600000" "position of this base of the panel"
-seta hud_notify_size "0.320000 0.330000" "size of this panel with all notifications on"
-seta hud_notify_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_notify_bg_color_team "" "override panel color with team color in team based games"
-seta hud_notify_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-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_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_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"
-seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_timer_bg_padding "0" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_radar 2 "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
-seta hud_radar_pos "0.030000 0.020000" "position of this base of the panel"
-seta hud_radar_size "0.190000 0.230000" "size of this panel"
-seta hud_radar_bg "border_radar" "if set to something else than \"\" = override default background"
-seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_radar_bg_color_team "" "override panel color with team color in team based games"
-seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-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_score 1 "enable/disable this panel"
-seta hud_score_pos "0.020000 0.930000" "position of this base of the panel"
-seta hud_score_size "0.150000 0.050000" "size of this panel"
-seta hud_score_bg "border_score" "if set to something else than \"\" = override default background"
-seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_score_bg_color_team "" "override panel color with team color in team based games"
-seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_racetimer 1 "enable/disable this panel"
-seta hud_racetimer_pos "0.360000 0.010000" "position of this base of the panel"
-seta hud_racetimer_size "0.280000 0.093333" "size of this panel"
-seta hud_racetimer_bg "border_timer" "if set to something else than \"\" = override default background"
-seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games"
-seta hud_racetimer_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_vote 1 "enable/disable this panel"
-seta hud_vote_pos "0.400000 0.800000" "position of this base of the panel"
-seta hud_vote_size "0.240000 0.080000" "size of this panel"
-seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
-seta hud_vote_bg "border_vote" "if set to something else than \"\" = override default background"
-seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_vote_bg_color_team "" "override panel color with team color in team based games"
-seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_modicons 1 "enable/disable this panel"
-seta hud_modicons_pos "0.560000 0.930000" "position of this base of the panel"
-seta hud_modicons_size "0.075000 0.050000" "size of this panel"
-seta hud_modicons_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_modicons_bg_color_team "" "override panel color with team color in team based games"
-seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_pressedkeys 1 "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
-seta hud_pressedkeys_pos "0.460000 0.730000" "position of this base of the panel"
-seta hud_pressedkeys_size "0.080000 0.062912" "size of this panel"
-seta hud_pressedkeys_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
-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_chat 1 "enable/disable this panel"
-seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel"
-seta hud_chat_size "0.360000 0.100000" "size of this panel"
-seta hud_chat_bg "border_chat" "if set to something else than \"\" = override default background"
-seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_chat_bg_color_team "" "override panel color with team color in team based games"
-seta hud_chat_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha"
-seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_engineinfo 1 "enable/disable this panel
-seta hud_engineinfo_pos "0.860000 0.950000" "position of this base of the panel"
-seta hud_engineinfo_size "0.130000 0.034667" "size of this panel"
-seta hud_engineinfo_bg "border_modicons" "if set to something else than \"\" = override default background"
-seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games"
-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_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
deleted file mode 100644 (file)
index ad2ae87..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-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 c1858ef03f7d1f7905ba87c063f725b855731e62..d30980ad7090d01676022e58ecad853ebc3953fb 100644 (file)
Binary files a/models/misc/chatbubble.spr_0.tga and b/models/misc/chatbubble.spr_0.tga differ
diff --git a/physicsNoQWBunny_easy.cfg b/physicsNoQWBunny_easy.cfg
new file mode 100644 (file)
index 0000000..ff8cd3b
--- /dev/null
@@ -0,0 +1,31 @@
+// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
+sv_gravity 800
+sv_maxspeed 400
+sv_maxairspeed 400
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 7
+edgefriction 1
+sv_stepheight 34
+sv_jumpvelocity 300
+sv_wateraccelerate -1
+sv_waterfriction -1
+sv_airaccel_sideways_friction -0.35
+sv_airaccel_qw -0.9475
+sv_airstopaccelerate 0
+sv_airstrafeaccelerate 0
+sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
+sv_aircontrol 125
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
+sv_jumpspeedcap_max_disable_on_ramps 1
index f12d5bbcfe16061d192352d49073e7c854b359d0..640a8e23cf135437a1bebd0bd2324f950234f952 100644 (file)
@@ -13,6 +13,7 @@ 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;
@@ -53,12 +54,25 @@ 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;
@@ -183,6 +197,7 @@ 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;
index 18e71d265dcc5bb952750faaccb77838518f792d..00f687d8fd9edf487e2d9c77ac03bb63de4ec0b8 100644 (file)
@@ -467,6 +467,12 @@ void HUD_Panel_ExportCfg(string cfgname)
                                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 HUD_PANEL_INVENTORY:
                                        fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_", panel_name, "_onlycurrent")), "\"", "\n"));
@@ -492,6 +498,9 @@ void HUD_Panel_ExportCfg(string cfgname)
                                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");
                }
@@ -1230,7 +1239,7 @@ void HUD_Panel_Mouse()
        if(highlightedPanel != -1)
                highlightedPanel_prev = highlightedPanel;
 
-       mousepos = mousepos + getmousepos();
+       mousepos = mousepos + getmousepos() * cvar("menu_mouse_speed");
 
        mousepos_x = bound(0, mousepos_x, vid_conwidth);
        mousepos_y = bound(0, mousepos_y, vid_conheight);
@@ -1328,21 +1337,58 @@ float weaponorder_cmp(float i, float j, entity pass)
        return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string)
 }
 
+float GetAmmoStat(float i)
+{
+       switch(i)
+       {
+               case 0: return STAT_SHELLS;
+               case 1: return STAT_NAILS;
+               case 2: return STAT_ROCKETS;
+               case 3: return STAT_CELLS;
+               case 4: return STAT_FUEL;
+               default: return -1;
+       }
+}
+
+float GetAmmoTypeForWep(float i)
+{
+       switch(i)
+       {
+               case WEP_SHOTGUN: return 0;
+               case WEP_UZI: return 1;
+               case WEP_CAMPINGRIFLE: return 1;
+               case WEP_GRENADE_LAUNCHER: return 2;
+               case WEP_ELECTRO: return 3;
+               case WEP_CRYLINK: return 3;
+               case WEP_HLAC: return 3;
+               case WEP_MINSTANEX: return 3;
+               case WEP_NEX: return 3;
+               case WEP_HAGAR: return 2;
+               case WEP_ROCKET_LAUNCHER: return 2;
+               case WEP_SEEKER: return 2;
+               case WEP_FIREBALL: return 4;
+               case WEP_HOOK: return 3;
+               default: return -1;
+       }
+}
+
+#define acc_color(i) stov(cvar_string(strcat("hud_weaponicons_accuracy_color", ftos(i))))
+#define MAX_ACCURACY_LEVELS 10
+float acc_lev[MAX_ACCURACY_LEVELS];
+
 void HUD_WeaponIcons(void)
 {
        if(!autocvar_hud_weaponicons && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_WEAPONICONS;
-       HUD_Panel_UpdateCvarsForId(id);
-       float alpha, stat_weapons; // "constants"
+       active_panel = HUD_PANEL_WEAPONICONS;
+       HUD_Panel_UpdateCvars(weaponicons);
        vector pos, mySize;
-       float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
+       float i, weapid, fade, weapon_stats, weapon_number, weapon_cnt;
 
        pos = panel_pos;
        mySize = panel_size;
 
-       stat_weapons = getstati(STAT_WEAPONS);
        weapon_cnt = 0;
        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
        {
@@ -1400,71 +1446,134 @@ void HUD_WeaponIcons(void)
 
        float rows, columns;
        rows = mySize_y/mySize_x;
-       rows = bound(1, floor((sqrt(4 * (2/1) * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
-       //                               ^^^ weapon icon aspect goes here
+       rows = bound(1, floor((sqrt(4 * autocvar_hud_weaponicons_aspect * rows * WEP_COUNT + rows * rows) + rows + 0.5) / 2), WEP_COUNT);
 
        columns = ceil(WEP_COUNT/rows);
        float row, column;
 
-       float a;
+       float a, type, fullammo;
        float when;
        when = autocvar_hud_weaponicons_complainbubble_time;
        float fadetime;
        fadetime = autocvar_hud_weaponicons_complainbubble_fadetime;
 
        vector color;
+       vector wpnpos;
+       vector wpnsize;
+
+       float acc_levels;
+       if(autocvar_hud_weaponicons_accuracy && !(gametype == GAME_RACE || gametype == GAME_CTS))
+       {
+               acc_levels = tokenize(cvar_string("hud_weaponicons_accuracy_color_levels"));
+               if (acc_levels > MAX_ACCURACY_LEVELS)
+                       acc_levels = MAX_ACCURACY_LEVELS;
+
+               for (i = 0; i < acc_levels; ++i)
+                       acc_lev[i] = stof(argv(i));
+       }
+
        for(i = 0; i < weapon_cnt; ++i)
        {
+               wpnpos = pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows);
+               wpnsize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows);
+
                self = weaponorder[i];
                weapid = self.impulse;
 
-               alpha = (self.weapon == activeweapon) ? 1 : 0.6;
-
-               weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
-               weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
-
                // draw background behind currently selected weapon
                if(self.weapon == activeweapon)
-                       drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL);
 
-               // draw the weapon accuracy on the HUD
-               if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
+               // draw the weapon accuracy
+               if(acc_levels)
                {
+                       float weapon_hit, weapon_damage;
+                       weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
                        if(weapon_damage)
+                       {
+                               weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
                                weapon_stats = floor(100 * weapon_hit / weapon_damage);
-
-                       // yellow_accuracy = value at which accuracy becomes yellow
-                       if(weapon_stats >= 100) {
-                               color_x = 0;
-                               color_y = 1;
-                       }
-                       else if(weapon_stats > autocvar_hud_weaponicons_accuracy_yellow) {
-                               color_x = 1 - (weapon_stats-autocvar_hud_weaponicons_accuracy_yellow)/(100-autocvar_hud_weaponicons_accuracy_yellow); // red value between 1 -> 0
-                               color_y = 1;
-                       } else {
-                               color_x = 1;
-                               color_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1
                        }
 
+                       // find the max level lower than weapon_stats
+                       float j;
+                       j = acc_levels-1;
+                       while ( j && weapon_stats < acc_lev[j] )
+                               --j;
+
+                       // inject color j+1 in color j, how much depending on how much weapon_stats is higher than level j
+                       float factor;
+                       factor = (weapon_stats - acc_lev[j]) / (acc_lev[j+1] - acc_lev[j]);
+                       color = acc_color(j);
+                       color = color + factor * (acc_color(j+1) - color);
+
                        if(weapon_damage)
-                               drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), color, panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin(wpnpos, "weapon_accuracy", wpnsize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
                }
 
                // draw the weapon icon
-               if((self.impulse >= 0) && (stat_weapons & self.weapons))
+               if((self.impulse >= 0) && (getstati(STAT_WEAPONS) & self.weapons))
                {
-                       drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '1 1 1', fade * panel_fg_alpha, DRAWFLAG_NORMAL);
 
                        if(autocvar_hud_weaponicons_number == 1) // weapon number
-                               drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawstring(wpnpos, ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                        else if(autocvar_hud_weaponicons_number == 2) // bind
-                               drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+                               drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+                       // draw ammo status bar
+                       if(autocvar_hud_weaponicons_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO)
+                       {
+                               a = 0;
+                               type = GetAmmoTypeForWep(weapid);
+                               if(type != -1)
+                                       a = getstati(GetAmmoStat(type)); // how much ammo do we have?
+
+                               if(a > 0)
+                               {
+                                       switch(type) {
+                                               case 0: fullammo = autocvar_hud_weaponicons_ammo_full_shells; break;
+                                               case 1: fullammo = autocvar_hud_weaponicons_ammo_full_nails; break;
+                                               case 2: fullammo = autocvar_hud_weaponicons_ammo_full_rockets; break;
+                                               case 3: fullammo = autocvar_hud_weaponicons_ammo_full_cells; break;
+                                               case 4: fullammo = autocvar_hud_weaponicons_ammo_full_fuel; break;
+                                               default: fullammo = 60;
+                                       }
+
+                                       vector barsize;
+                                       vector barpos;
+                                       if(wpnsize_x/wpnsize_y > autocvar_hud_weaponicons_aspect)
+                                       {
+                                               barsize_x = autocvar_hud_weaponicons_aspect * wpnsize_y;
+                                               barsize_y = wpnsize_y;
+
+                                               barpos_x = wpnpos_x + (wpnsize_x - barsize_x) / 2;
+                                               barpos_y = wpnpos_y;
+                                       }
+                                       else
+                                       {
+                                               barsize_y = 1/autocvar_hud_weaponicons_aspect * wpnsize_x;
+                                               barsize_x = wpnsize_x;
+
+                                               barpos_y = wpnpos_y + (wpnsize_y - barsize_y) / 2;
+                                               barpos_x = wpnpos_x;
+                                       }
+
+                                       drawsetcliparea(
+                                               barpos_x,
+                                               barpos_y,
+                                               barsize_x * bound(0, a/fullammo, 1),
+                                               barsize_y);
+                                       drawpic_aspect_skin(wpnpos, "weapon_ammo", wpnsize, autocvar_hud_weaponicons_ammo_color, panel_fg_alpha * autocvar_hud_weaponicons_ammo_alpha, DRAWFLAG_NORMAL);
+                                       drawresetcliparea();
+                               }
+                       }
                }
 
                // draw a "ghost weapon icon" if you don't have the weapon
                else
                {
-                       drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos, strcat("weapon", self.netname), wpnsize, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
                }
 
                // draw the complain message
@@ -1488,18 +1597,18 @@ void HUD_WeaponIcons(void)
                        string s;
                        if(complain_weapon_type == 0) {
                                s = "Out of ammo";
-                               color = '1 0 0';
+                               color = autocvar_hud_weaponicons_complainbubble_color_outofammo;
                        }
                        else if(complain_weapon_type == 1) {
                                s = "Don't have";
-                               color = '1 1 0';
+                               color = autocvar_hud_weaponicons_complainbubble_color_donthave;
                        }
                        else {
                                s = "Unavailable";
-                               color = '1 1 1';
+                               color = autocvar_hud_weaponicons_complainbubble_color_unavailable;
                        }
-                       drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, "weapon_complainbubble", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, s, eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows) - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                       drawpic_aspect_skin(wpnpos + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, "weapon_complainbubble", wpnsize - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawstring_aspect(wpnpos + '1 1 0' * autocvar_hud_weaponicons_complainbubble_padding, s, wpnsize - '2 2 0' * autocvar_hud_weaponicons_complainbubble_padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
 
                ++row;
@@ -1515,19 +1624,6 @@ void HUD_WeaponIcons(void)
 // Inventory (#1)
 //
 // TODO: macro
-float GetAmmoStat(float i)
-{
-       switch(i)
-       {
-               case 0: return STAT_SHELLS;
-               case 1: return STAT_NAILS;
-               case 2: return STAT_ROCKETS;
-               case 3: return STAT_CELLS;
-               case 4: return STAT_FUEL;
-               default: return -1;
-       }
-}
-
 float GetAmmoItemCode(float i)
 {
        switch(i)
@@ -1617,8 +1713,8 @@ void HUD_Inventory(void)
        if(!autocvar_hud_inventory && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_INVENTORY;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_INVENTORY;
+       HUD_Panel_UpdateCvars(inventory);
        float i, currently_selected;
 
        vector pos, mySize;
@@ -1731,8 +1827,8 @@ void HUD_Powerups(void) {
        if(!autocvar_hud_powerups && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_POWERUPS;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_POWERUPS;
+       HUD_Panel_UpdateCvars(powerups);
        float stat_items;
        stat_items = getstati(STAT_ITEMS);
 
@@ -1936,8 +2032,8 @@ void HUD_HealthArmor(void)
        if(!autocvar_hud_healtharmor && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_HEALTHARMOR;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_HEALTHARMOR;
+       HUD_Panel_UpdateCvars(healtharmor);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -2101,10 +2197,10 @@ void HUD_HealthArmor(void)
                        {
                                if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_healtharmor_baralign == 3) { // right align
                                        barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200);
-                                       barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+                                       barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
                                } else { // left align
                                        barpos = pos;
-                                       barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+                                       barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
                                }
 
                                HUD_Panel_GetProgressBarColor(leftname)
@@ -2575,6 +2671,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                } else if(type == INFO_RETURNFLAG) {
                        HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG);
                        print(s1, "^7 returned the ", s2, "\n");
+               } else if(type == INFO_CAPTUREFLAG) {
+                       HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG);
+                       print(s1, "^7 captured the ", s2, s3, "\n");
                }
        }
 }
@@ -2673,8 +2772,8 @@ void HUD_Notify (void)
        if(!autocvar_hud_notify && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_NOTIFY;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_NOTIFY;
+       HUD_Panel_UpdateCvars(notify);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -2700,7 +2799,6 @@ void HUD_Notify (void)
        fadetime = autocvar_hud_notify_fadetime;
 
        string s;
-       vector color;
 
        vector pos_attacker, pos_victim;
        vector weap_pos;
@@ -2743,105 +2841,98 @@ void HUD_Notify (void)
                        if(killnotify_deathtype[j] == DEATH_GENERIC)
                        {
                                s = "notify_death";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_NOAMMO)
                        {
                                s = "notify_outofammo";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_KILL)
                        {
                                s = "notify_selfkill";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_CAMP)
                        {
                                s = "notify_camping";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_RED)
                        {
-                               s = "notify_teamkill";
-                               color = '1 0 0';
+                               s = "notify_teamkill_red";
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
                        {
-                               s = "notify_teamkill";
-                               color = '0 0 1';
+                               s = "notify_teamkill_blue";
                        }
                        else if(killnotify_deathtype[j] == DEATH_DROWN)
                        {
-                               s = "notify_";
-                               color = '1 1 1';
+                               s = "notify_water";
                        }
                        else if(killnotify_deathtype[j] == DEATH_SLIME)
                        {
-                               s = "notify_";
-                               color = '1 1 1';
+                               s = "notify_slime";
                        }
                        else if(killnotify_deathtype[j] == DEATH_LAVA)
                        {
-                               s = "notify_";
-                               color = '1 1 1';
+                               s = "notify_lava";
                        }
                        else if(killnotify_deathtype[j] == DEATH_FALL)
                        {
-                               s = "notify_";
-                               color = '1 1 1';
+                               s = "notify_fall";
                        }
                        else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR)
                        {
-                               s = "notify_";
-                               color = '1 1 1';
+                               s = "notify_shootingstar";
                        }
                        else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM)
                        {
-                               s = "notify_";
-                               color = '1 1 1';
+                               s = "notify_death";
                        }
                        else if(killnotify_deathtype[j] == INFO_GOTFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
                                {
-                                       s = "flag_red_carrying";
-                                       color = '1 0 0';
+                                       s = "notify_red_taken";
                                }
                                else
                                {
-                                       s = "flag_blue_carrying";
-                                       color = '0 0 1';
+                                       s = "notify_blue_taken";
                                }
                        }
                        else if(killnotify_deathtype[j] == INFO_RETURNFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
                                {
-                                       s = "flag_red_taken";
-                                       color = '1 0 0';
+                                       s = "notify_red_returned";
                                }
                                else
                                {
-                                       s = "flag_blue_taken";
-                                       color = '0 0 1';
+                                       s = "notify_blue_returned";
                                }
                        }
                        else if(killnotify_deathtype[j] == INFO_LOSTFLAG)
                        {
                                if(killnotify_victims[j] == "^1RED^7 flag")
                                {
-                                       s = "flag_red_lost";
-                                       color = '1 0 0';
+                                       s = "notify_red_lost";
                                }
                                else
                                {
-                                       s = "flag_blue_lost";
-                                       color = '0 0 1';
+                                       s = "notify_blue_lost";
+                               }
+                       }
+                       else if(killnotify_deathtype[j] == INFO_CAPTUREFLAG)
+                       {
+                               if(killnotify_victims[j] == "^1RED^7 flag")
+                               {
+                                       s = "notify_red_captured";
+                               }
+                               else
+                               {
+                                       s = "notify_blue_captured";
                                }
                        }
                        if(s != "" && a)
                        {
-                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                                drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
@@ -2867,57 +2958,47 @@ void HUD_Notify (void)
                        if(autocvar__hud_configure) // example actions for config mode
                        {
                                s = "weaponelectro";
-                               color = '1 1 1';
                        }
                        else if(WEP_VALID(killnotify_deathtype[j]))
                        {
                                self = get_weaponinfo(killnotify_deathtype[j]);
                                s = strcat("weapon", self.netname);
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_RED)
                        {
-                               s = "notify_teamkill";
-                               color = '1 0 0';
+                               s = "notify_teamkill_red";
                        }
                        else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
                        {
-                               s = "notify_teamkill";
-                               color = '0 0 1';
+                               s = "notify_teamkill_red";
                        }
                        else if(killnotify_deathtype[j] == DEATH_DROWN)
                        {
                                s = "notify_water";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_SLIME)
                        {
                                s = "notify_slime";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_LAVA)
                        {
                                s = "notify_lava";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_FALL)
                        {
                                s = "notify_fall";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR)
                        {
                                s = "notify_shootingstar";
-                               color = '1 1 1';
                        }
                        else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right?
                        {
                                s = "notify_void";
-                               color = '1 1 1';
                        }
                        if(s != "" && a)
                        {
-                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                                drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                                drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
@@ -2946,8 +3027,8 @@ void HUD_Timer(void)
        if(!autocvar_hud_timer && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_TIMER;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_TIMER;
+       HUD_Panel_UpdateCvars(timer);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -2998,11 +3079,11 @@ void HUD_Timer(void)
 //
 void HUD_Radar(void)
 {
-       if (!(autocvar_hud_radar != 0 && (autocvar_hud_radar == 2 || teamplay || autocvar__hud_configure)))
+       if ((autocvar_hud_radar == 0 || (autocvar_hud_radar != 2 && !teamplay)) && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_RADAR;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_RADAR;
+       HUD_Panel_UpdateCvars(radar);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -3129,8 +3210,8 @@ void HUD_Score(void)
        if(!autocvar_hud_score && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_SCORE;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_SCORE;
+       HUD_Panel_UpdateCvars(score);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -3158,15 +3239,13 @@ void HUD_Score(void)
                                pl = world;
 
                score = me.(scores[ps_primary]);
-               timer = seconds_tostring(score/TIME_FACTOR);
-               timer = strcat(timer, ":", ftos_decimals(mod(score, TIME_FACTOR), log(TIME_FACTOR)));
+               timer = TIME_ENCODED_TOSTRING(score);
 
                if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
                        // distribution display
                        distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
 
-                       distrtimer = seconds_tostring(distribution/TIME_FACTOR);
-                       distrtimer = strcat(timer, ":", ftos_decimals(mod(distribution, TIME_FACTOR), log(TIME_FACTOR)));
+                       distrtimer = ftos(distribution/pow(10, TIME_DECIMALS));
 
                        if (distribution <= 0) {
                                distribution_color = '0 1 0';
@@ -3258,8 +3337,8 @@ void HUD_RaceTimer (void) {
        if(!autocvar_hud_racetimer && !(gametype == GAME_RACE || gametype == GAME_CTS) && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_RACETIMER;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_RACETIMER;
+       HUD_Panel_UpdateCvars(racetimer);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -3410,8 +3489,8 @@ void HUD_VoteWindow(void)
        if(!autocvar_hud_vote && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_VOTE;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_VOTE;
+       HUD_Panel_UpdateCvars(vote);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -3995,8 +4074,8 @@ void HUD_ModIcons(void)
        if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_MODICONS;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_MODICONS;
+       HUD_Panel_UpdateCvars(modicons);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -4041,8 +4120,8 @@ void HUD_DrawPressedKeys(void)
        if(!(spectatee_status > 0 || autocvar_hud_pressedkeys >= 2 || autocvar__hud_configure))
                return;
 
-       float id = HUD_PANEL_PRESSEDKEYS;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_PRESSEDKEYS;
+       HUD_Panel_UpdateCvars(pressedkeys);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -4054,23 +4133,26 @@ void HUD_DrawPressedKeys(void)
                mySize -= '2 2 0' * panel_bg_padding;
        }
 
-       // always force 2:1 aspect
-       vector newSize;
-       if(mySize_x/mySize_y > 2)
+       // force custom aspect
+       if(autocvar_hud_pressedkeys_aspect)
        {
-               newSize_x = 2 * mySize_y;
-               newSize_y = mySize_y;
+               vector newSize;
+               if(mySize_x/mySize_y > autocvar_hud_pressedkeys_aspect)
+               {
+                       newSize_x = autocvar_hud_pressedkeys_aspect * mySize_y;
+                       newSize_y = mySize_y;
 
-               pos_x = pos_x + (mySize_x - newSize_x) / 2;
-       }
-       else
-       {
-               newSize_y = 1/2 * mySize_x;
-               newSize_x = mySize_x;
+                       pos_x = pos_x + (mySize_x - newSize_x) / 2;
+               }
+               else
+               {
+                       newSize_y = 1/autocvar_hud_pressedkeys_aspect * mySize_x;
+                       newSize_x = mySize_x;
 
-               pos_y = pos_y + (mySize_y - newSize_y) / 2;
+                       pos_y = pos_y + (mySize_y - newSize_y) / 2;
+               }
+               mySize = newSize;
        }
-       mySize = newSize;
 
        vector keysize;
        keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5;
@@ -4095,8 +4177,8 @@ void HUD_Chat(void)
                return;
        }
 
-       float id = HUD_PANEL_CHAT;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_CHAT;
+       HUD_Panel_UpdateCvars(chat);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -4147,8 +4229,8 @@ void HUD_EngineInfo(void)
        if(!autocvar_hud_engineinfo && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_ENGINEINFO;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_ENGINEINFO;
+       HUD_Panel_UpdateCvars(engineinfo);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -4200,8 +4282,8 @@ void HUD_InfoMessages(void)
        if(!autocvar_hud_infomessages && !autocvar__hud_configure)
                return;
 
-       float id = HUD_PANEL_INFOMESSAGES;
-       HUD_Panel_UpdateCvarsForId(id);
+       active_panel = HUD_PANEL_INFOMESSAGES;
+       HUD_Panel_UpdateCvars(infomessages);
        vector pos, mySize;
        pos = panel_pos;
        mySize = panel_size;
@@ -4592,10 +4674,13 @@ void HUD_Main (void)
 
        float f;
        vector color;
-       if(teamplay && autocvar_hud_dock_color_team) {
+       if((teamplay) && autocvar_hud_dock_color_team) {
                f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team;
        }
+       else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) {
+               color = '1 0 0' * autocvar_hud_dock_color_team;
+       }
        else if(autocvar_hud_dock_color == "shirt") {
                f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color = colormapPaletteColor(floor(f / 16), 0);
index 9401c9b8f41c7cdc153d86cdc293471e246aad2b..9171393989a9b5d3208b7b97e899ce89f96c8174 100644 (file)
@@ -16,7 +16,6 @@ float hud_color_bg_team;
 float scoreboard_bottom;
 float weapon_hits[WEP_MAXCOUNT];
 float weapon_fired[WEP_MAXCOUNT];
-float weapon_number;
 
 float complain_weapon;
 string complain_weapon_name;
@@ -117,8 +116,10 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\
 
 // Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector.
 #define HUD_Panel_GetColor()\
-if(teamplay && panel_bg_color_team) {\
+if((teamplay) && panel_bg_color_team) {\
        panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1) * panel_bg_color_team;\
+} else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {\
+       panel_bg_color = '1 0 0' * panel_bg_color_team;\
 } else {\
        if(panel_bg_color_str == "") {\
                panel_bg_color = autocvar_hud_bg_color;\
@@ -257,7 +258,6 @@ if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\
 
 // Update all common cvars of given panel id
 #define HUD_Panel_UpdateCvarsForId(id) \
-active_panel = id; \
 switch(id) { \
        case HUD_PANEL_WEAPONICONS: HUD_Panel_UpdateCvars(weaponicons) break; \
        case HUD_PANEL_INVENTORY: HUD_Panel_UpdateCvars(inventory) break; \
index b0cb8712d1172c40722d9f7baba32e2cbac72a68..0e5ee12939b8d5a53527b720ae2663788eba706f 100644 (file)
@@ -980,6 +980,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                                rgb_x = 1;
                                rgb_y = weapon_stats/autocvar_hud_weaponicons_accuracy_yellow; // green value between 0 -> 1
                        }
+                       rgb_z = 0;
                        drawstring(pos + '1 0 0' * padding + '0 1 0' * height * (2/3), s, '1 1 0' * fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
                }
                pos_x += sbwidth/weapon_cnt * rows;
index 9eebbfb6c6753d53c73562bcd54cc82182c99cd4..775628e06871c5302191dadc321afa52c6e2651d 100644 (file)
@@ -575,6 +575,7 @@ float INFO_GOTFLAG = 10319;
 float INFO_PICKUPFLAG = 10320;
 float INFO_LOSTFLAG = 10321;
 float INFO_RETURNFLAG = 10322;
+float INFO_CAPTUREFLAG = 10323;
 
 // weapon requests
 float WR_SETUP         = 1; // (SVQC) setup weapon data
index 719425ca85dbf252f223b613885d1e1e7f59cc8f..7f0da65b39533270a04c3b14d4a0c6e957064694 100644 (file)
@@ -41,6 +41,7 @@
 #include "xonotic/slider.c"
 #include "xonotic/slider_resolution.c"
 #include "xonotic/checkbox.c"
+#include "xonotic/checkbox_string.c"
 #include "xonotic/radiobutton.c"
 #include "xonotic/nexposee.c"
 #include "xonotic/rootdialog.c"
@@ -81,6 +82,7 @@
 #include "xonotic/dialog_multiplayer_demo.c"
 #include "xonotic/demolist.c"
 #include "xonotic/colorpicker.c"
+#include "xonotic/colorpicker_string.c"
 #include "xonotic/cvarlist.c"
 #include "xonotic/dialog_settings_misc_cvars.c"
 #include "xonotic/dialog_hudsetup_exit.c"
@@ -96,4 +98,6 @@
 #include "xonotic/dialog_hudpanel_vote.c"
 #include "xonotic/dialog_hudpanel_modicons.c"
 #include "xonotic/dialog_hudpanel_chat.c"
+#include "xonotic/dialog_hudpanel_engineinfo.c"
+#include "xonotic/dialog_hudpanel_infomessages.c"
 #include "xonotic/dialog_hudpanel_weaponicons.c"
diff --git a/qcsrc/menu/xonotic/checkbox_string.c b/qcsrc/menu/xonotic/checkbox_string.c
new file mode 100644 (file)
index 0000000..3b6b36f
--- /dev/null
@@ -0,0 +1,69 @@
+#ifdef INTERFACE
+CLASS(XonoticCheckBoxString) EXTENDS(CheckBox)
+       METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string))
+       METHOD(XonoticCheckBoxString, setChecked, void(entity, float))
+       ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL)
+       ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX)
+       ATTRIB(XonoticCheckBoxString, yesString, string, string_null)
+       ATTRIB(XonoticCheckBoxString, noString, string, string_null)
+
+       ATTRIB(XonoticCheckBoxString, color, vector, SKINCOLOR_CHECKBOX_N)
+       ATTRIB(XonoticCheckBoxString, colorC, vector, SKINCOLOR_CHECKBOX_C)
+       ATTRIB(XonoticCheckBoxString, colorF, vector, SKINCOLOR_CHECKBOX_F)
+       ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D)
+
+       ATTRIB(XonoticCheckBoxString, cvarName, string, string_null)
+       METHOD(XonoticCheckBoxString, loadCvars, void(entity))
+       METHOD(XonoticCheckBoxString, saveCvars, void(entity))
+
+       ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT)
+       ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED)
+ENDCLASS(XonoticCheckBoxString)
+entity makeXonoticCheckBoxString(string, string, string, string);
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeXonoticCheckBoxString(string theYesValue, string theNoValue, string theCvar, string theText)
+{
+       entity me;
+       me = spawnXonoticCheckBoxString();
+       me.configureXonoticCheckBoxString(me, theYesValue, theNoValue, theCvar, theText);
+       return me;
+}
+void XonoticCheckBoxString_configureXonoticCheckBoxString(entity me, string theYesValue, string theNoValue, string theCvar, string theText)
+{
+       me.yesString = theYesValue;
+       me.noString = theNoValue;
+       me.checked = 0;
+       if(theCvar)
+       {
+               me.cvarName = theCvar;
+               me.tooltip = getZonedTooltipForIdentifier(theCvar);
+               me.loadCvars(me);
+       }
+       me.configureCheckBox(me, theText, me.fontSize, me.image);
+}
+void XonoticCheckBoxString_setChecked(entity me, float foo)
+{
+       me.checked = !me.checked;
+       me.saveCvars(me);
+}
+void XonoticCheckBoxString_loadCvars(entity me)
+{
+       if not(me.cvarName)
+               return;
+
+       if(cvar_string(me.cvarName) == me.yesString)
+               me.checked = 1;
+}
+void XonoticCheckBoxString_saveCvars(entity me)
+{
+       if not(me.cvarName)
+               return;
+
+       if(me.checked)
+               cvar_set(me.cvarName, me.yesString);
+       else
+               cvar_set(me.cvarName, me.noString);
+}
+#endif
diff --git a/qcsrc/menu/xonotic/colorpicker_string.c b/qcsrc/menu/xonotic/colorpicker_string.c
new file mode 100644 (file)
index 0000000..f56cc74
--- /dev/null
@@ -0,0 +1,79 @@
+#ifdef INTERFACE
+CLASS(XonoticColorpickerString) EXTENDS(Image)
+       METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string))
+       METHOD(XonoticColorpickerString, mousePress, float(entity, vector))
+       METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector))
+       METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector))
+       ATTRIB(XonoticColorpickerString, cvarName, string, string_null)
+       ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0')
+       ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER)
+       ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER)
+       ATTRIB(XonoticColorpickerString, focusable, float, 1)
+       METHOD(XonoticColorpickerString, draw, void(entity))
+       ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3)
+ENDCLASS(XonoticColorpickerString)
+entity makeXonoticColorpickerString(string theCvar);
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeXonoticColorpickerString(string theCvar)
+{
+       entity me;
+       me = spawnXonoticColorpickerString();
+       me.configureXonoticColorpickerString(me, theCvar);
+       return me;
+}
+
+void XonoticColorpickerString_configureXonoticColorpickerString(entity me, string theCvar)
+{
+       me.cvarName = theCvar;
+       me.configureImage(me, me.image);
+       me.prevcoords = '1 1 0';
+}
+
+float XonoticColorpickerString_mousePress(entity me, vector coords)
+{
+       me.mouseDrag(me, coords);
+       return 1;
+}
+
+float XonoticColorpickerString_mouseDrag(entity me, vector coords)
+{
+       if(me.disabled)
+               return 0;
+       vector margin;
+       margin = me.imagemargin;
+       if(coords_x >= margin_x)
+       if(coords_y >= margin_y)
+       if(coords_x <= 1 - margin_x)
+       if(coords_y <= 1 - margin_y)
+       {
+               cvar_set(me.cvarName, sprintf("%v", hslimage_color(coords, margin)));
+               me.prevcoords = coords;
+       }
+
+       return 1;
+}
+
+float XonoticColorpickerString_mouseRelease(entity me, vector coords)
+{
+       me.mouseDrag(me, coords);
+       return 1;
+}
+
+void XonoticColorpickerString_draw(entity me)
+{
+       float save;
+       save = draw_alpha;
+       if(me.disabled)
+               draw_alpha *= me.disabledAlpha;
+
+       SUPER(XonoticColorpickerString).draw(me);
+
+       if(me.disabled)
+               me.prevcoords = '1 1 0';
+       else
+               draw_Picture(me.imgOrigin + me.prevcoords - '0.05 0.125 0', strcat(me.src, "_selected"), '0.1 0.25 0', '1 1 1', 1);
+       draw_alpha = save;
+}
+#endif
index cd9f3854b903f60257b6668424fe09615e890d1f..7d163472202df04cfd3518f443f4d104c99f6cdc 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDChatDialog, fill, void(entity))
-       ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel Setup")
+       ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel")
        ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDChatDialog, rows, float, 15)
@@ -14,25 +14,70 @@ ENDCLASS(XonoticHUDChatDialog)
 void XonoticHUDChatDialog_fill(entity me)
 {
        entity e;
+       string panelname = "chat";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Chat entries:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat size:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(6, 20, 1, "con_chatsize"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat lifetime:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(5, 60, 5, "con_chattime"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_chat_bg_alpha"));
-       me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Font size:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(6, 16, 1, "con_chatsize"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(16, 40, 2, "con_chattime"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Message sound beep"));
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Chat beep sound"));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c
new file mode 100644 (file)
index 0000000..1e39cdf
--- /dev/null
@@ -0,0 +1,75 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDEngineInfoDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDEngineInfoDialog, fill, void(entity))
+       ATTRIB(XonoticHUDEngineInfoDialog, title, string, "Engine Info Panel")
+       ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDEngineInfoDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDEngineInfoDialog, rows, float, 15)
+       ATTRIB(XonoticHUDEngineInfoDialog, columns, float, 4)
+       ATTRIB(XonoticHUDEngineInfoDialog, name, string, "HUDengineinfo")
+ENDCLASS(XonoticHUDEngineInfoDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDEngineInfoDialog_fill(entity me)
+{
+       entity e;
+       string panelname = "engineinfo";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_engineinfo", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Engine info:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_engineinfo_framecounter_exponentialmovingaverage", "Use an averaging algorithm for fps"));
+}
+#endif
index e2e896b3840b2cb3b1c2ebbf5e14e0e9988a1619..7624d4cde0425b6858a5473c7b6de00d95d2e319 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDHealthArmorDialog, fill, void(entity))
-       ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel Setup")
+       ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel")
        ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 15)
@@ -14,26 +14,75 @@ ENDCLASS(XonoticHUDHealthArmorDialog)
 void XonoticHUDHealthArmorDialog_fill(entity me)
 {
        entity e;
+       string panelname = "healtharmor";
+       float i;
+
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Status:"));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_healtharmor"));
-                       e.addValue(e, "Disabled", "0");
-                       e.addValue(e, "Enabled", "1");
-                       e.addValue(e, "Combined h/a", "2");
-                       e.configureXonoticTextSliderValues(e);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor", "Enable panel"));
        me.TR(me);
-
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:"));
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_color_team"));
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "0", "Left"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "1", "Right"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "3", "Inward"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "4", "Outward"));
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                       me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_healtharmor_bg_alpha"));
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:"));
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip"));
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "1", "Right"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "3", "Inward"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "4", "Outward"));
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror"));
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip health and armor positions"));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c
new file mode 100644 (file)
index 0000000..92ecead
--- /dev/null
@@ -0,0 +1,75 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDInfoMessagesDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity))
+       ATTRIB(XonoticHUDInfoMessagesDialog, title, string, "Info Messages Panel")
+       ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDInfoMessagesDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDInfoMessagesDialog, rows, float, 15)
+       ATTRIB(XonoticHUDInfoMessagesDialog, columns, float, 4)
+       ATTRIB(XonoticHUDInfoMessagesDialog, name, string, "HUDinfomessages")
+ENDCLASS(XonoticHUDInfoMessagesDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDInfoMessagesDialog_fill(entity me)
+{
+       entity e;
+       string panelname = "infomessages";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_infomessages", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Info messages:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_infomessages_flip", "Flip align"));
+}
+#endif
index b67210a1e32e5c4e9edd994ef2e8bd23f601a364..863146593de8777d8db19381ab57393ca314d0db 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDInventoryDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDInventoryDialog, fill, void(entity))
-       ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel Setup")
+       ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel")
        ATTRIB(XonoticHUDInventoryDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDInventoryDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDInventoryDialog, rows, float, 15)
@@ -14,19 +14,67 @@ ENDCLASS(XonoticHUDInventoryDialog)
 void XonoticHUDInventoryDialog_fill(entity me)
 {
        entity e;
+       string panelname = "inventory";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Ammunition display:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show only current ammo type"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_inventory", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_inventory_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show Current Ammo Only"));             
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Align icon:"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_inventory_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_inventory_iconalign", "1", "Right"));
 }
 #endif
index 8635dae06cc85220d00a8113d1e217f99f33fd6d..08b5ec832c5ca3ec7994eb366b0d4b7655ec02c3 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDModIconsDialog, fill, void(entity))
-       ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel Setup")
+       ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel")
        ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDModIconsDialog, rows, float, 15)
@@ -14,17 +14,57 @@ ENDCLASS(XonoticHUDModIconsDialog)
 void XonoticHUDModIconsDialog_fill(entity me)
 {
        entity e;
+       string panelname = "modicons";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_modicons_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index 503d50a47fe9b83296c42886fd03186d836b9943..f0db4a0f7f00589c59c11b201d215442b3dd4750 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDNotificationDialog, fill, void(entity))
-       ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel Setup")
+       ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel")
        ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDNotificationDialog, rows, float, 15)
@@ -14,27 +14,73 @@ ENDCLASS(XonoticHUDNotificationDialog)
 void XonoticHUDNotificationDialog_fill(entity me)
 {
        entity e;
+       string panelname = "notify";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Notifications:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print notifications to the console"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip notify order"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry lifetime:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(3, 15, 1, "hud_notify_time"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_notify_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(3, 15, 1, "hud_notify_time"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message fadetime:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "hud_notify_fadetime"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print messages to console"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry fadetime:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.5, 5, 0.5, "hud_notify_fadetime"));
 }
 #endif
index b6d42326de1b99e0017a6e1a80cfd22955515475..31d98ddf12ee4d05620d9495e9bde73aad10c372 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDPowerupsDialog, fill, void(entity))
-       ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel Setup")
+       ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel")
        ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDPowerupsDialog, rows, float, 15)
@@ -14,21 +14,75 @@ ENDCLASS(XonoticHUDPowerupsDialog)
 void XonoticHUDPowerupsDialog_fill(entity me)
 {
        entity e;
+       string panelname = "powerups";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "0", "Left"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "1", "Right"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "3", "Inward"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "4", "Outward"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "1", "Right"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "3", "Inward"));
+                       me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "4", "Outward"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_powerups_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_mirror", "Mirror"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip strength and shield positions"));
 }
 #endif
index 9b66fc3cbac5fadfe8e57a4f531d16acb1a5a0b5..d847fbb90020b91ba787097109ed174083413c95 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDPressedKeysDialog, fill, void(entity))
-       ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel Setup")
+       ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel")
        ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15)
@@ -14,17 +14,65 @@ ENDCLASS(XonoticHUDPressedKeysDialog)
 void XonoticHUDPressedKeysDialog_fill(entity me)
 {
        entity e;
+       string panelname = "pressedkeys";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_pressedkeys"));
+                       e.addValue(e, "Panel disabled", "0");
+                       e.addValue(e, "Panel enabled when spectating", "1");
+                       e.addValue(e, "Panel always enabled", "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_pressedkeys", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_pressedkeys_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Forced aspect:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.25, 4, 0.25, "hud_pressedkeys_aspect"));
 }
 #endif
index 7fe0f682e9a693eb2f3b0c24af780563ccec7c61..edcbcc4eaa12572f0c324b506e9d2c05019ab08a 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDRaceTimerDialog, fill, void(entity))
-       ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel Setup")
+       ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel")
        ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15)
@@ -14,17 +14,57 @@ ENDCLASS(XonoticHUDRaceTimerDialog)
 void XonoticHUDRaceTimerDialog_fill(entity me)
 {
        entity e;
+       string panelname = "racetimer";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_racetimer_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index a0ead55ef921604541b9b0c8f2bcc50953fbf9cb..93006905ca7cc30849b3592586ef9f2645701c88 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDRadarDialog, fill, void(entity))
-       ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel Setup")
+       ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel")
        ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDRadarDialog, rows, float, 15)
@@ -14,37 +14,90 @@ ENDCLASS(XonoticHUDRadarDialog)
 void XonoticHUDRadarDialog_fill(entity me)
 {
        entity e;
+       string panelname = "radar";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar"));
+                       e.addValue(e, "Panel disabled", "0");
+                       e.addValue(e, "Panel enabled in teamgames", "1");
+                       e.addValue(e, "Panel always enabled", "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_radar", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_foreground_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Rotation:"));
-                       me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_rotation"));
-                               e.addValue(e, "Player", "0");
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Radar:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_radar_foreground_alpha"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Rotation:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_radar_rotation"));
+                               e.addValue(e, "Forward", "0");
                                e.addValue(e, "West", "1");
                                e.addValue(e, "South", "2");
                                e.addValue(e, "East", "3");
                                e.addValue(e, "North", "4");
                                e.configureXonoticTextSliderValues(e);
-               me.TR(me);
-                       me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom:"));
-                       me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_zoommode"));
-                               e.addValue(e, "Default", "0");
-                               e.addValue(e, "Zoomed", "1");
-                               e.addValue(e, "Always Zoomed", "2");
-                               e.addValue(e, "Zoomed Out", "3");
-                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Scale:"));
+               me.TD(me, 1, 2.6, e = makeXonoticSlider(1024, 8192, 512, "hud_radar_scale"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Zoom mode:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider("hud_radar_zoommode"));
+                               e.addValue(e, "Zoomed in", "0");
+                               e.addValue(e, "Zoomed out", "1");
+                               e.addValue(e, "Always zoomed", "2");
+                               e.addValue(e, "Never zoomed", "3");
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index 05fdb74f1076c1773aeca56f0bc1ba14f812c022..0cda2a3600f150dd6a2fa425083a512eda9ab657 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDScoreDialog, fill, void(entity))
-       ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel Setup")
+       ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel")
        ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDScoreDialog, rows, float, 15)
@@ -14,17 +14,57 @@ ENDCLASS(XonoticHUDScoreDialog)
 void XonoticHUDScoreDialog_fill(entity me)
 {
        entity e;
+       string panelname = "score";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_score_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
 }
 #endif
index 6bfa03b995b7dbc1d3b3f83846200ec3f69f4147..4242b06ad74bf3957e5d7d2b3a871f75575bd63c 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity))
-       ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel Setup")
+       ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel")
        ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDTimerDialog, rows, float, 15)
@@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDTimerDialog)
 void XonoticHUDTimerDialog_fill(entity me)
 {
        entity e;
+       string panelname = "timer";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Timer:"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_timer_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer_increment", "Show elapsed time"));
 }
 #endif
index e96af574aad69cd187a7897194ab13e17845a50f..e097e86b4a0d526b4f7e7e471a44ccd7bac2eb52 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDVoteDialog, fill, void(entity))
-       ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel Setup")
+       ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel")
        ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDVoteDialog, rows, float, 15)
@@ -14,17 +14,60 @@ ENDCLASS(XonoticHUDVoteDialog)
 void XonoticHUDVoteDialog_fill(entity me)
 {
        entity e;
+       string panelname = "vote";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_alpha"));
-       me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Alpha after voting:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_vote_alreadyvoted_alpha"));
 }
 #endif
index 1a55bced0bf95c9b09979e9adeac00dc6b359f58..27926ff77a3963845ed3c5c6ff05ee8a75c0f9c4 100644 (file)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDWeaponIconsDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDWeaponIconsDialog, fill, void(entity))
-       ATTRIB(XonoticHUDWeaponIconsDialog, title, string, "Weapon Icons Panel Setup")
+       ATTRIB(XonoticHUDWeaponIconsDialog, title, string, "Weapon Icons Panel")
        ATTRIB(XonoticHUDWeaponIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDWeaponIconsDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDWeaponIconsDialog, rows, float, 15)
@@ -14,19 +14,80 @@ ENDCLASS(XonoticHUDWeaponIconsDialog)
 void XonoticHUDWeaponIconsDialog_fill(entity me)
 {
        entity e;
+       string panelname = "weaponicons";
+       float i;
+
        me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_weaponicons", "Enable panel"));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
+                       setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+                               e.addValue(e, "Default", "");
+                               e.addValue(e, "Disable", "0");
+                               for(i = 1; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.4);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+                               e.addValue(e, "Default", "");
+                               for(i = 0; i <= 10; ++i)
+                                       e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+                               e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Weapon icons:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Show weapon ID as:"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_weaponicons_number", "0", "None"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_weaponicons_number", "1", "Number"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_weaponicons_number", "2", "Bind"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_weaponicons_accuracy", "Show Accuracy"));
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_weaponicons_ammo", "Show Ammo"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Ammo bar color:"));
+               me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_weaponicons_ammo_color"));
+                       setDependent(e, "hud_weaponicons_ammo", 1, 1);
                me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_weaponicons", "On/Off"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_color_team"));
-               me.TR(me);
-                       me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-                               me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_weaponicons_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_weaponicons_number", "Show Weapon Number"));
        me.TR(me);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Ammo bar alpha:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_weaponicons_ammo_alpha"));
+                       setDependent(e, "hud_weaponicons_ammo", 1, 1);
 }
 #endif
index f1cbfffc7555f42d1eedacc0b500811cc5d3b926..841f97eaa08bdff7c5dab5cbc2d03c023312ceeb 100644 (file)
@@ -89,6 +89,14 @@ void MainWindow_configureMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
+       i = spawnXonoticHUDEngineInfoDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+       i = spawnXonoticHUDInfoMessagesDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
        me.advancedDialog = i = spawnXonoticAdvancedDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
index 6ef82679444fc021f0e4d53b42bf278333cf9b8f..a75537907d7560e43e833221663c6659f20cd47c 100644 (file)
@@ -653,7 +653,7 @@ float CheatCommand(float argc)
          &n