Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 11:15:49 +0000 (14:15 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 11:15:49 +0000 (14:15 +0300)
206 files changed:
defaultXonotic.cfg
gfx/hud/default/ammo_bullets.tga
gfx/hud/default/ammo_cells.tga
gfx/hud/default/ammo_current_bg.tga
gfx/hud/default/ammo_fuel.tga
gfx/hud/default/ammo_rockets.tga
gfx/hud/default/ammo_shells.tga
gfx/hud/default/armor.tga
gfx/hud/default/border.tga
gfx/hud/default/border_chat.tga [deleted file]
gfx/hud/default/border_healtharmor.tga [deleted file]
gfx/hud/default/border_inventory.tga [deleted file]
gfx/hud/default/border_modicons.tga [deleted file]
gfx/hud/default/border_powerups.tga [deleted file]
gfx/hud/default/border_radar.tga [deleted file]
gfx/hud/default/border_score.tga [deleted file]
gfx/hud/default/border_timer.tga [deleted file]
gfx/hud/default/border_vote.tga [deleted file]
gfx/hud/default/border_weaponicons.tga [deleted file]
gfx/hud/default/dock.tga
gfx/hud/default/dock_small.tga [deleted file]
gfx/hud/default/flag_blue_carrying.tga
gfx/hud/default/flag_blue_lost.tga
gfx/hud/default/flag_blue_shielded.tga
gfx/hud/default/flag_blue_taken.tga
gfx/hud/default/flag_red_carrying.tga
gfx/hud/default/flag_red_lost.tga
gfx/hud/default/flag_red_shielded.tga
gfx/hud/default/flag_red_taken.tga
gfx/hud/default/health.tga
gfx/hud/default/key_backward.tga
gfx/hud/default/key_backward_inv.tga
gfx/hud/default/key_crouch.tga
gfx/hud/default/key_crouch_inv.tga
gfx/hud/default/key_forward.tga
gfx/hud/default/key_forward_inv.tga
gfx/hud/default/key_jump.tga
gfx/hud/default/key_jump_inv.tga
gfx/hud/default/key_left.tga
gfx/hud/default/key_left_inv.tga
gfx/hud/default/key_right.tga
gfx/hud/default/key_right_inv.tga
gfx/hud/default/notify_blue_captured.tga
gfx/hud/default/notify_blue_lost.tga
gfx/hud/default/notify_blue_returned.tga
gfx/hud/default/notify_blue_shielded.tga
gfx/hud/default/notify_blue_taken.tga
gfx/hud/default/notify_camping.tga
gfx/hud/default/notify_death.tga
gfx/hud/default/notify_fall.tga
gfx/hud/default/notify_headshot.tga
gfx/hud/default/notify_lava.tga
gfx/hud/default/notify_melee.tga
gfx/hud/default/notify_outofammo.tga
gfx/hud/default/notify_red_captured.tga
gfx/hud/default/notify_red_lost.tga
gfx/hud/default/notify_red_returned.tga
gfx/hud/default/notify_red_shielded.tga
gfx/hud/default/notify_red_taken.tga
gfx/hud/default/notify_selfkill.tga
gfx/hud/default/notify_shootingstar.tga
gfx/hud/default/notify_slime.tga
gfx/hud/default/notify_teamkill_blue.tga
gfx/hud/default/notify_teamkill_red.tga
gfx/hud/default/notify_void.tga
gfx/hud/default/notify_water.tga
gfx/hud/default/num_0.tga [deleted file]
gfx/hud/default/num_0_stroke.tga [deleted file]
gfx/hud/default/num_1.tga [deleted file]
gfx/hud/default/num_1_stroke.tga [deleted file]
gfx/hud/default/num_2.tga [deleted file]
gfx/hud/default/num_2_stroke.tga [deleted file]
gfx/hud/default/num_3.tga [deleted file]
gfx/hud/default/num_3_stroke.tga [deleted file]
gfx/hud/default/num_4.tga [deleted file]
gfx/hud/default/num_4_stroke.tga [deleted file]
gfx/hud/default/num_5.tga [deleted file]
gfx/hud/default/num_5_stroke.tga [deleted file]
gfx/hud/default/num_6.tga [deleted file]
gfx/hud/default/num_6_stroke.tga [deleted file]
gfx/hud/default/num_7.tga [deleted file]
gfx/hud/default/num_7_stroke.tga [deleted file]
gfx/hud/default/num_8.tga [deleted file]
gfx/hud/default/num_8_stroke.tga [deleted file]
gfx/hud/default/num_9.tga [deleted file]
gfx/hud/default/num_9_stroke.tga [deleted file]
gfx/hud/default/num_colon.tga [deleted file]
gfx/hud/default/num_colon_stroke.tga [deleted file]
gfx/hud/default/num_dot.tga [deleted file]
gfx/hud/default/num_dot_stroke.tga [deleted file]
gfx/hud/default/num_leading.tga
gfx/hud/default/num_minus.tga [deleted file]
gfx/hud/default/num_minus_stroke.tga [deleted file]
gfx/hud/default/num_plus.tga [deleted file]
gfx/hud/default/num_plus_stroke.tga [deleted file]
gfx/hud/default/race_newfail.tga
gfx/hud/default/race_newrankgreen.tga
gfx/hud/default/race_newrankyellow.tga
gfx/hud/default/race_newrecordserver.tga
gfx/hud/default/race_newtime.tga
gfx/hud/default/rifle_ring_1.tga [deleted file]
gfx/hud/default/rifle_ring_2.tga [deleted file]
gfx/hud/default/rifle_ring_3.tga [deleted file]
gfx/hud/default/rifle_ring_4.tga [deleted file]
gfx/hud/default/rifle_ring_5.tga [deleted file]
gfx/hud/default/rifle_ring_6.tga [deleted file]
gfx/hud/default/rifle_ring_7.tga [deleted file]
gfx/hud/default/rifle_ring_8.tga [deleted file]
gfx/hud/default/statusbar_vertical.tga
gfx/hud/default/voteprogress_back.tga
gfx/hud/default/voteprogress_prog.tga
gfx/hud/default/voteprogress_voted.tga
gfx/hud/default/weapon_accuracy.tga
gfx/hud/default/weapon_ammo.tga
gfx/hud/default/weapon_complainbubble.tga
gfx/hud/default/weapon_current_bg.tga
gfx/hud/default/weapon_hlacmod_renameit.tga
gfx/hud/default/weaponcampingrifle.tga
gfx/hud/default/weaponcrylink.tga
gfx/hud/default/weaponelectro.tga
gfx/hud/default/weaponfireball.tga
gfx/hud/default/weapongrenadelauncher.tga
gfx/hud/default/weaponhagar.tga
gfx/hud/default/weaponhlac.tga
gfx/hud/default/weaponhook.tga
gfx/hud/default/weaponlaser.tga
gfx/hud/default/weaponminstanex.tga
gfx/hud/default/weaponnex.tga
gfx/hud/default/weaponporto.tga
gfx/hud/default/weaponrocketlauncher.tga
gfx/hud/default/weaponseeker.tga
gfx/hud/default/weaponshotgun.tga
gfx/hud/default/weapontuba.tga
gfx/hud/default/weaponuzi.tga
gfx/hud/luminos/border.tga [new file with mode: 0644]
gfx/hud/luminos/border_horizontal.tga [deleted file]
gfx/hud/luminos/border_vertical.tga [deleted file]
gfx/hud/luminos/notify_blue_captured.tga
gfx/hud/luminos/notify_blue_returned.tga
gfx/hud/luminos/notify_headshot.tga [new file with mode: 0644]
gfx/hud/luminos/notify_melee.tga [new file with mode: 0644]
gfx/hud/luminos/notify_red_captured.tga
gfx/hud/luminos/notify_red_returned.tga
gfx/hud/luminos/notify_teamkill.tga [deleted file]
gfx/hud/luminos/notify_void.tga
gfx/hud/luminos/weapon_complainbubble.tga [new file with mode: 0644]
gfx/hud/luminos/weaponnex.tga
gfx/hud/old/num_0.tga [deleted file]
gfx/hud/old/num_0_stroke.tga [deleted file]
gfx/hud/old/num_1.tga [deleted file]
gfx/hud/old/num_1_stroke.tga [deleted file]
gfx/hud/old/num_2.tga [deleted file]
gfx/hud/old/num_2_stroke.tga [deleted file]
gfx/hud/old/num_3.tga [deleted file]
gfx/hud/old/num_3_stroke.tga [deleted file]
gfx/hud/old/num_4.tga [deleted file]
gfx/hud/old/num_4_stroke.tga [deleted file]
gfx/hud/old/num_5.tga [deleted file]
gfx/hud/old/num_5_stroke.tga [deleted file]
gfx/hud/old/num_6.tga [deleted file]
gfx/hud/old/num_6_stroke.tga [deleted file]
gfx/hud/old/num_7.tga [deleted file]
gfx/hud/old/num_7_stroke.tga [deleted file]
gfx/hud/old/num_8.tga [deleted file]
gfx/hud/old/num_8_stroke.tga [deleted file]
gfx/hud/old/num_9.tga [deleted file]
gfx/hud/old/num_9_stroke.tga [deleted file]
gfx/hud/old/num_colon.tga [deleted file]
gfx/hud/old/num_colon_stroke.tga [deleted file]
gfx/hud/old/num_dot.tga [deleted file]
gfx/hud/old/num_dot_stroke.tga [deleted file]
gfx/hud/old/num_leading.tga [deleted file]
gfx/hud/old/num_minus.tga [deleted file]
gfx/hud/old/num_minus_stroke.tga [deleted file]
gfx/hud/old/num_plus.tga [deleted file]
gfx/hud/old/num_plus_stroke.tga [deleted file]
gfx/hud/old/rifle_ring_1.tga [deleted file]
gfx/hud/old/rifle_ring_2.tga [deleted file]
gfx/hud/old/rifle_ring_3.tga [deleted file]
gfx/hud/old/rifle_ring_4.tga [deleted file]
gfx/hud/old/rifle_ring_5.tga [deleted file]
gfx/hud/old/rifle_ring_6.tga [deleted file]
gfx/hud/old/rifle_ring_7.tga [deleted file]
gfx/hud/old/rifle_ring_8.tga [deleted file]
gfx/rifle_ring_1.tga [new file with mode: 0644]
gfx/rifle_ring_2.tga [new file with mode: 0644]
gfx/rifle_ring_3.tga [new file with mode: 0644]
gfx/rifle_ring_4.tga [new file with mode: 0644]
gfx/rifle_ring_5.tga [new file with mode: 0644]
gfx/rifle_ring_6.tga [new file with mode: 0644]
gfx/rifle_ring_7.tga [new file with mode: 0644]
gfx/rifle_ring_8.tga [new file with mode: 0644]
hud_default.cfg
hud_luminos_default.cfg
physicsNoQWBunny-nexbased.cfg
physicsNoQWBunny-xpmbased.cfg [new file with mode: 0644]
physicsNoQWBunny.cfg [deleted file]
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/menu/xonotic/colorpicker_string.c
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
qcsrc/menu/xonotic/dialog_hudsetup_exit.c
qcsrc/server/g_damage.qc

index 8e4d45d364413adbf0c88777f28a36b996d5526f..8d6b38e3845a22daa79813fedb362292e434796c 100644 (file)
@@ -345,7 +345,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
-exec physicsNoQWBunny.cfg
+exec physicsNoQWBunny-nexbased.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"
@@ -1350,10 +1350,10 @@ seta hud_panel_weapons_accuracy_color1 "1 1 0"
 seta hud_panel_weapons_accuracy_color2 "0 1 0"
 seta hud_panel_weapons_accuracy_color_levels "0 20 100" "accuracy values at which a specified color (hud_panel_weapons_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_panel_weapons_ammo 1 "show ammo as a status bar"
-seta hud_panel_weapons_ammo_full_shells 40 "show 100% of the status bar at this ammo count"
-seta hud_panel_weapons_ammo_full_nails 100 "show 100% of the status bar at this ammo count"
-seta hud_panel_weapons_ammo_full_cells 60 "show 100% of the status bar at this ammo count"
-seta hud_panel_weapons_ammo_full_rockets 60 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_shells 50 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_nails 200 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_cells 80 "show 100% of the status bar at this ammo count"
+seta hud_panel_weapons_ammo_full_rockets 80 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count"
 
 seta hud_panel_notify_time 10 "time that a new entry stays until it fades out"
index e7cd01a25245df72d503debadf32a4d79285047a..8f3739d4821b01512a2a769f08c4212cc61fc3ce 100644 (file)
Binary files a/gfx/hud/default/ammo_bullets.tga and b/gfx/hud/default/ammo_bullets.tga differ
index 664eb232d20ba4fe22a3b108da4fa33b52daa7cd..4850763419258e81c8edb738f4f6178ef19e8868 100644 (file)
Binary files a/gfx/hud/default/ammo_cells.tga and b/gfx/hud/default/ammo_cells.tga differ
index bd072059911af2dcfbffe09b983ced3cd403668b..703627956c21ce2386eeadda0fe3b043135f8a57 100644 (file)
Binary files a/gfx/hud/default/ammo_current_bg.tga and b/gfx/hud/default/ammo_current_bg.tga differ
index 8450a2fec478011644c050409346d85c8890384b..4a3a2d5563a733f4fd0895a5eda3636d8f33fc16 100644 (file)
Binary files a/gfx/hud/default/ammo_fuel.tga and b/gfx/hud/default/ammo_fuel.tga differ
index c37f077b28450bea5eeee588b7761ef46db33fcc..9b34ea79389418aa3d65dc2a089bb3301a18a1ba 100644 (file)
Binary files a/gfx/hud/default/ammo_rockets.tga and b/gfx/hud/default/ammo_rockets.tga differ
index 59bea4b3e135b5afbcc2fc8de5d27f3f673b5699..f62c715625b7a3ca69e2c082fdf03c0f138503c8 100644 (file)
Binary files a/gfx/hud/default/ammo_shells.tga and b/gfx/hud/default/ammo_shells.tga differ
index 92046b488786611e4c1aba818c513c25c61b5052..f9e47011aa7c1a5631bcadd1a2778e0aaeffe705 100644 (file)
Binary files a/gfx/hud/default/armor.tga and b/gfx/hud/default/armor.tga differ
index 8ceee44525062106e8dcb827fd3fd664871977d5..3b76811ee60e8f8638625dd73cc73d4fb92d44b8 100644 (file)
Binary files a/gfx/hud/default/border.tga and b/gfx/hud/default/border.tga differ
diff --git a/gfx/hud/default/border_chat.tga b/gfx/hud/default/border_chat.tga
deleted file mode 100644 (file)
index 1cd065e..0000000
Binary files a/gfx/hud/default/border_chat.tga and /dev/null differ
diff --git a/gfx/hud/default/border_healtharmor.tga b/gfx/hud/default/border_healtharmor.tga
deleted file mode 100644 (file)
index 7109ab5..0000000
Binary files a/gfx/hud/default/border_healtharmor.tga and /dev/null differ
diff --git a/gfx/hud/default/border_inventory.tga b/gfx/hud/default/border_inventory.tga
deleted file mode 100644 (file)
index 20ae8f6..0000000
Binary files a/gfx/hud/default/border_inventory.tga and /dev/null differ
diff --git a/gfx/hud/default/border_modicons.tga b/gfx/hud/default/border_modicons.tga
deleted file mode 100644 (file)
index 5437b04..0000000
Binary files a/gfx/hud/default/border_modicons.tga and /dev/null differ
diff --git a/gfx/hud/default/border_powerups.tga b/gfx/hud/default/border_powerups.tga
deleted file mode 100644 (file)
index f8fbf44..0000000
Binary files a/gfx/hud/default/border_powerups.tga and /dev/null differ
diff --git a/gfx/hud/default/border_radar.tga b/gfx/hud/default/border_radar.tga
deleted file mode 100644 (file)
index a300f52..0000000
Binary files a/gfx/hud/default/border_radar.tga and /dev/null differ
diff --git a/gfx/hud/default/border_score.tga b/gfx/hud/default/border_score.tga
deleted file mode 100644 (file)
index a4d8b6c..0000000
Binary files a/gfx/hud/default/border_score.tga and /dev/null differ
diff --git a/gfx/hud/default/border_timer.tga b/gfx/hud/default/border_timer.tga
deleted file mode 100644 (file)
index c657136..0000000
Binary files a/gfx/hud/default/border_timer.tga and /dev/null differ
diff --git a/gfx/hud/default/border_vote.tga b/gfx/hud/default/border_vote.tga
deleted file mode 100644 (file)
index 13b948e..0000000
Binary files a/gfx/hud/default/border_vote.tga and /dev/null differ
diff --git a/gfx/hud/default/border_weaponicons.tga b/gfx/hud/default/border_weaponicons.tga
deleted file mode 100644 (file)
index 08e8dcd..0000000
Binary files a/gfx/hud/default/border_weaponicons.tga and /dev/null differ
index 9dd4e2f0f65bbf902e18139f8a19ded171f68a26..3163382bc5d26911795a5fb5e0a00c691c0e2b24 100644 (file)
Binary files a/gfx/hud/default/dock.tga and b/gfx/hud/default/dock.tga differ
diff --git a/gfx/hud/default/dock_small.tga b/gfx/hud/default/dock_small.tga
deleted file mode 100644 (file)
index 5135876..0000000
Binary files a/gfx/hud/default/dock_small.tga and /dev/null differ
index ace6a5f2c3a01c554eda6a1ba10944252499d5c2..1ddcbfab74d61f3fd8b1a6759386f3c9eb8a83c7 100644 (file)
Binary files a/gfx/hud/default/flag_blue_carrying.tga and b/gfx/hud/default/flag_blue_carrying.tga differ
index 67d894d82dfce9467ee18d6e90604b224d1eadab..b37ccd051515675f84e802796f7f8cc950cac435 100644 (file)
Binary files a/gfx/hud/default/flag_blue_lost.tga and b/gfx/hud/default/flag_blue_lost.tga differ
index a8993f6b2cc58a3e92f5ae12ceba9e1a81d970de..c1e89c57a9dbe5516ccc754ca10b8873cfaa3b7b 100644 (file)
Binary files a/gfx/hud/default/flag_blue_shielded.tga and b/gfx/hud/default/flag_blue_shielded.tga differ
index 6847e7cc19ed17384a8112b0d36b9bbfd1d4e3d7..70079cafe3a8fa32a98dd1860ca844848e9de510 100644 (file)
Binary files a/gfx/hud/default/flag_blue_taken.tga and b/gfx/hud/default/flag_blue_taken.tga differ
index 33930833233d10c4649fe955dc7fb7ce6456109d..8fda6e1140918ceb3f2d2668d4566f71fce092ed 100644 (file)
Binary files a/gfx/hud/default/flag_red_carrying.tga and b/gfx/hud/default/flag_red_carrying.tga differ
index f96e02147e738af1d0f051efe1b9b4138d04f00b..083ac4668fcde11a4503706056199405a337b169 100644 (file)
Binary files a/gfx/hud/default/flag_red_lost.tga and b/gfx/hud/default/flag_red_lost.tga differ
index e7ec491fd6bcc7bb49fcf053de2642a179a492c5..550d0b7c6c0cf156ab71ba44256aa31e34a5b728 100644 (file)
Binary files a/gfx/hud/default/flag_red_shielded.tga and b/gfx/hud/default/flag_red_shielded.tga differ
index bf71977e149ab7de484f221c14fab285c61a411f..a21a5ee62b0c208a7351e32d27c43f65a16464d0 100644 (file)
Binary files a/gfx/hud/default/flag_red_taken.tga and b/gfx/hud/default/flag_red_taken.tga differ
index 0ed8a9030f2bf26e77eb2c0dab51fad10b5b3bfb..26e40865c992fd6acf42e027b4480b896b057485 100644 (file)
Binary files a/gfx/hud/default/health.tga and b/gfx/hud/default/health.tga differ
index 4de0f33221888c307f98b5fa2883d9a556785d0a..2a2cbabe2cba13d5a188eab63eef07c4bd5f3f0d 100644 (file)
Binary files a/gfx/hud/default/key_backward.tga and b/gfx/hud/default/key_backward.tga differ
index bef0d1ca3ddde1e9d03bffd0c5e6326d2495d3d1..1b6b97300fdffe3b7d1dff9539a6bd49493561de 100644 (file)
Binary files a/gfx/hud/default/key_backward_inv.tga and b/gfx/hud/default/key_backward_inv.tga differ
index 00b2dfe449da7c70a099da3c026deb08d74e0f6e..701644101000e012826fabc6deadef2d7d429843 100644 (file)
Binary files a/gfx/hud/default/key_crouch.tga and b/gfx/hud/default/key_crouch.tga differ
index 2cdbda804d6b9b21970059b1a3ad2e151fb071ab..0f47c0988498597d200acd3bec639d53f9f46bb1 100644 (file)
Binary files a/gfx/hud/default/key_crouch_inv.tga and b/gfx/hud/default/key_crouch_inv.tga differ
index dfe223381bf585b6c80d017448398f9c2c5c6459..0354b18a1da0fd8b3375f26668d1cdd59e25a7d5 100644 (file)
Binary files a/gfx/hud/default/key_forward.tga and b/gfx/hud/default/key_forward.tga differ
index 7bbea6070fe830fb5f2602bc7d2b145a57e1e9e8..47c6154beebb3310583cd7a5f2d6be501b60cd9f 100644 (file)
Binary files a/gfx/hud/default/key_forward_inv.tga and b/gfx/hud/default/key_forward_inv.tga differ
index d02b2dbc88961f7d2be95ecdbdf58c6c2e4fdfde..70a92fabfb38c8df5941cff7e4f44d74c99e7aad 100644 (file)
Binary files a/gfx/hud/default/key_jump.tga and b/gfx/hud/default/key_jump.tga differ
index c54bb3763c0ed2b7f3d672cacf62d0fb20aad1ae..a62bcf247b8a4873dbef80d772f78ce0dee1c5af 100644 (file)
Binary files a/gfx/hud/default/key_jump_inv.tga and b/gfx/hud/default/key_jump_inv.tga differ
index 60fe71f17e0eca70dfd3d75b013f5d1613a9feb3..4bcf85f09703930e4df47bcc6d1462f98fa7ab4e 100644 (file)
Binary files a/gfx/hud/default/key_left.tga and b/gfx/hud/default/key_left.tga differ
index 92bc615e44891dd933a01abbbcf971eaa3b4c1f0..b6d6a2d3c013d1982ef746591f31bd3633be3f7b 100644 (file)
Binary files a/gfx/hud/default/key_left_inv.tga and b/gfx/hud/default/key_left_inv.tga differ
index 308c03b1e56d0c1b183448713c8e19a40024594e..4d4ee213dd3d53a122e0b8741740483af03ee157 100644 (file)
Binary files a/gfx/hud/default/key_right.tga and b/gfx/hud/default/key_right.tga differ
index 8f04be424ec8bd9e602877035796d29269fb93a7..f6fe631fc2a50dee1cdfc663574f31b64084847b 100644 (file)
Binary files a/gfx/hud/default/key_right_inv.tga and b/gfx/hud/default/key_right_inv.tga differ
index 7cff17eed29b0d2dae2b772ee6d960ad7bb335a1..55a2991ea2af3b938719b6f2ad4a1c9e05cbe05b 100644 (file)
Binary files a/gfx/hud/default/notify_blue_captured.tga and b/gfx/hud/default/notify_blue_captured.tga differ
index 67d894d82dfce9467ee18d6e90604b224d1eadab..435928d6442b9ad36bfd79e2ee8d5f838decfe9f 100644 (file)
Binary files a/gfx/hud/default/notify_blue_lost.tga and b/gfx/hud/default/notify_blue_lost.tga differ
index 8e8b67ffdae6984e4698d1e96f58edc06e52d323..0c663d72a48dbcb0b4835e6c71b49551e9180013 100644 (file)
Binary files a/gfx/hud/default/notify_blue_returned.tga and b/gfx/hud/default/notify_blue_returned.tga differ
index a8993f6b2cc58a3e92f5ae12ceba9e1a81d970de..977fe9ae221b147cd6bdf2afe0e5e590377654fd 100644 (file)
Binary files a/gfx/hud/default/notify_blue_shielded.tga and b/gfx/hud/default/notify_blue_shielded.tga differ
index 6847e7cc19ed17384a8112b0d36b9bbfd1d4e3d7..43f73aa44d62f5e7f896424e76cdf91ff66e24e0 100644 (file)
Binary files a/gfx/hud/default/notify_blue_taken.tga and b/gfx/hud/default/notify_blue_taken.tga differ
index 2766dd1ccf968b512018d167b4c8b02035faf3e6..a11e324a6dca0862997d60233db2ec97ed955333 100644 (file)
Binary files a/gfx/hud/default/notify_camping.tga and b/gfx/hud/default/notify_camping.tga differ
index d5e8045a20469d1e9489af8ec504fe9eb4cd055f..3a32ae3f2b65202724695c1d98b43eae76b874c4 100644 (file)
Binary files a/gfx/hud/default/notify_death.tga and b/gfx/hud/default/notify_death.tga differ
index febd1d03dca24c4f9578cfb5d2a6eea7d9ad3da2..98a7f4974587d8f86e77caad2f1f5a8ecd7feacf 100644 (file)
Binary files a/gfx/hud/default/notify_fall.tga and b/gfx/hud/default/notify_fall.tga differ
index d9c3e5a91195e73288908cedbb82d19226f5896c..17a76f856322b78662b152eb50801c5a827860e9 100644 (file)
Binary files a/gfx/hud/default/notify_headshot.tga and b/gfx/hud/default/notify_headshot.tga differ
index 3976e8ba3fef0cbb0f3295137adc3b28ddc61d30..1c777580f5985c3aa72112a115109ddbab6010fb 100644 (file)
Binary files a/gfx/hud/default/notify_lava.tga and b/gfx/hud/default/notify_lava.tga differ
index e4fa0c77cdab63e9a00639dbb63917f43ba7b617..2223d93759b5c27ab0ed62db845c9fb384c5fd77 100644 (file)
Binary files a/gfx/hud/default/notify_melee.tga and b/gfx/hud/default/notify_melee.tga differ
index 82a11dd83dd037d8699516d3becab4ce501af133..ecacf50a9b618b144a150f28bf9999502c960032 100644 (file)
Binary files a/gfx/hud/default/notify_outofammo.tga and b/gfx/hud/default/notify_outofammo.tga differ
index 72814ecc6960d1b91938e01720e5a07289146532..9c2077f33fcde244c1fdd049c182451f88c3377e 100644 (file)
Binary files a/gfx/hud/default/notify_red_captured.tga and b/gfx/hud/default/notify_red_captured.tga differ
index f96e02147e738af1d0f051efe1b9b4138d04f00b..ffc7dc09cff08726403ac78178d9cd4c4e53f419 100644 (file)
Binary files a/gfx/hud/default/notify_red_lost.tga and b/gfx/hud/default/notify_red_lost.tga differ
index deee4686d0d8e164514b53f47e549cc137f05043..3f3b54a6d772f255a94033f7858d41eb2d680cd2 100644 (file)
Binary files a/gfx/hud/default/notify_red_returned.tga and b/gfx/hud/default/notify_red_returned.tga differ
index e7ec491fd6bcc7bb49fcf053de2642a179a492c5..d3cef48570bfaeb5259d2868999c2952be092a41 100644 (file)
Binary files a/gfx/hud/default/notify_red_shielded.tga and b/gfx/hud/default/notify_red_shielded.tga differ
index bf71977e149ab7de484f221c14fab285c61a411f..9fa31f145c4f4748a9025e7958dac718e9465e07 100644 (file)
Binary files a/gfx/hud/default/notify_red_taken.tga and b/gfx/hud/default/notify_red_taken.tga differ
index 646a1a23814b5c07b5cab4679fae6e211cd3812f..98e62cfee79328c83b4babb6bbd8f26778254fdd 100644 (file)
Binary files a/gfx/hud/default/notify_selfkill.tga and b/gfx/hud/default/notify_selfkill.tga differ
index 048e0151fc3c4145f17be073929adb55e5157dfd..c8077a2ffcbe8fa2a133c1ed472de1d8e6355296 100644 (file)
Binary files a/gfx/hud/default/notify_shootingstar.tga and b/gfx/hud/default/notify_shootingstar.tga differ
index c08a6a3d483ac7223bcece355acf9c7aaa405e6c..11ae58baec172aecb888a04cd7717f934b87413b 100644 (file)
Binary files a/gfx/hud/default/notify_slime.tga and b/gfx/hud/default/notify_slime.tga differ
index a40920b204ada24a40da0b3ed7ff3445af9147ac..885b929d00ece0ace7b83e5fcf6052db836d0751 100644 (file)
Binary files a/gfx/hud/default/notify_teamkill_blue.tga and b/gfx/hud/default/notify_teamkill_blue.tga differ
index a40920b204ada24a40da0b3ed7ff3445af9147ac..96f007a0dfdd982a6b288d4df03d6ff7d418a42e 100644 (file)
Binary files a/gfx/hud/default/notify_teamkill_red.tga and b/gfx/hud/default/notify_teamkill_red.tga differ
index 1e2d280eb22e5dac5a0c77dd83b291da57bc32ab..8ebe761ef7da05df0f83d97c5dea5a5f00f4cd05 100644 (file)
Binary files a/gfx/hud/default/notify_void.tga and b/gfx/hud/default/notify_void.tga differ
index 8315f1266b0d32854b611862eaf61b9ea0478c6d..f04b3e5d0c33ce9afc9163b49d5367ec169cd034 100644 (file)
Binary files a/gfx/hud/default/notify_water.tga and b/gfx/hud/default/notify_water.tga differ
diff --git a/gfx/hud/default/num_0.tga b/gfx/hud/default/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/default/num_0.tga and /dev/null differ
diff --git a/gfx/hud/default/num_0_stroke.tga b/gfx/hud/default/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/default/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_1.tga b/gfx/hud/default/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/default/num_1.tga and /dev/null differ
diff --git a/gfx/hud/default/num_1_stroke.tga b/gfx/hud/default/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/default/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_2.tga b/gfx/hud/default/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/default/num_2.tga and /dev/null differ
diff --git a/gfx/hud/default/num_2_stroke.tga b/gfx/hud/default/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/default/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_3.tga b/gfx/hud/default/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/default/num_3.tga and /dev/null differ
diff --git a/gfx/hud/default/num_3_stroke.tga b/gfx/hud/default/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/default/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_4.tga b/gfx/hud/default/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/default/num_4.tga and /dev/null differ
diff --git a/gfx/hud/default/num_4_stroke.tga b/gfx/hud/default/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/default/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_5.tga b/gfx/hud/default/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/default/num_5.tga and /dev/null differ
diff --git a/gfx/hud/default/num_5_stroke.tga b/gfx/hud/default/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/default/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_6.tga b/gfx/hud/default/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/default/num_6.tga and /dev/null differ
diff --git a/gfx/hud/default/num_6_stroke.tga b/gfx/hud/default/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/default/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_7.tga b/gfx/hud/default/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/default/num_7.tga and /dev/null differ
diff --git a/gfx/hud/default/num_7_stroke.tga b/gfx/hud/default/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/default/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_8.tga b/gfx/hud/default/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/default/num_8.tga and /dev/null differ
diff --git a/gfx/hud/default/num_8_stroke.tga b/gfx/hud/default/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/default/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_9.tga b/gfx/hud/default/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/default/num_9.tga and /dev/null differ
diff --git a/gfx/hud/default/num_9_stroke.tga b/gfx/hud/default/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/default/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_colon.tga b/gfx/hud/default/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/default/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/default/num_colon_stroke.tga b/gfx/hud/default/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/default/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_dot.tga b/gfx/hud/default/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/default/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/default/num_dot_stroke.tga b/gfx/hud/default/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/default/num_dot_stroke.tga and /dev/null differ
index f2f59d3b0225fc76a4e3f68ec70801a6a2b983c4..668fbc653956d3462e97c4d42ac4fd56f59dc860 100644 (file)
Binary files a/gfx/hud/default/num_leading.tga and b/gfx/hud/default/num_leading.tga differ
diff --git a/gfx/hud/default/num_minus.tga b/gfx/hud/default/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/default/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/default/num_minus_stroke.tga b/gfx/hud/default/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/default/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/default/num_plus.tga b/gfx/hud/default/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/default/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/default/num_plus_stroke.tga b/gfx/hud/default/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/default/num_plus_stroke.tga and /dev/null differ
index cd1164bdf7c89ec4c79aa1fda37ed78143188a82..360d68a7e4fd1a21531d944f51060c284f971481 100644 (file)
Binary files a/gfx/hud/default/race_newfail.tga and b/gfx/hud/default/race_newfail.tga differ
index c8fa1577cbe4ac283f79648b905f3c5f08c240e5..ec3e2254ca180f2bbed1b2c038c4a41cb3138210 100644 (file)
Binary files a/gfx/hud/default/race_newrankgreen.tga and b/gfx/hud/default/race_newrankgreen.tga differ
index 0af3c593f587035ad96c4b9b6b479c5b0647da28..ec3e2254ca180f2bbed1b2c038c4a41cb3138210 100644 (file)
Binary files a/gfx/hud/default/race_newrankyellow.tga and b/gfx/hud/default/race_newrankyellow.tga differ
index aa8bae1a8189d8d4b98f8df00b9de6e0f7720212..99ed22b30fd3e88d6bf2f284f97b03928f102580 100644 (file)
Binary files a/gfx/hud/default/race_newrecordserver.tga and b/gfx/hud/default/race_newrecordserver.tga differ
index c9647b927b36dcbf67c93a99a9ee8249cbc07173..ab2f9054821a108feecd5a45ee9b9b8e2f953ed2 100644 (file)
Binary files a/gfx/hud/default/race_newtime.tga and b/gfx/hud/default/race_newtime.tga differ
diff --git a/gfx/hud/default/rifle_ring_1.tga b/gfx/hud/default/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/default/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_2.tga b/gfx/hud/default/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/default/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_3.tga b/gfx/hud/default/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/default/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_4.tga b/gfx/hud/default/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/default/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_5.tga b/gfx/hud/default/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/default/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_6.tga b/gfx/hud/default/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/default/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_7.tga b/gfx/hud/default/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/default/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/default/rifle_ring_8.tga b/gfx/hud/default/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/default/rifle_ring_8.tga and /dev/null differ
index e271438e35765b57e2852b49b511c9c597396005..3c2d1a8e09cb6fa464e9f161cc595b2e04a894a7 100644 (file)
Binary files a/gfx/hud/default/statusbar_vertical.tga and b/gfx/hud/default/statusbar_vertical.tga differ
index 2348be8251e606d6dc600a100816fc3f445c7a08..0ba103ed2619e40ca2410c89275b97ff6bd52d56 100644 (file)
Binary files a/gfx/hud/default/voteprogress_back.tga and b/gfx/hud/default/voteprogress_back.tga differ
index 574d5d70a68b67f2db1106093c35bddbfec42965..f24f52415876e25736de02166ec0392fc2f705c2 100644 (file)
Binary files a/gfx/hud/default/voteprogress_prog.tga and b/gfx/hud/default/voteprogress_prog.tga differ
index ffc90a255ca1b3466f94af61e85188f092089850..ee06048fcdcf90edf1bdab32703d67075c3a0049 100644 (file)
Binary files a/gfx/hud/default/voteprogress_voted.tga and b/gfx/hud/default/voteprogress_voted.tga differ
index 4a451b1bcfc33159d8dfc9366b58f15999703c5a..8dcf3aab73ef739182f64fa080669bde4700072f 100644 (file)
Binary files a/gfx/hud/default/weapon_accuracy.tga and b/gfx/hud/default/weapon_accuracy.tga differ
index cb1d3063620da5511fe861093d36d70af11d38fe..de4148cebc3cb2ea28ea52c73c49ed06f30d087f 100644 (file)
Binary files a/gfx/hud/default/weapon_ammo.tga and b/gfx/hud/default/weapon_ammo.tga differ
index a3c53a39d1b61bd83985b3648e02ad3e185c9525..349274f86f643e855dbe4934f43abc08000ed2a6 100644 (file)
Binary files a/gfx/hud/default/weapon_complainbubble.tga and b/gfx/hud/default/weapon_complainbubble.tga differ
index 5a8f9367153206da4c91d00b41b99d1454f094e9..688d8054dc9940be78f87254213d18ff3a6fe7de 100644 (file)
Binary files a/gfx/hud/default/weapon_current_bg.tga and b/gfx/hud/default/weapon_current_bg.tga differ
index f11c173ba8837278b45b83fb7db1e45d9fe665b9..601f3d7aa1ea35f972aec250eae6a3f79ed2e178 100644 (file)
Binary files a/gfx/hud/default/weapon_hlacmod_renameit.tga and b/gfx/hud/default/weapon_hlacmod_renameit.tga differ
index fb6413b14f27f877100630c82716fbe5dbef9b11..f5c2e55927abb160a5481d562c9399b5a6a822c7 100644 (file)
Binary files a/gfx/hud/default/weaponcampingrifle.tga and b/gfx/hud/default/weaponcampingrifle.tga differ
index e48ad4d24602692c99b38a5e5bb8c3f4f477575c..e7e283f3cc0e815b59e182374f746b70fa26fb02 100644 (file)
Binary files a/gfx/hud/default/weaponcrylink.tga and b/gfx/hud/default/weaponcrylink.tga differ
index 73c791b393a689a40676e14964c65d605aaa9b4b..75cdf0249014045b58806146db284b1ad9d1289f 100644 (file)
Binary files a/gfx/hud/default/weaponelectro.tga and b/gfx/hud/default/weaponelectro.tga differ
index d7ea1fb0494ca40a814f0b90f3648a11b8852ab6..05fc4feed8efe8ce8aabea4782d37b81f3f933b8 100644 (file)
Binary files a/gfx/hud/default/weaponfireball.tga and b/gfx/hud/default/weaponfireball.tga differ
index c09081b004f359cd2f1867b43a78f90d2832785d..24135f3cc295979bc5071a44a2dabab2adfb13b6 100644 (file)
Binary files a/gfx/hud/default/weapongrenadelauncher.tga and b/gfx/hud/default/weapongrenadelauncher.tga differ
index 69a7b729cfbf0c3f8c0b7d9d68741b5a19d7b796..5c04c8f92e36c5d37fb9d664e9a87791154d4a08 100644 (file)
Binary files a/gfx/hud/default/weaponhagar.tga and b/gfx/hud/default/weaponhagar.tga differ
index 2ba38534556d9d9614ea79bfa3eb70b4753dfa21..5375ab477d0563251975d55a933a5a69a924bc67 100644 (file)
Binary files a/gfx/hud/default/weaponhlac.tga and b/gfx/hud/default/weaponhlac.tga differ
index 0c7fd40b6bbd8652995f6b4455c254f8e8874b92..eaee8388f9e875e409b01b4ddd98abe0ac2ad0f7 100644 (file)
Binary files a/gfx/hud/default/weaponhook.tga and b/gfx/hud/default/weaponhook.tga differ
index 1f016e16d97d4b16b00ecc153c099245e76888f1..0afbb37d48124bb6f9b9a4f82998c45a1dcb43d4 100644 (file)
Binary files a/gfx/hud/default/weaponlaser.tga and b/gfx/hud/default/weaponlaser.tga differ
index 26877c2672a49ff06fd069d439e27afbaf54f408..3618778729fc6918db40260e421f6cbf86ab842e 100644 (file)
Binary files a/gfx/hud/default/weaponminstanex.tga and b/gfx/hud/default/weaponminstanex.tga differ
index 4ed91bc391b52eeb41aeeb3f8fc6e51ac5663416..e98e318aa9cdcf4ab5b3d26453f2ee81069e2573 100644 (file)
Binary files a/gfx/hud/default/weaponnex.tga and b/gfx/hud/default/weaponnex.tga differ
index 46dd107d6136bc6fa405dda1fbf7624fe21adaa8..3fbccf9dee9f9d50f81982e9386e2f4dd17fa74e 100644 (file)
Binary files a/gfx/hud/default/weaponporto.tga and b/gfx/hud/default/weaponporto.tga differ
index f5449b32c7b2f6718ae53f749f83d24289e4a57d..0fea76673ca8036f01acdd0d6a00269a28524912 100644 (file)
Binary files a/gfx/hud/default/weaponrocketlauncher.tga and b/gfx/hud/default/weaponrocketlauncher.tga differ
index 566ee86eddd45e0281bc37aa57d48133e2df1bdd..5630d524b39de00d2b7e79e96229ce53169ce64a 100644 (file)
Binary files a/gfx/hud/default/weaponseeker.tga and b/gfx/hud/default/weaponseeker.tga differ
index 055841c052e2cf8d646651c85a348611eed1ed65..438b1217dc97e665bab65f71a8b229487c5d5355 100644 (file)
Binary files a/gfx/hud/default/weaponshotgun.tga and b/gfx/hud/default/weaponshotgun.tga differ
index 8b8001594b7463f915ae3483405a638803f6476a..1617b7fac66a929a9d9ae2a6faaebb45d92f6313 100644 (file)
Binary files a/gfx/hud/default/weapontuba.tga and b/gfx/hud/default/weapontuba.tga differ
index c0e75d113368b90504df204a84e53bf24a25f623..4c037325d9f8fe78424182b9f3d4d41a86d8441d 100644 (file)
Binary files a/gfx/hud/default/weaponuzi.tga and b/gfx/hud/default/weaponuzi.tga differ
diff --git a/gfx/hud/luminos/border.tga b/gfx/hud/luminos/border.tga
new file mode 100644 (file)
index 0000000..3b76811
Binary files /dev/null and b/gfx/hud/luminos/border.tga differ
diff --git a/gfx/hud/luminos/border_horizontal.tga b/gfx/hud/luminos/border_horizontal.tga
deleted file mode 100644 (file)
index b628060..0000000
Binary files a/gfx/hud/luminos/border_horizontal.tga and /dev/null differ
diff --git a/gfx/hud/luminos/border_vertical.tga b/gfx/hud/luminos/border_vertical.tga
deleted file mode 100644 (file)
index 3b76811..0000000
Binary files a/gfx/hud/luminos/border_vertical.tga and /dev/null differ
index 04e923074cccfd1063e1cda8ab792877b25c2dc7..55a2991ea2af3b938719b6f2ad4a1c9e05cbe05b 100644 (file)
Binary files a/gfx/hud/luminos/notify_blue_captured.tga and b/gfx/hud/luminos/notify_blue_captured.tga differ
index c75de3b213af925d24ee2d46421cf3152aadcbcb..0c663d72a48dbcb0b4835e6c71b49551e9180013 100644 (file)
Binary files a/gfx/hud/luminos/notify_blue_returned.tga and b/gfx/hud/luminos/notify_blue_returned.tga differ
diff --git a/gfx/hud/luminos/notify_headshot.tga b/gfx/hud/luminos/notify_headshot.tga
new file mode 100644 (file)
index 0000000..17a76f8
Binary files /dev/null and b/gfx/hud/luminos/notify_headshot.tga differ
diff --git a/gfx/hud/luminos/notify_melee.tga b/gfx/hud/luminos/notify_melee.tga
new file mode 100644 (file)
index 0000000..2223d93
Binary files /dev/null and b/gfx/hud/luminos/notify_melee.tga differ
index 052be1339beb0c449b701663ccef210d52b45a67..9c2077f33fcde244c1fdd049c182451f88c3377e 100644 (file)
Binary files a/gfx/hud/luminos/notify_red_captured.tga and b/gfx/hud/luminos/notify_red_captured.tga differ
index c5c23de601d57fc938b72b41da2f963db32c5881..3f3b54a6d772f255a94033f7858d41eb2d680cd2 100644 (file)
Binary files a/gfx/hud/luminos/notify_red_returned.tga and b/gfx/hud/luminos/notify_red_returned.tga differ
diff --git a/gfx/hud/luminos/notify_teamkill.tga b/gfx/hud/luminos/notify_teamkill.tga
deleted file mode 100644 (file)
index a2dc308..0000000
Binary files a/gfx/hud/luminos/notify_teamkill.tga and /dev/null differ
index 2a613b6ec9c4c2bddf042fceedd1def52f72193f..8ebe761ef7da05df0f83d97c5dea5a5f00f4cd05 100644 (file)
Binary files a/gfx/hud/luminos/notify_void.tga and b/gfx/hud/luminos/notify_void.tga differ
diff --git a/gfx/hud/luminos/weapon_complainbubble.tga b/gfx/hud/luminos/weapon_complainbubble.tga
new file mode 100644 (file)
index 0000000..349274f
Binary files /dev/null and b/gfx/hud/luminos/weapon_complainbubble.tga differ
index b4e29495af7b69e97e2c3bc233305ff6d085af99..e98e318aa9cdcf4ab5b3d26453f2ee81069e2573 100644 (file)
Binary files a/gfx/hud/luminos/weaponnex.tga and b/gfx/hud/luminos/weaponnex.tga differ
diff --git a/gfx/hud/old/num_0.tga b/gfx/hud/old/num_0.tga
deleted file mode 100644 (file)
index f0ab2f1..0000000
Binary files a/gfx/hud/old/num_0.tga and /dev/null differ
diff --git a/gfx/hud/old/num_0_stroke.tga b/gfx/hud/old/num_0_stroke.tga
deleted file mode 100644 (file)
index e9c6e5b..0000000
Binary files a/gfx/hud/old/num_0_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_1.tga b/gfx/hud/old/num_1.tga
deleted file mode 100644 (file)
index 78f1f45..0000000
Binary files a/gfx/hud/old/num_1.tga and /dev/null differ
diff --git a/gfx/hud/old/num_1_stroke.tga b/gfx/hud/old/num_1_stroke.tga
deleted file mode 100644 (file)
index 1ff552f..0000000
Binary files a/gfx/hud/old/num_1_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_2.tga b/gfx/hud/old/num_2.tga
deleted file mode 100644 (file)
index 205dd03..0000000
Binary files a/gfx/hud/old/num_2.tga and /dev/null differ
diff --git a/gfx/hud/old/num_2_stroke.tga b/gfx/hud/old/num_2_stroke.tga
deleted file mode 100644 (file)
index 08d26df..0000000
Binary files a/gfx/hud/old/num_2_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_3.tga b/gfx/hud/old/num_3.tga
deleted file mode 100644 (file)
index 335b5da..0000000
Binary files a/gfx/hud/old/num_3.tga and /dev/null differ
diff --git a/gfx/hud/old/num_3_stroke.tga b/gfx/hud/old/num_3_stroke.tga
deleted file mode 100644 (file)
index a5fddda..0000000
Binary files a/gfx/hud/old/num_3_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_4.tga b/gfx/hud/old/num_4.tga
deleted file mode 100644 (file)
index 2b9f46f..0000000
Binary files a/gfx/hud/old/num_4.tga and /dev/null differ
diff --git a/gfx/hud/old/num_4_stroke.tga b/gfx/hud/old/num_4_stroke.tga
deleted file mode 100644 (file)
index fe87933..0000000
Binary files a/gfx/hud/old/num_4_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_5.tga b/gfx/hud/old/num_5.tga
deleted file mode 100644 (file)
index 8bb7043..0000000
Binary files a/gfx/hud/old/num_5.tga and /dev/null differ
diff --git a/gfx/hud/old/num_5_stroke.tga b/gfx/hud/old/num_5_stroke.tga
deleted file mode 100644 (file)
index 3a6978a..0000000
Binary files a/gfx/hud/old/num_5_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_6.tga b/gfx/hud/old/num_6.tga
deleted file mode 100644 (file)
index 1db8c0e..0000000
Binary files a/gfx/hud/old/num_6.tga and /dev/null differ
diff --git a/gfx/hud/old/num_6_stroke.tga b/gfx/hud/old/num_6_stroke.tga
deleted file mode 100644 (file)
index f64e178..0000000
Binary files a/gfx/hud/old/num_6_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_7.tga b/gfx/hud/old/num_7.tga
deleted file mode 100644 (file)
index 0099d68..0000000
Binary files a/gfx/hud/old/num_7.tga and /dev/null differ
diff --git a/gfx/hud/old/num_7_stroke.tga b/gfx/hud/old/num_7_stroke.tga
deleted file mode 100644 (file)
index 252e796..0000000
Binary files a/gfx/hud/old/num_7_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_8.tga b/gfx/hud/old/num_8.tga
deleted file mode 100644 (file)
index aa20157..0000000
Binary files a/gfx/hud/old/num_8.tga and /dev/null differ
diff --git a/gfx/hud/old/num_8_stroke.tga b/gfx/hud/old/num_8_stroke.tga
deleted file mode 100644 (file)
index e2cd39d..0000000
Binary files a/gfx/hud/old/num_8_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_9.tga b/gfx/hud/old/num_9.tga
deleted file mode 100644 (file)
index 87b9c21..0000000
Binary files a/gfx/hud/old/num_9.tga and /dev/null differ
diff --git a/gfx/hud/old/num_9_stroke.tga b/gfx/hud/old/num_9_stroke.tga
deleted file mode 100644 (file)
index 5a8d610..0000000
Binary files a/gfx/hud/old/num_9_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_colon.tga b/gfx/hud/old/num_colon.tga
deleted file mode 100644 (file)
index e22c09a..0000000
Binary files a/gfx/hud/old/num_colon.tga and /dev/null differ
diff --git a/gfx/hud/old/num_colon_stroke.tga b/gfx/hud/old/num_colon_stroke.tga
deleted file mode 100644 (file)
index 68ad28a..0000000
Binary files a/gfx/hud/old/num_colon_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_dot.tga b/gfx/hud/old/num_dot.tga
deleted file mode 100644 (file)
index 7fbfdd0..0000000
Binary files a/gfx/hud/old/num_dot.tga and /dev/null differ
diff --git a/gfx/hud/old/num_dot_stroke.tga b/gfx/hud/old/num_dot_stroke.tga
deleted file mode 100644 (file)
index 29ad696..0000000
Binary files a/gfx/hud/old/num_dot_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_leading.tga b/gfx/hud/old/num_leading.tga
deleted file mode 100644 (file)
index 0e5233c..0000000
Binary files a/gfx/hud/old/num_leading.tga and /dev/null differ
diff --git a/gfx/hud/old/num_minus.tga b/gfx/hud/old/num_minus.tga
deleted file mode 100644 (file)
index 10721f2..0000000
Binary files a/gfx/hud/old/num_minus.tga and /dev/null differ
diff --git a/gfx/hud/old/num_minus_stroke.tga b/gfx/hud/old/num_minus_stroke.tga
deleted file mode 100644 (file)
index 26455a0..0000000
Binary files a/gfx/hud/old/num_minus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/num_plus.tga b/gfx/hud/old/num_plus.tga
deleted file mode 100644 (file)
index 3cb17b3..0000000
Binary files a/gfx/hud/old/num_plus.tga and /dev/null differ
diff --git a/gfx/hud/old/num_plus_stroke.tga b/gfx/hud/old/num_plus_stroke.tga
deleted file mode 100644 (file)
index 7df2faa..0000000
Binary files a/gfx/hud/old/num_plus_stroke.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_1.tga b/gfx/hud/old/rifle_ring_1.tga
deleted file mode 100644 (file)
index a90927c..0000000
Binary files a/gfx/hud/old/rifle_ring_1.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_2.tga b/gfx/hud/old/rifle_ring_2.tga
deleted file mode 100644 (file)
index 6f6ca4c..0000000
Binary files a/gfx/hud/old/rifle_ring_2.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_3.tga b/gfx/hud/old/rifle_ring_3.tga
deleted file mode 100644 (file)
index 68f6df7..0000000
Binary files a/gfx/hud/old/rifle_ring_3.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_4.tga b/gfx/hud/old/rifle_ring_4.tga
deleted file mode 100644 (file)
index 0a5db15..0000000
Binary files a/gfx/hud/old/rifle_ring_4.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_5.tga b/gfx/hud/old/rifle_ring_5.tga
deleted file mode 100644 (file)
index d5cc95b..0000000
Binary files a/gfx/hud/old/rifle_ring_5.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_6.tga b/gfx/hud/old/rifle_ring_6.tga
deleted file mode 100644 (file)
index 4a126e7..0000000
Binary files a/gfx/hud/old/rifle_ring_6.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_7.tga b/gfx/hud/old/rifle_ring_7.tga
deleted file mode 100644 (file)
index 846212b..0000000
Binary files a/gfx/hud/old/rifle_ring_7.tga and /dev/null differ
diff --git a/gfx/hud/old/rifle_ring_8.tga b/gfx/hud/old/rifle_ring_8.tga
deleted file mode 100644 (file)
index 137e24d..0000000
Binary files a/gfx/hud/old/rifle_ring_8.tga and /dev/null differ
diff --git a/gfx/rifle_ring_1.tga b/gfx/rifle_ring_1.tga
new file mode 100644 (file)
index 0000000..a90927c
Binary files /dev/null and b/gfx/rifle_ring_1.tga differ
diff --git a/gfx/rifle_ring_2.tga b/gfx/rifle_ring_2.tga
new file mode 100644 (file)
index 0000000..6f6ca4c
Binary files /dev/null and b/gfx/rifle_ring_2.tga differ
diff --git a/gfx/rifle_ring_3.tga b/gfx/rifle_ring_3.tga
new file mode 100644 (file)
index 0000000..68f6df7
Binary files /dev/null and b/gfx/rifle_ring_3.tga differ
diff --git a/gfx/rifle_ring_4.tga b/gfx/rifle_ring_4.tga
new file mode 100644 (file)
index 0000000..0a5db15
Binary files /dev/null and b/gfx/rifle_ring_4.tga differ
diff --git a/gfx/rifle_ring_5.tga b/gfx/rifle_ring_5.tga
new file mode 100644 (file)
index 0000000..d5cc95b
Binary files /dev/null and b/gfx/rifle_ring_5.tga differ
diff --git a/gfx/rifle_ring_6.tga b/gfx/rifle_ring_6.tga
new file mode 100644 (file)
index 0000000..4a126e7
Binary files /dev/null and b/gfx/rifle_ring_6.tga differ
diff --git a/gfx/rifle_ring_7.tga b/gfx/rifle_ring_7.tga
new file mode 100644 (file)
index 0000000..846212b
Binary files /dev/null and b/gfx/rifle_ring_7.tga differ
diff --git a/gfx/rifle_ring_8.tga b/gfx/rifle_ring_8.tga
new file mode 100644 (file)
index 0000000..137e24d
Binary files /dev/null and b/gfx/rifle_ring_8.tga differ
index 8c7abe41349b173d16363265545df6fe415df95d..34fed7a999bf592509f95ad1c623a659aa8e5724 100644 (file)
@@ -1,7 +1,7 @@
 seta hud_skin "luminos"
-seta hud_panel_bg "border_horizontal"
+seta hud_panel_bg "border"
 seta hud_panel_bg_color "0.875 0.375 0"
-seta hud_panel_bg_color_team "0"
+seta hud_panel_bg_color_team "1"
 seta hud_panel_bg_alpha "1"
 seta hud_panel_bg_border "6"
 seta hud_panel_bg_padding "2"
@@ -9,7 +9,7 @@ seta hud_panel_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_color_team "0.600000"
 seta hud_dock_alpha "1"
 
 seta hud_progressbar_alpha "0.500000"
@@ -20,16 +20,16 @@ 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 "4 6 5 9 3 1 7 12 0 10 2 11 14 8 13 "
+seta _hud_panelorder "11 0 9 2 10 14 12 6 3 13 4 8 7 1 5 "
 
 seta hud_configure_grid "1"
-seta hud_configure_grid_xsize "0.01"
-seta hud_configure_grid_ysize "0.01"
+seta hud_configure_grid_xsize "0.005000"
+seta hud_configure_grid_ysize "0.005000"
 
 seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.908906 0.088047"
-seta hud_panel_weapons_size "0.066564 0.641367"
-seta hud_panel_weapons_bg "border_vertical"
+seta hud_panel_weapons_pos "0.915000 0.085000"
+seta hud_panel_weapons_size "0.060000 0.635000"
+seta hud_panel_weapons_bg ""
 seta hud_panel_weapons_bg_color ""
 seta hud_panel_weapons_bg_color_team ""
 seta hud_panel_weapons_bg_alpha ""
@@ -42,11 +42,11 @@ seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
 seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
 seta hud_panel_weapons_ammo_color "0 1 0"
 seta hud_panel_weapons_ammo_alpha "1"
-seta hud_panel_weapons_aspect "1"
+seta hud_panel_weapons_aspect "2"
 
 seta hud_panel_ammo 1
-seta hud_panel_ammo_pos "0.193516 0.925605"
-seta hud_panel_ammo_size "0.093750 0.061719"
+seta hud_panel_ammo_pos "0.190000 0.925000"
+seta hud_panel_ammo_size "0.095000 0.060000"
 seta hud_panel_ammo_bg ""
 seta hud_panel_ammo_bg_color ""
 seta hud_panel_ammo_bg_color_team ""
@@ -57,36 +57,36 @@ seta hud_panel_ammo_onlycurrent "1"
 seta hud_panel_ammo_iconalign "0"
 
 seta hud_panel_powerups 1
-seta hud_panel_powerups_pos "0.363282 0.015742"
+seta hud_panel_powerups_pos "0.365000 0.015000"
 seta hud_panel_powerups_size "0.262500 0.048047"
 seta hud_panel_powerups_bg ""
 seta hud_panel_powerups_bg_color ""
-seta hud_panel_powerups_bg_color_team ""
-seta hud_panel_powerups_bg_alpha "0"
+seta hud_panel_powerups_bg_color_team "1"
+seta hud_panel_powerups_bg_alpha ""
 seta hud_panel_powerups_bg_border ""
 seta hud_panel_powerups_bg_padding ""
 seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "0"
-seta hud_panel_powerups_baralign "0"
+seta hud_panel_powerups_iconalign "4"
+seta hud_panel_powerups_baralign "4"
 seta hud_panel_powerups_progressbar "1"
 
 seta hud_panel_healtharmor 1
-seta hud_panel_healtharmor_pos "0.305859 0.925606"
-seta hud_panel_healtharmor_size "0.311485 0.061230"
+seta hud_panel_healtharmor_pos "0.305000 0.925000"
+seta hud_panel_healtharmor_size "0.315000 0.060000"
 seta hud_panel_healtharmor_bg ""
 seta hud_panel_healtharmor_bg_color ""
-seta hud_panel_healtharmor_bg_color_team "0"
+seta hud_panel_healtharmor_bg_color_team "1"
 seta hud_panel_healtharmor_bg_alpha "1"
 seta hud_panel_healtharmor_bg_border ""
 seta hud_panel_healtharmor_bg_padding ""
 seta hud_panel_healtharmor_flip "0
-seta hud_panel_healtharmor_iconalign "0"
-seta hud_panel_healtharmor_baralign "0"
+seta hud_panel_healtharmor_iconalign "4"
+seta hud_panel_healtharmor_baralign "4"
 seta hud_panel_healtharmor_progressbar "1"
 
 seta hud_panel_notify 1
-seta hud_panel_notify_pos "0.663125 0.748536"
-seta hud_panel_notify_size "0.320000 0.180000"
+seta hud_panel_notify_pos "0.700000 0.740000"
+seta hud_panel_notify_size "0.280000 0.180000"
 seta hud_panel_notify_bg ""
 seta hud_panel_notify_bg_color ""
 seta hud_panel_notify_bg_color_team ""
@@ -107,9 +107,9 @@ seta hud_panel_timer_bg_border ""
 seta hud_panel_timer_bg_padding "0"
 
 seta hud_panel_radar 1
-seta hud_panel_radar_pos "0.023750 0.024395"
-seta hud_panel_radar_size "0.182969 0.224140"
-seta hud_panel_radar_bg "border_vertical"
+seta hud_panel_radar_pos "0.025000 0.025000"
+seta hud_panel_radar_size "0.180000 0.220000"
+seta hud_panel_radar_bg ""
 seta hud_panel_radar_bg_color ""
 seta hud_panel_radar_bg_color_team ""
 seta hud_panel_radar_bg_alpha ""
@@ -118,8 +118,8 @@ seta hud_panel_radar_bg_padding "-3"
 seta hud_panel_radar_foreground_alpha "0.800000"
 
 seta hud_panel_score 1
-seta hud_panel_score_pos "0.023516 0.925605"
-seta hud_panel_score_size "0.152344 0.060254"
+seta hud_panel_score_pos "0.025000 0.925000"
+seta hud_panel_score_size "0.145000 0.060000"
 seta hud_panel_score_bg ""
 seta hud_panel_score_bg_color ""
 seta hud_panel_score_bg_color_team ""
@@ -128,7 +128,7 @@ seta hud_panel_score_bg_border ""
 seta hud_panel_score_bg_padding ""
 
 seta hud_panel_racetimer 1
-seta hud_panel_racetimer_pos "0.354531 0.206289"
+seta hud_panel_racetimer_pos "0.355000 0.205000"
 seta hud_panel_racetimer_size "0.280000 0.093333"
 seta hud_panel_racetimer_bg ""
 seta hud_panel_racetimer_bg_color ""
@@ -138,7 +138,7 @@ seta hud_panel_racetimer_bg_border ""
 seta hud_panel_racetimer_bg_padding ""
 
 seta hud_panel_vote 1
-seta hud_panel_vote_pos "0.021094 0.650586"
+seta hud_panel_vote_pos "0.025000 0.660000"
 seta hud_panel_vote_size "0.264218 0.102462"
 seta hud_panel_vote_bg ""
 seta hud_panel_vote_bg_color ""
@@ -149,7 +149,7 @@ seta hud_panel_vote_bg_padding ""
 seta hud_panel_vote_alreadyvoted_alpha "0.750000"
 
 seta hud_panel_modicons 1
-seta hud_panel_modicons_pos "0.036563 0.271796"
+seta hud_panel_modicons_pos "0.040000 0.270000"
 seta hud_panel_modicons_size "0.084766 0.199903"
 seta hud_panel_modicons_bg ""
 seta hud_panel_modicons_bg_color ""
@@ -159,18 +159,18 @@ seta hud_panel_modicons_bg_border ""
 seta hud_panel_modicons_bg_padding ""
 
 seta hud_panel_pressedkeys 1
-seta hud_panel_pressedkeys_pos "0.411562 0.545429"
+seta hud_panel_pressedkeys_pos "0.410000 0.545000"
 seta hud_panel_pressedkeys_size "0.177656 0.120531"
 seta hud_panel_pressedkeys_bg ""
 seta hud_panel_pressedkeys_bg_color ""
-seta hud_panel_pressedkeys_bg_color_team "0"
+seta hud_panel_pressedkeys_bg_color_team "1"
 seta hud_panel_pressedkeys_bg_alpha "0"
 seta hud_panel_pressedkeys_bg_border ""
 seta hud_panel_pressedkeys_bg_padding ""
 seta hud_panel_pressedkeys_aspect "1.600000"
 
 seta hud_panel_chat 1
-seta hud_panel_chat_pos "0.020000 0.774374"
+seta hud_panel_chat_pos "0.020000 0.775000"
 seta hud_panel_chat_size "0.627968 0.112696"
 seta hud_panel_chat_bg ""
 seta hud_panel_chat_bg_color ""
@@ -180,8 +180,8 @@ seta hud_panel_chat_bg_border ""
 seta hud_panel_chat_bg_padding ""
 
 seta hud_panel_engineinfo 1
-seta hud_panel_engineinfo_pos "0.860000 0.950000"
-seta hud_panel_engineinfo_size "0.130000 0.034667"
+seta hud_panel_engineinfo_pos "0.860000 0.954667"
+seta hud_panel_engineinfo_size "0.125000 0.035000"
 seta hud_panel_engineinfo_bg ""
 seta hud_panel_engineinfo_bg_color ""
 seta hud_panel_engineinfo_bg_color_team ""
@@ -190,8 +190,8 @@ seta hud_panel_engineinfo_bg_border ""
 seta hud_panel_engineinfo_bg_padding ""
 
 seta hud_panel_infomessages 1
-seta hud_panel_infomessages_pos "0.388751 0.378243"
-seta hud_panel_infomessages_size "0.233282 0.061679"
+seta hud_panel_infomessages_pos "0.340000 0.350000"
+seta hud_panel_infomessages_size "0.320000 0.085000"
 seta hud_panel_infomessages_bg ""
 seta hud_panel_infomessages_bg_color ""
 seta hud_panel_infomessages_bg_color_team ""
index 731a187416d5c349eb7547be6c4fdb5c320239ea..8d1436a18a1224a0082f7c79dd41ffca329fbbfe 100644 (file)
@@ -1,7 +1,7 @@
 seta hud_skin "luminos"
-seta hud_panel_bg "border_horizontal"
+seta hud_panel_bg "border"
 seta hud_panel_bg_color "0.875 0.375 0"
-seta hud_panel_bg_color_team "0"
+seta hud_panel_bg_color_team "1"
 seta hud_panel_bg_alpha "1"
 seta hud_panel_bg_border "6"
 seta hud_panel_bg_padding "2"
@@ -9,7 +9,7 @@ seta hud_panel_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_color_team "0.600000"
 seta hud_dock_alpha "1"
 
 seta hud_progressbar_alpha "0.500000"
@@ -20,16 +20,16 @@ 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 "4 6 5 9 3 1 7 12 0 10 2 11 14 8 13 "
+seta _hud_panelorder "11 0 9 2 10 14 12 6 3 13 4 8 7 1 5 "
 
 seta hud_configure_grid "1"
-seta hud_configure_grid_xsize "0.01"
-seta hud_configure_grid_ysize "0.01"
+seta hud_configure_grid_xsize "0.005000"
+seta hud_configure_grid_ysize "0.005000"
 
 seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.908906 0.088047"
-seta hud_panel_weapons_size "0.066564 0.641367"
-seta hud_panel_weapons_bg "border_vertical"
+seta hud_panel_weapons_pos "0.915000 0.085000"
+seta hud_panel_weapons_size "0.060000 0.635000"
+seta hud_panel_weapons_bg ""
 seta hud_panel_weapons_bg_color ""
 seta hud_panel_weapons_bg_color_team ""
 seta hud_panel_weapons_bg_alpha ""
@@ -42,11 +42,11 @@ seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
 seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
 seta hud_panel_weapons_ammo_color "0 1 0"
 seta hud_panel_weapons_ammo_alpha "1"
-seta hud_panel_weapons_aspect "1"
+seta hud_panel_weapons_aspect "2"
 
 seta hud_panel_ammo 1
-seta hud_panel_ammo_pos "0.193516 0.925605"
-seta hud_panel_ammo_size "0.093750 0.061719"
+seta hud_panel_ammo_pos "0.190000 0.925000"
+seta hud_panel_ammo_size "0.095000 0.060000"
 seta hud_panel_ammo_bg ""
 seta hud_panel_ammo_bg_color ""
 seta hud_panel_ammo_bg_color_team ""
@@ -57,36 +57,36 @@ seta hud_panel_ammo_onlycurrent "1"
 seta hud_panel_ammo_iconalign "0"
 
 seta hud_panel_powerups 1
-seta hud_panel_powerups_pos "0.363282 0.015742"
+seta hud_panel_powerups_pos "0.365000 0.015000"
 seta hud_panel_powerups_size "0.262500 0.048047"
 seta hud_panel_powerups_bg ""
 seta hud_panel_powerups_bg_color ""
-seta hud_panel_powerups_bg_color_team ""
-seta hud_panel_powerups_bg_alpha "0"
+seta hud_panel_powerups_bg_color_team "1"
+seta hud_panel_powerups_bg_alpha ""
 seta hud_panel_powerups_bg_border ""
 seta hud_panel_powerups_bg_padding ""
 seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "0"
-seta hud_panel_powerups_baralign "0"
+seta hud_panel_powerups_iconalign "4"
+seta hud_panel_powerups_baralign "4"
 seta hud_panel_powerups_progressbar "1"
 
 seta hud_panel_healtharmor 1
-seta hud_panel_healtharmor_pos "0.305859 0.925606"
-seta hud_panel_healtharmor_size "0.311485 0.061230"
+seta hud_panel_healtharmor_pos "0.305000 0.925000"
+seta hud_panel_healtharmor_size "0.315000 0.060000"
 seta hud_panel_healtharmor_bg ""
 seta hud_panel_healtharmor_bg_color ""
-seta hud_panel_healtharmor_bg_color_team "0"
+seta hud_panel_healtharmor_bg_color_team "1"
 seta hud_panel_healtharmor_bg_alpha "1"
 seta hud_panel_healtharmor_bg_border ""
 seta hud_panel_healtharmor_bg_padding ""
 seta hud_panel_healtharmor_flip "0
-seta hud_panel_healtharmor_iconalign "0"
-seta hud_panel_healtharmor_baralign "0"
+seta hud_panel_healtharmor_iconalign "4"
+seta hud_panel_healtharmor_baralign "4"
 seta hud_panel_healtharmor_progressbar "1"
 
 seta hud_panel_notify 1
-seta hud_panel_notify_pos "0.663125 0.748536"
-seta hud_panel_notify_size "0.320000 0.180000"
+seta hud_panel_notify_pos "0.700000 0.740000"
+seta hud_panel_notify_size "0.280000 0.180000"
 seta hud_panel_notify_bg ""
 seta hud_panel_notify_bg_color ""
 seta hud_panel_notify_bg_color_team ""
@@ -107,9 +107,9 @@ seta hud_panel_timer_bg_border ""
 seta hud_panel_timer_bg_padding "0"
 
 seta hud_panel_radar 1
-seta hud_panel_radar_pos "0.023750 0.024395"
-seta hud_panel_radar_size "0.182969 0.224140"
-seta hud_panel_radar_bg "border_vertical"
+seta hud_panel_radar_pos "0.025000 0.025000"
+seta hud_panel_radar_size "0.180000 0.220000"
+seta hud_panel_radar_bg ""
 seta hud_panel_radar_bg_color ""
 seta hud_panel_radar_bg_color_team ""
 seta hud_panel_radar_bg_alpha ""
@@ -118,8 +118,8 @@ seta hud_panel_radar_bg_padding "-3"
 seta hud_panel_radar_foreground_alpha "0.800000"
 
 seta hud_panel_score 1
-seta hud_panel_score_pos "0.023516 0.925605"
-seta hud_panel_score_size "0.152344 0.060254"
+seta hud_panel_score_pos "0.025000 0.925000"
+seta hud_panel_score_size "0.145000 0.060000"
 seta hud_panel_score_bg ""
 seta hud_panel_score_bg_color ""
 seta hud_panel_score_bg_color_team ""
@@ -128,7 +128,7 @@ seta hud_panel_score_bg_border ""
 seta hud_panel_score_bg_padding ""
 
 seta hud_panel_racetimer 1
-seta hud_panel_racetimer_pos "0.354531 0.206289"
+seta hud_panel_racetimer_pos "0.355000 0.205000"
 seta hud_panel_racetimer_size "0.280000 0.093333"
 seta hud_panel_racetimer_bg ""
 seta hud_panel_racetimer_bg_color ""
@@ -138,7 +138,7 @@ seta hud_panel_racetimer_bg_border ""
 seta hud_panel_racetimer_bg_padding ""
 
 seta hud_panel_vote 1
-seta hud_panel_vote_pos "0.021094 0.650586"
+seta hud_panel_vote_pos "0.025000 0.660000"
 seta hud_panel_vote_size "0.264218 0.102462"
 seta hud_panel_vote_bg ""
 seta hud_panel_vote_bg_color ""
@@ -149,7 +149,7 @@ seta hud_panel_vote_bg_padding ""
 seta hud_panel_vote_alreadyvoted_alpha "0.750000"
 
 seta hud_panel_modicons 1
-seta hud_panel_modicons_pos "0.036563 0.271796"
+seta hud_panel_modicons_pos "0.040000 0.270000"
 seta hud_panel_modicons_size "0.084766 0.199903"
 seta hud_panel_modicons_bg ""
 seta hud_panel_modicons_bg_color ""
@@ -159,18 +159,18 @@ seta hud_panel_modicons_bg_border ""
 seta hud_panel_modicons_bg_padding ""
 
 seta hud_panel_pressedkeys 1
-seta hud_panel_pressedkeys_pos "0.411562 0.545429"
+seta hud_panel_pressedkeys_pos "0.410000 0.545000"
 seta hud_panel_pressedkeys_size "0.177656 0.120531"
 seta hud_panel_pressedkeys_bg ""
 seta hud_panel_pressedkeys_bg_color ""
-seta hud_panel_pressedkeys_bg_color_team "0"
+seta hud_panel_pressedkeys_bg_color_team "1"
 seta hud_panel_pressedkeys_bg_alpha "0"
 seta hud_panel_pressedkeys_bg_border ""
 seta hud_panel_pressedkeys_bg_padding ""
 seta hud_panel_pressedkeys_aspect "1.600000"
 
 seta hud_panel_chat 1
-seta hud_panel_chat_pos "0.020000 0.774374"
+seta hud_panel_chat_pos "0.020000 0.775000"
 seta hud_panel_chat_size "0.627968 0.112696"
 seta hud_panel_chat_bg ""
 seta hud_panel_chat_bg_color ""
@@ -180,8 +180,8 @@ seta hud_panel_chat_bg_border ""
 seta hud_panel_chat_bg_padding ""
 
 seta hud_panel_engineinfo 1
-seta hud_panel_engineinfo_pos "0.860000 0.950000"
-seta hud_panel_engineinfo_size "0.130000 0.034667"
+seta hud_panel_engineinfo_pos "0.860000 0.954667"
+seta hud_panel_engineinfo_size "0.125000 0.035000"
 seta hud_panel_engineinfo_bg ""
 seta hud_panel_engineinfo_bg_color ""
 seta hud_panel_engineinfo_bg_color_team ""
@@ -190,8 +190,8 @@ seta hud_panel_engineinfo_bg_border ""
 seta hud_panel_engineinfo_bg_padding ""
 
 seta hud_panel_infomessages 1
-seta hud_panel_infomessages_pos "0.388751 0.378243"
-seta hud_panel_infomessages_size "0.233282 0.061679"
+seta hud_panel_infomessages_pos "0.340000 0.350000"
+seta hud_panel_infomessages_size "0.320000 0.085000"
 seta hud_panel_infomessages_bg ""
 seta hud_panel_infomessages_bg_color ""
 seta hud_panel_infomessages_bg_color_team ""
index 53f1e534e40a5c0e14654c2a3dcda5112a704373..a440ecbeb326ecd5b2770021a49882a2627655a2 100644 (file)
@@ -2,23 +2,27 @@
 sv_gravity 800
 sv_maxspeed 400
 sv_maxairspeed 400
+
+
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 2
-sv_friction 7
+sv_friction 8
 edgefriction 1
 sv_stepheight 34
-sv_jumpvelocity 300
+
+sv_jumpvelocity 250
 sv_wateraccelerate -1
 sv_waterfriction -1
-sv_airaccel_sideways_friction -0.2
+sv_airaccel_sideways_friction 0
 sv_airaccel_qw -0.9475
-sv_airstopaccelerate 2.5
+
+sv_airstopaccelerate 3
 sv_airstrafeaccelerate 24
 sv_maxairstrafespeed 100
 sv_airstrafeaccel_qw -0.9825
 sv_aircontrol 125
-sv_aircontrol_penalty 0
+sv_aircontrol_penalty 100
 sv_aircontrol_power 2.5
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0
diff --git a/physicsNoQWBunny-xpmbased.cfg b/physicsNoQWBunny-xpmbased.cfg
new file mode 100644 (file)
index 0000000..3e1cc96
--- /dev/null
@@ -0,0 +1,36 @@
+// "NoQWBunny" physics based on XPM
+sv_gravity 800
+sv_maxspeed 320
+
+sv_maxairspeed 320
+
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+
+sv_jumpvelocity 250
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.937
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 20
+sv_maxairstrafespeed 96
+sv_airstrafeaccel_qw -0.979
+sv_aircontrol 125
+sv_aircontrol_penalty 100
+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
diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
deleted file mode 100644 (file)
index 3e1cc96..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-// "NoQWBunny" physics based on XPM
-sv_gravity 800
-sv_maxspeed 320
-
-sv_maxairspeed 320
-
-sv_stopspeed 100
-sv_accelerate 15
-sv_airaccelerate 2
-sv_friction 8
-edgefriction 1
-sv_stepheight 34
-
-sv_jumpvelocity 250
-sv_wateraccelerate 4
-sv_waterfriction 1
-sv_airaccel_sideways_friction 0
-sv_airaccel_qw -0.937
-
-sv_airstopaccelerate 3
-sv_airstrafeaccelerate 20
-sv_maxairstrafespeed 96
-sv_airstrafeaccel_qw -0.979
-sv_aircontrol 125
-sv_aircontrol_penalty 100
-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 db41d55d96ec571062d3c3357b8aa73e5208b54a..3033cfa78a7cc3b6de68a8d84ca3c73eb98ccbd5 100644 (file)
@@ -478,7 +478,6 @@ void CSQC_UpdateView(float w, float h)
                weapontime = time;
                last_weapon = activeweapon;
 
-               entity e;
                e = get_weaponinfo(activeweapon);
                if(e.netname != "")
                        localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n");
@@ -779,7 +778,7 @@ void CSQC_UpdateView(float w, float h)
                                        bullets = 0;
 
 #define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
-                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
 
 #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
                                do \
@@ -1190,6 +1189,18 @@ void CSQC_common_hud(void)
        switch(hud)
        {
                case HUD_NORMAL:
+                       // do some accuracy var caching
+                       float i;
+                       if(!(gametype == GAME_RACE || gametype == GAME_CTS))
+                       {
+                               acc_levels = tokenize(cvar_string("hud_panel_weapons_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));
+                       }
+
                        // hud first
                        HUD_Main();
 
index 8b1d5b450a172ad410d74d3a3828d208a92e5f8f..c5cc244f9fa3b6baad33dd29aca210641551dbc4 100644 (file)
@@ -421,13 +421,13 @@ void HUD_Panel_ExportCfg(string cfgname)
        if(fh >= 0)
        {
                fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n"));
-               fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg \"", cvar_string("hud_panel_bg"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_color \"", cvar_string("hud_panel_bg_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_color_team \"", cvar_string("hud_panel_bg_color_team"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_alpha \"", cvar_string("hud_panel_bg_alpha"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_border \"", cvar_string("hud_panel_bg_border"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_bg_padding \"", cvar_string("hud_panel_bg_padding"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_panel_fg_alpha \"", cvar_string("hud_panel_fg_alpha"), "\"", "\n"));
                fputs(fh, "\n");
 
                fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));
@@ -477,7 +477,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        fputs(fh, strcat("seta hud_panel_", panel_name, "_complainbubble_color_unavailable \"", cvar_string(strcat("hud_panel_", panel_name, "_complainbubble_color_unavailable")), "\"", "\n"));
                                        fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_color \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_color")), "\"", "\n"));
                                        fputs(fh, strcat("seta hud_panel_", panel_name, "_ammo_alpha \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n"));
-                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_ammo_alpha")), "\"", "\n"));
+                                       fputs(fh, strcat("seta hud_panel_", panel_name, "_aspect \"", cvar_string(strcat("hud_panel_", panel_name, "_aspect")), "\"", "\n"));
                                        break;
                                case HUD_PANEL_AMMO:
                                        fputs(fh, strcat("seta hud_panel_", panel_name, "_onlycurrent \"", cvar_string(strcat("hud_panel_", panel_name, "_onlycurrent")), "\"", "\n"));
@@ -1380,10 +1380,6 @@ float GetAmmoTypeForWep(float i)
        }
 }
 
-#define acc_color(i) stov(cvar_string(strcat("hud_panel_weapons_accuracy_color", ftos(i))))
-#define MAX_ACCURACY_LEVELS 10
-float acc_lev[MAX_ACCURACY_LEVELS];
-
 void HUD_Weapons(void)
 {
        if(!autocvar_hud_panel_weapons && !autocvar__hud_configure)
@@ -1469,17 +1465,6 @@ void HUD_Weapons(void)
        vector wpnpos;
        vector wpnsize;
 
-       float acc_levels;
-       if(autocvar_hud_panel_weapons_accuracy && !(gametype == GAME_RACE || gametype == GAME_CTS))
-       {
-               acc_levels = tokenize(cvar_string("hud_panel_weapons_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);
@@ -2449,6 +2434,25 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                
                if (stof(s2) > 2) // killcount > 2
                        print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n");
+       } else if(msg == MSG_KILL_MELEE) { // handle melee types separately
+               if(type == KILL_FRAG_GAUNTLET) {
+                       if(alsoprint)
+                       {
+                               if(gentle) {
+                                       print ("^1", s1, "^1 got too close to", s2, "^1's gauntlet\n");
+                               } else {
+                                       print ("^1", s1, "^1 was cut in half by", s2, "^1's gauntlet\n");
+                               }
+                       }
+               }
+               else if(type == KILL_FRAG_SHOTGUN_MELEE)
+               {
+                       if(alsoprint)
+                       {
+                               print ("^7", s2, "^7 slapped ", s1, "^7 around a bit with a large ^2shotgun\n");
+                       }
+               }
+               HUD_KillNotify_Push(s1, s2, 1, type);
        } else if(msg == MSG_KILL) {
                w = DEATH_WEAPONOF(type);
                if(WEP_VALID(w)) {
@@ -3014,6 +3018,14 @@ void HUD_Notify (void)
                                self = get_weaponinfo(killnotify_deathtype[j]);
                                s = strcat("weapon", self.netname);
                        }
+                       else if(killnotify_deathtype[j] == KILL_FRAG_GAUNTLET)
+                       {
+                               s = "notify_melee";
+                       }
+                       else if(killnotify_deathtype[j] == KILL_FRAG_SHOTGUN_MELEE)
+                       {
+                               s = "notify_melee";
+                       }
                        else if(killnotify_deathtype[j] == KILL_TEAM_RED)
                        {
                                s = "notify_teamkill_red";
index 11a039bec6e69eaed5ffbd811c4e1e30c6b4a3a7..89f5edbdcc3228d8d128d4a1b69f87dbf80181fc 100644 (file)
@@ -16,6 +16,11 @@ float scoreboard_bottom;
 float weapon_hits[WEP_MAXCOUNT];
 float weapon_fired[WEP_MAXCOUNT];
 
+#define acc_color(i) stov(cvar_string(strcat("hud_panel_weapons_accuracy_color", ftos(i))))
+#define MAX_ACCURACY_LEVELS 10
+float acc_lev[MAX_ACCURACY_LEVELS];
+float acc_levels;
+
 float complain_weapon;
 string complain_weapon_name;
 float complain_weapon_type;
index 5efa9118d62bc9a32e4406a939aca739fdaacac4..29fb20642a90fbb514f7a1244c0d79b4541b1dcb 100644 (file)
@@ -957,7 +957,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                        weapon_alpha = 0.2 * scoreboard_alpha_fg;
 
                // weapon icon
-               drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
+               drawpic_aspect_skin(pos, strcat("weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
                // the accuracy
                if(weapon_damage) {
                        weapons_with_stats += 1;
@@ -969,19 +969,26 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                        float padding;
                        padding = ((sbwidth/weapon_cnt) - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value
 
-                       // yellow_accuracy = value at which accuracy becomes yellow
-                       if(weapon_stats >= 100) {
-                               rgb_x = 0;
-                               rgb_y = 1;
-                       }
-                       else if(weapon_stats > autocvar_hud_panel_weapons_accuracy_yellow) {
-                               rgb_x = 1 - (weapon_stats-autocvar_hud_panel_weapons_accuracy_yellow)/(100-autocvar_hud_panel_weapons_accuracy_yellow); // red value between 1 -> 0
-                               rgb_y = 1;
-                       } else {
-                               rgb_x = 1;
-                               rgb_y = weapon_stats/autocvar_hud_panel_weapons_accuracy_yellow; // green value between 0 -> 1
+                       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);
                        }
-                       rgb_z = 0;
+
+                       // 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]);
+                       rgb = acc_color(j);
+                       rgb = rgb + factor * (acc_color(j+1) - rgb);
+
                        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 7a5cf3447b1a29d502953812c276d533bb8fbb78..61ce6900affe5f0a682cc23e324de42c2c94f2c5 100644 (file)
@@ -550,11 +550,12 @@ float MAX_SHOT_DISTANCE = 32768;
 
 // CSQC centerprint/notify message types
 float MSG_SUICIDE = 0;
-float MSG_KILL = 1;
-float MSG_SPREE = 2;
-float MSG_KILL_ACTION = 3;
-float MSG_KILL_ACTION_SPREE = 4;
-float MSG_INFO = 5;
+float MSG_KILL_MELEE = 1;
+float MSG_KILL = 2;
+float MSG_SPREE = 3;
+float MSG_KILL_ACTION = 4;
+float MSG_KILL_ACTION_SPREE = 5;
+float MSG_INFO = 6;
 
 float KILL_TEAM_RED = 10301;
 float KILL_TEAM_BLUE = 10302;
@@ -564,22 +565,24 @@ float KILL_FIRST_VICTIM = 10305;
 float KILL_TYPEFRAG = 10306;
 float KILL_TYPEFRAGGED = 10307;
 float KILL_FRAG = 10308;
-float KILL_FRAGGED = 10309;
-float KILL_SPREE = 10310;
-float KILL_END_SPREE = 10311;
-float KILL_SPREE_3 = 10312;
-float KILL_SPREE_5 = 10313;
-float KILL_SPREE_10 = 10314;
-float KILL_SPREE_15 = 10315;
-float KILL_SPREE_20 = 10316;
-float KILL_SPREE_25 = 10317;
-float KILL_SPREE_30 = 10318;
-
-float INFO_GOTFLAG = 10319;
-float INFO_PICKUPFLAG = 10320;
-float INFO_LOSTFLAG = 10321;
-float INFO_RETURNFLAG = 10322;
-float INFO_CAPTUREFLAG = 10323;
+float KILL_FRAG_GAUNTLET = 10309;
+float KILL_FRAG_SHOTGUN_MELEE = 10310;
+float KILL_FRAGGED = 10311;
+float KILL_SPREE = 10312;
+float KILL_END_SPREE = 10313;
+float KILL_SPREE_3 = 10314;
+float KILL_SPREE_5 = 10315;
+float KILL_SPREE_10 = 10316;
+float KILL_SPREE_15 = 10317;
+float KILL_SPREE_20 = 10318;
+float KILL_SPREE_25 = 10319;
+float KILL_SPREE_30 = 10320;
+
+float INFO_GOTFLAG = 10321;
+float INFO_PICKUPFLAG = 10322;
+float INFO_LOSTFLAG = 10323;
+float INFO_RETURNFLAG = 10324;
+float INFO_CAPTUREFLAG = 10325;
 
 // weapon requests
 float WR_SETUP         = 1; // (SVQC) setup weapon data
index f56cc74661bbb6ab75c677d66b9d2e7e80467446..3633553044c314c4fbc7c846ad6ea7e0e53079ec 100644 (file)
@@ -70,10 +70,14 @@ void XonoticColorpickerString_draw(entity me)
 
        SUPER(XonoticColorpickerString).draw(me);
 
+       vector sz;
+       sz = draw_PictureSize(strcat(me.src, "_selected"));
+       sz = globalToBoxSize(sz, draw_scale);
+
        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_Picture(me.imgOrigin + me.prevcoords - 0.5 * sz, strcat(me.src, "_selected"), sz, '1 1 1', 1);
        draw_alpha = save;
 }
 #endif
index 0c83025600c94105832cf9232e0bdb437aa6bbad..7d32914ddae7b437774f767c0882c7dc59e66179 100644 (file)
@@ -78,6 +78,6 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
        me.TR(me);
                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_panel_pressedkeys_aspect"));
+                       me.TD(me, 1, 2.6, e = makeXonoticSlider(0.2, 4, 0.1, "hud_panel_pressedkeys_aspect"));
 }
 #endif
index b72a30b1e7a9fe7f9c9ae0f2be474a6d42a27b10..d3a21c6bf650686a92e81915e5145e39ead70535 100644 (file)
@@ -4,7 +4,7 @@ CLASS(XonoticHUDExitDialog) EXTENDS(XonoticRootDialog)
        ATTRIB(XonoticHUDExitDialog, title, string, "Panel HUD Setup")
        ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDExitDialog, rows, float, 20)
+       ATTRIB(XonoticHUDExitDialog, rows, float, 18)
        ATTRIB(XonoticHUDExitDialog, columns, float, 4)
        ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit")
 ENDCLASS(XonoticHUDExitDialog)
@@ -20,12 +20,15 @@ void XonoticHUDExitDialog_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel background defaults:"));
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+                       me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_bg"))));
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, "border_default", "border_default");
+                               e.configureXonoticTextSliderValues(e);
        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("hud_panel_bg_color"));
-                       setDependentStringNotEqual(e, "hud_panel_bg_color", "");
        me.TR(me);
        me.TR(me);
                me.TDempty(me, 0.2);
@@ -62,17 +65,28 @@ void XonoticHUDExitDialog_fill(entity me)
                                e.configureXonoticTextSliderValues(e);
 
        me.TR(me);
-               me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock settings:"));
+               me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "HUD Dock:"));
+                       me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock"));
+                               e.addValue(e, "Disable", "0");
+                               e.addValue(e, "Small", "dock_small");
+                               e.addValue(e, "Medium", "dock");
+                               e.addValue(e, "Large", "dock_large");
+                               e.configureXonoticTextSliderValues(e);
+       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("hud_dock_color"));
+       me.TR(me);
        me.TR(me);      
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Alpha:"));
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
                        me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock_alpha"));
                                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, 2, e = makeXonoticTextLabel(0, "Team color:"));
+               me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team color:"));
                        me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_dock_color_team"));
                                e.addValue(e, "Disable", "0");
                                for(i = 1; i <= 10; ++i)
index def4829de5ee1dd62ea87e0e00db87ea8571e0d4..5ed980b2306b968d0a17f5226cc80186f1a7474c 100644 (file)
@@ -363,13 +363,27 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                attacker.taunt_soundtime = time + 1;
 
                                // TODO: fix this?
-                                       if (deathtype == DEATH_CUSTOM)
-                                               msg = strcat(deathmessage, " by ^1", msg);
-                                       else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
-                                       {
-                                               msg = ftos(strstrofs(inflictor.message2, "#", 0));
-                                       }
-                                       Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
+                               if (deathtype == DEATH_CUSTOM)
+                                       msg = strcat(deathmessage, " by ^1", msg);
+                               else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
+                               {
+                                       msg = ftos(strstrofs(inflictor.message2, "#", 0));
+                               }
+
+                               float msgtype;
+                               w = DEATH_WEAPONOF(deathtype);
+                               if(w == WEP_LASER && ((cvar("g_balance_laser_secondary_gauntlet") && w & HITTYPE_SECONDARY) || (cvar("g_balance_laser_primary_gauntlet") && !(w & HITTYPE_SECONDARY))))
+                               {
+                                       msgtype = MSG_KILL_MELEE;
+                                       deathtype = KILL_FRAG_GAUNTLET;
+                               }
+                               else if(w == WEP_SHOTGUN && (cvar("g_balance_shotgun_secondary_melee") && w & HITTYPE_SECONDARY))
+                               {
+                                       msgtype = MSG_KILL_MELEE;
+                                       deathtype = KILL_FRAG_SHOTGUN_MELEE;
+                               }
+
+                               Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
 
                                if(g_ctf && targ.flagcarried)
                                {
@@ -389,10 +403,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                if (attacker.killcount > 2) {
                                        Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
                                }
-
-                               LogDeath("frag", deathtype, attacker, targ);
-
-                               if (attacker.killcount == 3)
+                               else if (attacker.killcount == 3)
                                {
                                        Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
                                        AnnounceTo(attacker, "03kills");
@@ -427,6 +438,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        Send_KillNotification(a, "", "", KILL_SPREE_30, MSG_SPREE);
                                        AnnounceTo(attacker, "30kills");
                                }
+                               LogDeath("frag", deathtype, attacker, targ);
                        }
                }
                else