Merge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 12:48:08 +0000 (15:48 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 12:48:08 +0000 (15:48 +0300)
211 files changed:
balance.cfg
balance25.cfg
balanceFruit.cfg
balanceSamual.cfg
balanceXPM.cfg
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/race_newrecordserver.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
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
qcsrc/server/w_electro.qc
qcsrc/server/w_grenadelauncher.qc

index 123c242..3fc3de6 100644 (file)
@@ -231,7 +231,7 @@ set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
-// }}}
+// }}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6
 set g_balance_shotgun_primary_damage 9
@@ -290,6 +290,7 @@ set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
 set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
 set g_balance_grenadelauncher_secondary_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
@@ -299,6 +300,7 @@ set g_balance_grenadelauncher_secondary_speed_up 200
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 2.5
+set g_balance_grenadelauncher_secondary_lifetime2 0
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
index 46b3daf..cae096b 100644 (file)
@@ -290,6 +290,7 @@ set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
 set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
 set g_balance_grenadelauncher_secondary_damage 70
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
@@ -299,6 +300,7 @@ set g_balance_grenadelauncher_secondary_speed_up 200
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 2.5
+set g_balance_grenadelauncher_secondary_lifetime2 0
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
index c51970d..6e96e94 100644 (file)
@@ -69,8 +69,8 @@ set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 200
 set g_pickup_armorsmall_anyway 1
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 100
-set g_pickup_armormedium_anyway 0
+set g_pickup_armormedium_max 200
+set g_pickup_armormedium_anyway 1
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 200
 set g_pickup_armorbig_anyway 1
@@ -206,8 +206,8 @@ set g_balance_grapplehook_health 130
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_primary_damage 25 // dps 38, hope that's not too high
-set g_balance_laser_primary_edgedamage 25
+set g_balance_laser_primary_damage 20 // dps 33, hope that's not too high
+set g_balance_laser_primary_edgedamage 20
 set g_balance_laser_primary_force 235
 set g_balance_laser_primary_radius 60
 set g_balance_laser_primary_speed 4000
@@ -275,14 +275,14 @@ set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar // TODO
 set g_balance_grenadelauncher_primary2secondary 0
-set g_balance_grenadelauncher_primary_sticky 1
-set g_balance_grenadelauncher_primary_damage 100
-set g_balance_grenadelauncher_primary_edgedamage 30
+set g_balance_grenadelauncher_primary_sticky 0
+set g_balance_grenadelauncher_primary_damage 60
+set g_balance_grenadelauncher_primary_edgedamage 35
 set g_balance_grenadelauncher_primary_force 300
-set g_balance_grenadelauncher_primary_radius 150
-set g_balance_grenadelauncher_primary_speed 800
-set g_balance_grenadelauncher_primary_speed_up 0
-set g_balance_grenadelauncher_primary_speed_z 350
+set g_balance_grenadelauncher_primary_radius 100
+set g_balance_grenadelauncher_primary_speed 2000
+set g_balance_grenadelauncher_primary_speed_up 200
+set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 5
 set g_balance_grenadelauncher_primary_lifetime2 0.65
@@ -290,19 +290,21 @@ set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.2
 set g_balance_grenadelauncher_primary_ammo 2
 set g_balance_grenadelauncher_primary_health 72
+set g_balance_grenadelauncher_secondary_sticky 1
 set g_balance_grenadelauncher_secondary_damage 100
 set g_balance_grenadelauncher_secondary_edgedamage 30
 set g_balance_grenadelauncher_secondary_force 300
 set g_balance_grenadelauncher_secondary_radius 150
-set g_balance_grenadelauncher_secondary_speed 800
-set g_balance_grenadelauncher_secondary_speed_up 0
-set g_balance_grenadelauncher_secondary_speed_z 350
-set g_balance_grenadelauncher_secondary_spread 0.025
-set g_balance_grenadelauncher_secondary_lifetime 2.2
+set g_balance_grenadelauncher_secondary_speed 1000
+set g_balance_grenadelauncher_secondary_speed_up 200
+set g_balance_grenadelauncher_secondary_speed_z 0
+set g_balance_grenadelauncher_secondary_spread 0
+set g_balance_grenadelauncher_secondary_lifetime 5
+set g_balance_grenadelauncher_secondary_lifetime2 1
 set g_balance_grenadelauncher_secondary_refire 0.8
 set g_balance_grenadelauncher_secondary_animtime 0.2
 set g_balance_grenadelauncher_secondary_ammo 2
-set g_balance_grenadelauncher_secondary_health 0
+set g_balance_grenadelauncher_secondary_health 72
 set g_balance_grenadelauncher_secondary_damageforcescale 0
 set g_balance_grenadelauncher_secondary_bouncefactor 0.7
 set g_balance_grenadelauncher_secondary_bouncestop 0.12
@@ -328,8 +330,8 @@ set g_balance_electro_secondary_edgedamage 0
 set g_balance_electro_secondary_force 100
 set g_balance_electro_secondary_radius 100
 set g_balance_electro_secondary_speed 500
-set g_balance_electro_secondary_speed_up 0
-set g_balance_electro_secondary_speed_z 300
+set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0.08
 set g_balance_electro_secondary_lifetime 3.5
 set g_balance_electro_secondary_refire 0.5
index 6cdcb8a..ded59fe 100644 (file)
@@ -290,6 +290,7 @@ set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
 set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
 set g_balance_grenadelauncher_secondary_damage 60
 set g_balance_grenadelauncher_secondary_edgedamage 38
 set g_balance_grenadelauncher_secondary_force 400
@@ -299,6 +300,7 @@ set g_balance_grenadelauncher_secondary_speed_up 150
 set g_balance_grenadelauncher_secondary_speed_z 0
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 1
+set g_balance_grenadelauncher_secondary_lifetime2 0
 set g_balance_grenadelauncher_secondary_refire 0.7
 set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
index acca206..b73f422 100644 (file)
@@ -290,6 +290,7 @@ set g_balance_grenadelauncher_primary_refire 0.8
 set g_balance_grenadelauncher_primary_animtime 0.2
 set g_balance_grenadelauncher_primary_ammo 2
 set g_balance_grenadelauncher_primary_health 25
+set g_balance_grenadelauncher_secondary_sticky 0
 set g_balance_grenadelauncher_secondary_damage 100
 set g_balance_grenadelauncher_secondary_edgedamage 30
 set g_balance_grenadelauncher_secondary_force 300
@@ -299,6 +300,7 @@ set g_balance_grenadelauncher_secondary_speed_up 0
 set g_balance_grenadelauncher_secondary_speed_z 200
 set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 1.5
+set g_balance_grenadelauncher_secondary_lifetime2 0
 set g_balance_grenadelauncher_secondary_refire 0.8
 set g_balance_grenadelauncher_secondary_animtime 0.2
 set g_balance_grenadelauncher_secondary_ammo 2
index f553047..8d6b38e 100644 (file)
@@ -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 e7cd01a..8f3739d 100644 (file)
Binary files a/gfx/hud/default/ammo_bullets.tga and b/gfx/hud/default/ammo_bullets.tga differ
index 664eb23..4850763 100644 (file)
Binary files a/gfx/hud/default/ammo_cells.tga and b/gfx/hud/default/ammo_cells.tga differ
index bd07205..7036279 100644 (file)
Binary files a/gfx/hud/default/ammo_current_bg.tga and b/gfx/hud/default/ammo_current_bg.tga differ
index 8450a2f..4a3a2d5 100644 (file)
Binary files a/gfx/hud/default/ammo_fuel.tga and b/gfx/hud/default/ammo_fuel.tga differ
index c37f077..9b34ea7 100644 (file)
Binary files a/gfx/hud/default/ammo_rockets.tga and b/gfx/hud/default/ammo_rockets.tga differ
index 59bea4b..f62c715 100644 (file)
Binary files a/gfx/hud/default/ammo_shells.tga and b/gfx/hud/default/ammo_shells.tga differ
index 92046b4..f9e4701 100644 (file)
Binary files a/gfx/hud/default/armor.tga and b/gfx/hud/default/armor.tga differ
index 8ceee44..3b76811 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 9dd4e2f..3163382 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 ace6a5f..1ddcbfa 100644 (file)
Binary files a/gfx/hud/default/flag_blue_carrying.tga and b/gfx/hud/default/flag_blue_carrying.tga differ
index 67d894d..b37ccd0 100644 (file)
Binary files a/gfx/hud/default/flag_blue_lost.tga and b/gfx/hud/default/flag_blue_lost.tga differ
index a8993f6..c1e89c5 100644 (file)
Binary files a/gfx/hud/default/flag_blue_shielded.tga and b/gfx/hud/default/flag_blue_shielded.tga differ
index 6847e7c..70079ca 100644 (file)
Binary files a/gfx/hud/default/flag_blue_taken.tga and b/gfx/hud/default/flag_blue_taken.tga differ
index 3393083..8fda6e1 100644 (file)
Binary files a/gfx/hud/default/flag_red_carrying.tga and b/gfx/hud/default/flag_red_carrying.tga differ
index f96e021..083ac46 100644 (file)
Binary files a/gfx/hud/default/flag_red_lost.tga and b/gfx/hud/default/flag_red_lost.tga differ
index e7ec491..550d0b7 100644 (file)
Binary files a/gfx/hud/default/flag_red_shielded.tga and b/gfx/hud/default/flag_red_shielded.tga differ
index bf71977..a21a5ee 100644 (file)
Binary files a/gfx/hud/default/flag_red_taken.tga and b/gfx/hud/default/flag_red_taken.tga differ
index 0ed8a90..26e4086 100644 (file)
Binary files a/gfx/hud/default/health.tga and b/gfx/hud/default/health.tga differ
index 4de0f33..2a2cbab 100644 (file)
Binary files a/gfx/hud/default/key_backward.tga and b/gfx/hud/default/key_backward.tga differ
index bef0d1c..1b6b973 100644 (file)
Binary files a/gfx/hud/default/key_backward_inv.tga and b/gfx/hud/default/key_backward_inv.tga differ
index 00b2dfe..7016441 100644 (file)
Binary files a/gfx/hud/default/key_crouch.tga and b/gfx/hud/default/key_crouch.tga differ
index 2cdbda8..0f47c09 100644 (file)
Binary files a/gfx/hud/default/key_crouch_inv.tga and b/gfx/hud/default/key_crouch_inv.tga differ
index dfe2233..0354b18 100644 (file)
Binary files a/gfx/hud/default/key_forward.tga and b/gfx/hud/default/key_forward.tga differ
index 7bbea60..47c6154 100644 (file)
Binary files a/gfx/hud/default/key_forward_inv.tga and b/gfx/hud/default/key_forward_inv.tga differ
index d02b2db..70a92fa 100644 (file)
Binary files a/gfx/hud/default/key_jump.tga and b/gfx/hud/default/key_jump.tga differ
index c54bb37..a62bcf2 100644 (file)
Binary files a/gfx/hud/default/key_jump_inv.tga and b/gfx/hud/default/key_jump_inv.tga differ
index 60fe71f..4bcf85f 100644 (file)
Binary files a/gfx/hud/default/key_left.tga and b/gfx/hud/default/key_left.tga differ
index 92bc615..b6d6a2d 100644 (file)
Binary files a/gfx/hud/default/key_left_inv.tga and b/gfx/hud/default/key_left_inv.tga differ
index 308c03b..4d4ee21 100644 (file)
Binary files a/gfx/hud/default/key_right.tga and b/gfx/hud/default/key_right.tga differ
index 8f04be4..f6fe631 100644 (file)
Binary files a/gfx/hud/default/key_right_inv.tga and b/gfx/hud/default/key_right_inv.tga differ
index 7cff17e..55a2991 100644 (file)
Binary files a/gfx/hud/default/notify_blue_captured.tga and b/gfx/hud/default/notify_blue_captured.tga differ
index 67d894d..435928d 100644 (file)
Binary files a/gfx/hud/default/notify_blue_lost.tga and b/gfx/hud/default/notify_blue_lost.tga differ
index 8e8b67f..0c663d7 100644 (file)
Binary files a/gfx/hud/default/notify_blue_returned.tga and b/gfx/hud/default/notify_blue_returned.tga differ
index a8993f6..977fe9a 100644 (file)
Binary files a/gfx/hud/default/notify_blue_shielded.tga and b/gfx/hud/default/notify_blue_shielded.tga differ
index 6847e7c..43f73aa 100644 (file)
Binary files a/gfx/hud/default/notify_blue_taken.tga and b/gfx/hud/default/notify_blue_taken.tga differ
index 2766dd1..a11e324 100644 (file)
Binary files a/gfx/hud/default/notify_camping.tga and b/gfx/hud/default/notify_camping.tga differ
index d5e8045..3a32ae3 100644 (file)
Binary files a/gfx/hud/default/notify_death.tga and b/gfx/hud/default/notify_death.tga differ
index febd1d0..98a7f49 100644 (file)
Binary files a/gfx/hud/default/notify_fall.tga and b/gfx/hud/default/notify_fall.tga differ
index d9c3e5a..17a76f8 100644 (file)
Binary files a/gfx/hud/default/notify_headshot.tga and b/gfx/hud/default/notify_headshot.tga differ
index 3976e8b..1c77758 100644 (file)
Binary files a/gfx/hud/default/notify_lava.tga and b/gfx/hud/default/notify_lava.tga differ
index e4fa0c7..2223d93 100644 (file)
Binary files a/gfx/hud/default/notify_melee.tga and b/gfx/hud/default/notify_melee.tga differ
index 82a11dd..ecacf50 100644 (file)
Binary files a/gfx/hud/default/notify_outofammo.tga and b/gfx/hud/default/notify_outofammo.tga differ
index 72814ec..9c2077f 100644 (file)
Binary files a/gfx/hud/default/notify_red_captured.tga and b/gfx/hud/default/notify_red_captured.tga differ
index f96e021..ffc7dc0 100644 (file)
Binary files a/gfx/hud/default/notify_red_lost.tga and b/gfx/hud/default/notify_red_lost.tga differ
index deee468..3f3b54a 100644 (file)
Binary files a/gfx/hud/default/notify_red_returned.tga and b/gfx/hud/default/notify_red_returned.tga differ
index e7ec491..d3cef48 100644 (file)
Binary files a/gfx/hud/default/notify_red_shielded.tga and b/gfx/hud/default/notify_red_shielded.tga differ
index bf71977..9fa31f1 100644 (file)
Binary files a/gfx/hud/default/notify_red_taken.tga and b/gfx/hud/default/notify_red_taken.tga differ
index 646a1a2..98e62cf 100644 (file)
Binary files a/gfx/hud/default/notify_selfkill.tga and b/gfx/hud/default/notify_selfkill.tga differ
index 048e015..c8077a2 100644 (file)
Binary files a/gfx/hud/default/notify_shootingstar.tga and b/gfx/hud/default/notify_shootingstar.tga differ
index c08a6a3..11ae58b 100644 (file)
Binary files a/gfx/hud/default/notify_slime.tga and b/gfx/hud/default/notify_slime.tga differ
index a40920b..885b929 100644 (file)
Binary files a/gfx/hud/default/notify_teamkill_blue.tga and b/gfx/hud/default/notify_teamkill_blue.tga differ
index a40920b..96f007a 100644 (file)
Binary files a/gfx/hud/default/notify_teamkill_red.tga and b/gfx/hud/default/notify_teamkill_red.tga differ
index 1e2d280..8ebe761 100644 (file)
Binary files a/gfx/hud/default/notify_void.tga and b/gfx/hud/default/notify_void.tga differ
index 8315f12..f04b3e5 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 f2f59d3..668fbc6 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 cd1164b..360d68a 100644 (file)
Binary files a/gfx/hud/default/race_newfail.tga and b/gfx/hud/default/race_newfail.tga differ
index c8fa157..ec3e225 100644 (file)
Binary files a/gfx/hud/default/race_newrankgreen.tga and b/gfx/hud/default/race_newrankgreen.tga differ
index 0af3c59..ec3e225 100644 (file)
Binary files a/gfx/hud/default/race_newrankyellow.tga and b/gfx/hud/default/race_newrankyellow.tga differ
index aa8bae1..99ed22b 100644 (file)
Binary files a/gfx/hud/default/race_newrecordserver.tga and b/gfx/hud/default/race_newrecordserver.tga differ
index c9647b9..ab2f905 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 e271438..3c2d1a8 100644 (file)
Binary files a/gfx/hud/default/statusbar_vertical.tga and b/gfx/hud/default/statusbar_vertical.tga differ
index 2348be8..0ba103e 100644 (file)
Binary files a/gfx/hud/default/voteprogress_back.tga and b/gfx/hud/default/voteprogress_back.tga differ
index 574d5d7..f24f524 100644 (file)
Binary files a/gfx/hud/default/voteprogress_prog.tga and b/gfx/hud/default/voteprogress_prog.tga differ
index ffc90a2..ee06048 100644 (file)
Binary files a/gfx/hud/default/voteprogress_voted.tga and b/gfx/hud/default/voteprogress_voted.tga differ
index 4a451b1..8dcf3aa 100644 (file)
Binary files a/gfx/hud/default/weapon_accuracy.tga and b/gfx/hud/default/weapon_accuracy.tga differ
index cb1d306..de4148c 100644 (file)
Binary files a/gfx/hud/default/weapon_ammo.tga and b/gfx/hud/default/weapon_ammo.tga differ
index a3c53a3..349274f 100644 (file)
Binary files a/gfx/hud/default/weapon_complainbubble.tga and b/gfx/hud/default/weapon_complainbubble.tga differ
index 5a8f936..688d805 100644 (file)
Binary files a/gfx/hud/default/weapon_current_bg.tga and b/gfx/hud/default/weapon_current_bg.tga differ
index f11c173..601f3d7 100644 (file)
Binary files a/gfx/hud/default/weapon_hlacmod_renameit.tga and b/gfx/hud/default/weapon_hlacmod_renameit.tga differ
index fb6413b..f5c2e55 100644 (file)
Binary files a/gfx/hud/default/weaponcampingrifle.tga and b/gfx/hud/default/weaponcampingrifle.tga differ
index e48ad4d..e7e283f 100644 (file)
Binary files a/gfx/hud/default/weaponcrylink.tga and b/gfx/hud/default/weaponcrylink.tga differ
index 73c791b..75cdf02 100644 (file)
Binary files a/gfx/hud/default/weaponelectro.tga and b/gfx/hud/default/weaponelectro.tga differ
index d7ea1fb..05fc4fe 100644 (file)
Binary files a/gfx/hud/default/weaponfireball.tga and b/gfx/hud/default/weaponfireball.tga differ
index c09081b..24135f3 100644 (file)
Binary files a/gfx/hud/default/weapongrenadelauncher.tga and b/gfx/hud/default/weapongrenadelauncher.tga differ
index 69a7b72..5c04c8f 100644 (file)
Binary files a/gfx/hud/default/weaponhagar.tga and b/gfx/hud/default/weaponhagar.tga differ
index 2ba3853..5375ab4 100644 (file)
Binary files a/gfx/hud/default/weaponhlac.tga and b/gfx/hud/default/weaponhlac.tga differ
index 0c7fd40..eaee838 100644 (file)
Binary files a/gfx/hud/default/weaponhook.tga and b/gfx/hud/default/weaponhook.tga differ
index 1f016e1..0afbb37 100644 (file)
Binary files a/gfx/hud/default/weaponlaser.tga and b/gfx/hud/default/weaponlaser.tga differ
index 26877c2..3618778 100644 (file)
Binary files a/gfx/hud/default/weaponminstanex.tga and b/gfx/hud/default/weaponminstanex.tga differ
index 4ed91bc..e98e318 100644 (file)
Binary files a/gfx/hud/default/weaponnex.tga and b/gfx/hud/default/weaponnex.tga differ
index 46dd107..3fbccf9 100644 (file)
Binary files a/gfx/hud/default/weaponporto.tga and b/gfx/hud/default/weaponporto.tga differ
index f5449b3..0fea766 100644 (file)
Binary files a/gfx/hud/default/weaponrocketlauncher.tga and b/gfx/hud/default/weaponrocketlauncher.tga differ
index 566ee86..5630d52 100644 (file)
Binary files a/gfx/hud/default/weaponseeker.tga and b/gfx/hud/default/weaponseeker.tga differ
index 055841c..438b121 100644 (file)
Binary files a/gfx/hud/default/weaponshotgun.tga and b/gfx/hud/default/weaponshotgun.tga differ
index 8b80015..1617b7f 100644 (file)
Binary files a/gfx/hud/default/weapontuba.tga and b/gfx/hud/default/weapontuba.tga differ
index c0e75d1..4c03732 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 04e9230..55a2991 100644 (file)
Binary files a/gfx/hud/luminos/notify_blue_captured.tga and b/gfx/hud/luminos/notify_blue_captured.tga differ
index c75de3b..0c663d7 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..cf003bd
Binary files /dev/null and b/gfx/hud/luminos/notify_melee.tga differ
index 052be13..9c2077f 100644 (file)
Binary files a/gfx/hud/luminos/notify_red_captured.tga and b/gfx/hud/luminos/notify_red_captured.tga differ
index c5c23de..3f3b54a 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 2a613b6..8ebe761 100644 (file)
Binary files a/gfx/hud/luminos/notify_void.tga and b/gfx/hud/luminos/notify_void.tga differ
index 99ed22b..6bf5288 100644 (file)
Binary files a/gfx/hud/luminos/race_newrecordserver.tga and b/gfx/hud/luminos/race_newrecordserver.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 b4e2949..e98e318 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 8c7abe4..34fed7a 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 731a187..8d1436a 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 db41d55..3033cfa 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 60a510a..b348ff0 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 11a039b..89f5edb 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 5efa911..29fb206 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 7a5cf34..61ce690 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 f56cc74..3633553 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 0c83025..7d32914 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 b72a30b..d3a21c6 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 def4829..5ed980b 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
index 099fa29..92ed5e7 100644 (file)
@@ -243,8 +243,8 @@ void lgbeam_think()
                vector force;
                force = w_shotdir * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up");
                Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * dt, WEP_ELECTRO, trace_endpos, force * dt);
-               W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner);
        }
+       W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner);
 
        // draw effect
        if(w_shotorg != self.hook_start)
index a8930cd..6848b2a 100644 (file)
@@ -74,27 +74,46 @@ void W_Grenade_Touch1 (void)
 void W_Grenade_Touch2 (void)
 {
        PROJECTILE_TOUCH;
-       if (other.takedamage == DAMAGE_AIM)
+       if(cvar("g_balance_grenadelauncher_secondary_sticky") && other.takedamage != DAMAGE_AIM)
        {
-               self.use ();
+               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
+
+               // let it stick whereever it is
+               self.oldvelocity = self.velocity;
+               self.velocity = '0 0 0';
+               self.movetype = MOVETYPE_NONE; // also disables gravity
+               self.gravity = 0; // nope, it does NOT! maybe a bug in CSQC code? TODO
+               UpdateCSQCProjectile(self);
+
+               // do not respond to any more touches
+               self.solid = SOLID_NOT;
+
+               self.nextthink = min(self.nextthink, time + cvar("g_balance_grenadelauncher_secondary_lifetime2"));
        }
        else
        {
-               float r;
-               r = random() * 6;
-               if(r < 1)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 2)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 3)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 4)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM);
-               else if(r < 5)
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
+               if (other.takedamage == DAMAGE_AIM)
+               {
+                       self.use ();
+               }
                else
-                       spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
-               self.projectiledeathtype |= HITTYPE_BOUNCE;
+               {
+                       float r;
+                       r = random() * 6;
+                       if(r < 1)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce1.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 2)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce2.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 3)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce3.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 4)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce4.wav", VOL_BASE, ATTN_NORM);
+                       else if(r < 5)
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce5.wav", VOL_BASE, ATTN_NORM);
+                       else
+                               spamsound (self, CHAN_PROJECTILE, "weapons/grenade_bounce6.wav", VOL_BASE, ATTN_NORM);
+                       self.projectiledeathtype |= HITTYPE_BOUNCE;
+               }
        }
 }
 
@@ -174,7 +193,10 @@ void W_Grenade_Attack2 (void)
        gren.angles = vectoangles (gren.velocity);
        gren.flags = FL_PROJECTILE;
 
-       CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE);
+       if(cvar("g_balance_grenadelauncher_secondary_sticky"))
+               CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE);
+       else
+               CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE);
 }
 
 void spawnfunc_weapon_grenadelauncher (void)