Merge remote-tracking branch 'origin/master' into fruitiex/better_shownames

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 4da15d01da6dbadbb8725245135f3417e1abff38..7ec11f8a44612c93189e5fd53e5a11b82c43552b 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -110,6 +110,7 @@ seta hud_panel_notify_bg_alpha "" "if set to something else than \"\" = override
 seta hud_panel_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_notify_flip "" "order the list top to bottom instead of bottom to top"
+seta hud_panel_notify_fontsize "" "multiplier for the font size used for player names in the panel"
 seta hud_panel_notify_print "" "also con_notify print the messages that are shown on the notify panel"
 
 seta hud_panel_timer "" "enable/disable this panel"

diff --git a/annoy_balance.cfg b/annoy_balance.cfg
new file mode 100644 (file)
index 0000000..184eb4e
--- /dev/null
+++ b/annoy_balance.cfg
@@ -0,0 +1,21 @@
+// TEMPORARY CONFIG FOR BALANCE TESTING PURPOSES
+
+// ANNOY people with the BALANCE
+alias annoy                "sv_cmd adminmsg 0 \"${* q}\" 70"
+       // show message for 70 sec, clear previous one
+alias annoy_s              "annoy $*; echo \ 1SERVER^7: $*"
+       // annoy_s goes to rcon2irc (this echo fakes a chat message's output)
+alias printbalance         "annoy NOTE: Current balance is ^1$curbalance"
+       // refresh the balance status bar (call this every 60 sec)
+alias printbalance_s       "annoy_s NOTE: Next match will run ^1$curbalance"
+       // announce the balance for next match
+alias switchbalance_samual "exec balanceXonotic.cfg; set curbalance fruit; printbalance_s"
+alias switchbalance_fruit  "exec balanceSamual.cfg; set curbalance samual; printbalance_s"
+alias switchbalance        "switchbalance_$curbalance"
+       // toggle between the balances
+alias sv_hook_gameend      "switchbalance"
+       // do this at the end of each match
+set curbalance fruit
+alias annoybalance         "printbalance; defer 60 annoybalance"
+annoybalance
+       // our timer
\ No newline at end of file

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 6979fb6b9e53c4265771a342e6bc50fec5b61f82..187362d70f59a13239fda7c178b0e85cb8be0ed1 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -13,7 +13,7 @@ set g_start_weapon_minstanex -1 "0 = never provide the weapon, 1 = always provid
 set g_start_weapon_porto -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_hook -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_hlac 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" // UNTIL IT CAN BE REMOVED FROM CODE
-set g_start_weapon_sniperrifle -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
+set g_start_weapon_sniperrifle 0 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms" // UNTIL IT CAN BE REMOVED FROM CODE
 set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -26,26 +26,26 @@ set g_start_ammo_cells 0
 set g_start_ammo_fuel 0
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_lms_start_health 200
 set g_lms_start_armor 200
-set g_lms_start_ammo_shells 120
-set g_lms_start_ammo_nails 400
-set g_lms_start_ammo_rockets 120
-set g_lms_start_ammo_cells 200
+set g_lms_start_ammo_shells 60
+set g_lms_start_ammo_nails 320
+set g_lms_start_ammo_rockets 160
+set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
-set g_balance_nix_ammo_shells 120
-set g_balance_nix_ammo_nails 400
-set g_balance_nix_ammo_rockets 120
-set g_balance_nix_ammo_cells 200
+set g_balance_nix_ammo_shells 60
+set g_balance_nix_ammo_nails 320
+set g_balance_nix_ammo_rockets 160
+set g_balance_nix_ammo_cells 180
 set g_balance_nix_ammo_fuel 0
-set g_balance_nix_ammoincr_shells 2
+set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
@@ -84,16 +84,16 @@ set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 200
 set g_pickup_armorlarge_anyway 1
 set g_pickup_healthsmall 5
-set g_pickup_healthsmall_max 250
+set g_pickup_healthsmall_max 200
 set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 250
+set g_pickup_healthmedium_max 200
 set g_pickup_healthmedium_anyway 1
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 250
+set g_pickup_healthlarge_max 200
 set g_pickup_healthlarge_anyway 1
 set g_pickup_healthmega 100
-set g_pickup_healthmega_max 250
+set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 1
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
@@ -114,16 +114,16 @@ set g_balance_health_regen 0
 set g_balance_health_regenlinear 5
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0.05
+set g_balance_health_rot 0.04
 set g_balance_health_rotlinear 2
 set g_balance_pause_health_rot 0.5
 set g_balance_pause_health_rot_spawn 5
 set g_balance_health_regenstable 100
-set g_balance_health_rotstable 150
+set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0.05
+set g_balance_armor_rot 0.04
 set g_balance_armor_rotlinear 2
 set g_balance_pause_armor_rot 1
 set g_balance_pause_armor_rot_spawn 5
@@ -174,11 +174,11 @@ set g_projectiles_spread_style 7
 // 5: forward + circle with 1-r falloff
 // 6: forward + circle with 1-r^2 falloff
 // 7: forward + circle with (1-r)(2-r) falloff
-set g_balance_falldamage_deadminspeed 150
-set g_balance_falldamage_minspeed 1000
+set g_balance_falldamage_deadminspeed 250
+set g_balance_falldamage_minspeed 900
 set g_balance_falldamage_factor 0.20
-set g_balance_falldamage_maxdamage 15
-set g_balance_damagepush_speedfactor 0
+set g_balance_falldamage_maxdamage 40
+set g_balance_damagepush_speedfactor 2.5
 // }}}
 
 // {{{ powerups
@@ -776,7 +776,7 @@ set g_balance_seeker_missile_speed_up 0
 set g_balance_seeker_missile_speed_z 0
 set g_balance_seeker_missile_speed_max 2000 // LOG: 1400 -> 1300
 set g_balance_seeker_missile_spread 0
-set g_balance_seeker_missile_turnrate 0.2
+set g_balance_seeker_missile_turnrate 0.15
 set g_balance_seeker_reload_ammo 0 //default: 15
 set g_balance_seeker_reload_time 2
 // End new seeker

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 03234e1989244b5d7264dd8b051f0f86c4318f87..3501e80847c3c7d94f5078b4ac66146407a9b1c4 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -241,6 +241,7 @@ vid_conheight 600
 v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
 
 // these settings determine how much the view is affected by movement/damage
+cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
 cl_deathfade 1 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
 cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
 cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
@@ -1636,13 +1637,13 @@ set g_jump_grunt 0      "Do you make a grunting noise every time you jump? Is it the
 
 alias allready "sv_cmd allready"
 
-seta cl_weaponpriority "minstanex rocketlauncher nex minelayer grenadelauncher fireball hlac hagar seeker crylink sniperrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
+seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher minelayer fireball hlac hagar seeker crylink sniperrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
 seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)"
 seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
 seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser"             "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun.  Default value: energy"
 seta cl_weaponpriority2 "minstanex nex sniperrifle"                           "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun.  Default value: hitscan exact"
 seta cl_weaponpriority3 "minstanex nex sniperrifle uzi shotgun"               "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun.  Default value: hitscan all"
-seta cl_weaponpriority4 "minelayer grenadelauncher hlac hagar crylink seeker shotgun"    "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun.  Default value: spam weapons"
+seta cl_weaponpriority4 "grenadelauncher minelayer hlac hagar crylink seeker shotgun"    "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun.  Default value: spam weapons"
 seta cl_weaponpriority5 "laser hook porto"                                     "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun.  Default value: weapons for moving"
 seta cl_weaponpriority6 "" "use impulse 206 for prev gun from this list, 216 for best gun, 226 for next gun"
 seta cl_weaponpriority7 "" "use impulse 207 for prev gun from this list, 217 for best gun, 227 for next gun"
@@ -2107,6 +2108,10 @@ scr_loadingscreen_scale 1
 scr_loadingscreen_scale_base 1
 scr_loadingscreen_scale_limit 1
 
+// sRGB configuration (EXPERIMENTAL, needs maps to be relit)
+alias sRGBcorrect_on  "r_texture_sRGB_skin_diffuse 1;r_texture_sRGB_skin_gloss 1;r_texture_sRGB_skin_glow 1;r_texture_sRGB_reflect 1;r_texture_sRGB_skybox 1;v_gamma 2.2;r_restart"
+alias sRGBcorrect_off "r_texture_sRGB_skin_diffuse 0;r_texture_sRGB_skin_gloss 0;r_texture_sRGB_skin_glow 0;r_texture_sRGB_reflect 0;r_texture_sRGB_skybox 0;v_gamma 1.0;r_restart"
+
 // other config files
 exec balanceXonotic.cfg
 exec ctfscoring-ai.cfg

diff --git a/gfx/hud/default/accelbar.tga b/gfx/hud/default/accelbar.tga
new file mode 100644 (file)
index 0000000..fd93858
Binary files /dev/null and b/gfx/hud/default/accelbar.tga differ

diff --git a/gfx/hud/luminos/accelbar.tga b/gfx/hud/luminos/accelbar.tga
new file mode 100644 (file)
index 0000000..fd93858
Binary files /dev/null and b/gfx/hud/luminos/accelbar.tga differ

diff --git a/gfx/hud/old/accelbar.tga b/gfx/hud/old/accelbar.tga
new file mode 100644 (file)
index 0000000..0bbad17
Binary files /dev/null and b/gfx/hud/old/accelbar.tga differ

diff --git a/hud_luminos_xhair_minimal.cfg b/hud_luminos_xhair_minimal.cfg
index 8ba0b58b338f3d70b9893c9520865301a9e6c98f..6c95c17d72372959982d1a9692d250286fdc6f7e 100644 (file)
--- a/hud_luminos_xhair_minimal.cfg
+++ b/hud_luminos_xhair_minimal.cfg
@@ -79,6 +79,7 @@ seta hud_panel_powerups_baralign "1"
 seta hud_panel_powerups_progressbar "1"
 seta hud_panel_powerups_progressbar_strength "progressbar"
 seta hud_panel_powerups_progressbar_shield "progressbar"
+seta hud_panel_powerups_text "0"
 
 seta hud_panel_healtharmor 1
 seta hud_panel_healtharmor_pos "0.350000 0.380000"

diff --git a/languages.txt b/languages.txt
index 0e89469c57eaacd9474aba958103749cdacd5251..9004df21fa383d55fa02085223920ec54c98f04b 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -3,6 +3,7 @@ en English "English"
 fi Finnish "Suomi"
 fr French "Français"
 hu Hungarian "Magyar"
+it Italian "Italiano"
 nl Dutch "Nederlands"
 pt Portuguese "Português"
 ro Romanian "Romana"

diff --git a/menu.dat.it.po b/menu.dat.it.po
index f0baa2b16816c852a25780603b9911aa4e4fd8d8..1dab9f184a86e3ed991f32410b96efbd0fbf47ae 100644 (file)
--- a/menu.dat.it.po
+++ b/menu.dat.it.po
@@ -1,15 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
+# Xonotic Menu
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Felice Sallustio <fel.sallustio@gmail.com>, 2011.
+# Antonio 'terencehill' Piu <piuntn@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Xonotic Menu\n"
+"Project-Id-Version: 0.1preview\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-18 17:06+0100\n"
-"PO-Revision-Date: 2011-01-21 22:41+0100\n"
-"Last-Translator: Felice Sallustio <fel.sallustio@gmail.com>\n"
+"PO-Revision-Date: 2011-03-27 18:47+0100\n"
+"Last-Translator: Antonio 'terencehill' Piu <piuntn@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "%d (%s)"
 #: qcsrc/menu/item/label.c:63
 #, c-format
 msgid "NOTE: label text %s too wide for label, condensed by factor %f\n"
-msgstr "NOTA: l'etichetta %s è troppo grande, compensato di un fattore %f\n"
+msgstr "NOTA: testo dell'etichetta %s troppo grande per l'etichetta, compresso di un fattore %f\n"
 
 #: qcsrc/menu/item/textslider.c:29
 #: qcsrc/menu/item/textslider.c:31
@@ -52,15 +53,15 @@ msgstr "errore: lo stato è impostato su %d\n"
 
 #: qcsrc/menu/gamecommand.qc:65
 msgid "Usage: menu_cmd command..., where possible commands are:\n"
-msgstr "Uso: menu_cmd command..., dove è possibile i comandi sono:\n"
+msgstr "Uso: menu_cmd command..., dove i possibili comandi sono:\n"
 
 #: qcsrc/menu/gamecommand.qc:66
 msgid "  sync - reloads all cvars on the current menu page\n"
-msgstr "sync - ricarica tutti i cvar sulla corrente pagina\n"
+msgstr "sync - ricarica tutte le cvar sulla corrente pagina\n"
 
 #: qcsrc/menu/gamecommand.qc:67
 msgid "  directmenu ITEM - select a menu item as main item\n"
-msgstr "directmenu ITEM - seleziona un oggetto come il principale\n"
+msgstr "  directmenu OGGETTO - seleziona un oggetto come il principale\n"
 
 #: qcsrc/menu/gamecommand.qc:193
 msgid "error creating curl handle\n"
@@ -129,7 +130,7 @@ msgstr "Schermo intero"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:46
 msgid "Vertical Synchronization"
-msgstr "Sincronizzazione Verticale"
+msgstr "Sincronizzazione verticale"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:49
 msgid "Use OpenGL 2.0 shaders (GLSL)"
@@ -161,7 +162,7 @@ msgstr "Vertici e Triangoli"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:65
 msgid "Depth first:"
-msgstr "Profondità primaria:"
+msgstr "Profondità prima:"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:67
 msgid "DF^Disabled"
@@ -197,7 +198,7 @@ msgstr "Gamma:"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:87
 msgid "Contrast boost:"
-msgstr "Boost contrasto:"
+msgstr "Aumenta contrasto:"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:90
 msgid "Saturation:"
@@ -205,11 +206,11 @@ msgstr "Saturazione:"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:95
 msgid "Use GLSL to handle color control"
-msgstr "Usa i GLSL per trattare il controllo del colore"
+msgstr "Usa GLSL per gestire il controllo del colore"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:99
 msgid "LIT^Ambient:"
-msgstr "LIT^Ambiente"
+msgstr "LIT^Ambiente:"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:102
 msgid "Intensity:"
@@ -269,7 +270,7 @@ msgstr "Colore team:"
 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:58
 #: qcsrc/menu/xonotic/util.qc:641
 msgid "Test team color in configure mode"
-msgstr "Testa il colore del team in modalità di configurazione"
+msgstr "Prova colore team in modalità configurazione"
 
 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:61
 #: qcsrc/menu/xonotic/util.qc:644
@@ -278,7 +279,7 @@ msgstr "Riempimento:"
 
 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:68
 msgid "HUD Dock:"
-msgstr "Bordo dell'HUD:"
+msgstr "Sfondo dell'HUD:"
 
 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:70
 msgid "DOCK^Disabled"
@@ -342,7 +343,7 @@ msgstr "Informazioni"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c:25
 msgid "Flip align"
-msgstr "Cambiare allineazione"
+msgstr "Inverti allineamento"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:5
 msgid "Waypoints"
@@ -350,19 +351,19 @@ msgstr "Waypoint"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:23
 msgid "Waypoint settings:"
-msgstr "Impostazioni dei Waypoint"
+msgstr "Impostazioni dei waypoint"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:26
 msgid "Show base waypoints"
-msgstr "Mostra i Waypoint della base"
+msgstr "Mostra i waypoint della base"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:29
 msgid "Waypoint scale:"
-msgstr "Gradazioni dei Waypoint:"
+msgstr "Grandezza dei waypoint:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:34
 msgid "Waypoint alpha:"
-msgstr "Opacità dei Waypoint"
+msgstr "Opacità dei waypoint"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:39
 msgid "Show names:"
@@ -401,7 +402,7 @@ msgstr "Impostazioni avanzate"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc_cvars.c:23
 msgid "Cvar filter:"
-msgstr "Filtro dei Cvar:"
+msgstr "Filtro delle cvar:"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc_cvars.c:24
 #: qcsrc/menu/xonotic/dialog_settings_input.c:41
@@ -421,7 +422,7 @@ msgstr "Tipo:"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc_cvars.c:42
 msgid "Value:"
-msgstr "Valori:"
+msgstr "Valore:"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc_cvars.c:54
 msgid "Description:"
@@ -513,16 +514,16 @@ msgstr "Altro"
 
 #: qcsrc/menu/xonotic/dialog_firstrun.c:4
 msgid "Welcome"
-msgstr "Benvenuti"
+msgstr "Benvenuto"
 
 #: qcsrc/menu/xonotic/dialog_firstrun.c:32
 msgid "Please answer a few initial questions to enhance the game experience."
-msgstr "Per favore rispondi a poche domande iniziali per migliorare l'esperienza di gioco"
+msgstr "Per favore rispondi a poche domande iniziali per migliorare l'esperienza di gioco."
 
 #: qcsrc/menu/xonotic/dialog_firstrun.c:36
 #: qcsrc/menu/xonotic/dialog_settings_misc.c:35
 msgid "Text language:"
-msgstr "Lingua:"
+msgstr "Lingua testo:"
 
 #: qcsrc/menu/xonotic/dialog_firstrun.c:45
 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.c:39
@@ -546,7 +547,7 @@ msgstr "Livello %d: %s"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:26
 msgid "Key bindings:"
-msgstr "Tasti \"bind\":"
+msgstr "Associazione tasti (bind):"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:31
 msgid "Change key..."
@@ -732,15 +733,15 @@ msgstr "Mostra anche le notifiche sulla console"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_notification.c:28
 msgid "Flip notify order"
-msgstr "Cambia ordine delle notifiche"
+msgstr "Inverti ordine delle notifiche"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_notification.c:31
 msgid "Entry lifetime:"
-msgstr "Tempo di transizione:"
+msgstr "Durata notifica:"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_notification.c:35
 msgid "Entry fadetime:"
-msgstr "Tempo di dissolvenza:"
+msgstr "Durata dissolvenza:"
 
 #: qcsrc/menu/xonotic/util.qh:49
 msgid "Enable panel"
@@ -748,7 +749,7 @@ msgstr "Abilita pannello"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.c:26
 msgid "Menu skins:"
-msgstr "Tema del menu:"
+msgstr "Temi del menu:"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.c:47
 msgid "Show current time"
@@ -813,7 +814,7 @@ msgstr "Giocatore singolo"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.c:59
 msgid "Instant action! (random map with bots)"
-msgstr "Inizia ora! (mappe casuale con bot)"
+msgstr "Inizia ora! (mappa casuale con bot)"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.c:80
 msgid "Start Singleplayer!"
@@ -821,11 +822,11 @@ msgstr "Inizia modalità Giocatore Singolo!"
 
 #: qcsrc/menu/xonotic/skinlist.c:105
 msgid "<TITLE>"
-msgstr "<TITLE>"
+msgstr "<TITOLO>"
 
 #: qcsrc/menu/xonotic/skinlist.c:106
 msgid "<AUTHOR>"
-msgstr "<AUTHOR>"
+msgstr "<AUTORE>"
 
 #: qcsrc/menu/xonotic/skinlist.c:163
 #, c-format
@@ -859,7 +860,7 @@ msgstr "%d/%d"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c:166
 msgid "Official settings"
-msgstr "Impostazioni originali"
+msgstr "Impostazioni ufficiali"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c:166
 #, c-format
@@ -976,7 +977,7 @@ msgstr "Arena con la maggior parte delle armi"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:56
 #, c-format
 msgid "%s Arena"
-msgstr "%s Arena"
+msgstr "Arena con %s"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:68
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:167
@@ -996,7 +997,7 @@ msgstr "NIX"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:74
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:205
 msgid "Rocket Flying"
-msgstr "Rocket Flying"
+msgstr "Razzo volante"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:78
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:264
@@ -1011,7 +1012,7 @@ msgstr "Bassa gravità"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:82
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:170
 msgid "Cloaked"
-msgstr "Cloaked"
+msgstr "Invisibile"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:84
 msgid "Hook"
@@ -1035,7 +1036,7 @@ msgstr "Piñata"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:92
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:211
 msgid "Weapons stay"
-msgstr "Solo un'arma"
+msgstr "Armi rimangono"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:94
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:180
@@ -1082,7 +1083,7 @@ msgstr "Arene speciali:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:260
 msgid "Most weapons"
-msgstr "La maggior parte delle armi"
+msgstr "Maggior parte delle armi"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:4
 msgid "Radar Panel"
@@ -1130,19 +1131,19 @@ msgstr "Modalità zoom:"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:52
 msgid "Zoomed in"
-msgstr "Aumenta zoom"
+msgstr "Ingrandito"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:53
 msgid "Zoomed out"
-msgstr "Diminuisci zoom"
+msgstr "Non ingrandito"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:54
 msgid "Always zoomed"
-msgstr "Sempre zoomato"
+msgstr "Sempre ingrandito"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:55
 msgid "Never zoomed"
-msgstr "Mai zoomato"
+msgstr "Mai ingrandito"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c:4
 msgid "Race Timer Panel"
@@ -1154,7 +1155,7 @@ msgstr "Pannello Chat"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_chat.c:22
 msgid "Chat entries:"
-msgstr "Chat entries:"
+msgstr "N° righe della chat:"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_chat.c:25
 msgid "Chat size:"
@@ -1166,7 +1167,7 @@ msgstr "Durata chat:"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_chat.c:33
 msgid "Chat beep sound"
-msgstr "Suoni chat"
+msgstr "Suono della chat"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:5
 #: qcsrc/menu/xonotic/dialog_multiplayer.c:19
@@ -1202,7 +1203,7 @@ msgstr "Limiti di punteggio:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:65
 msgid "Player slots:"
-msgstr "Slot di giocatori:"
+msgstr "Posti per giocatori:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:68
 msgid "Number of bots:"
@@ -1214,7 +1215,7 @@ msgstr "Abilità bot:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:75
 msgid "Botlike"
-msgstr "\"Botlike\""
+msgstr "\"Come un bot\""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:76
 msgid "Beginner"
@@ -1254,7 +1255,7 @@ msgstr "Inumano"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:85
 msgid "Godlike"
-msgstr "\"Godlike\""
+msgstr "\"Come un Dio\""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:89
 msgid "Mutators..."
@@ -1278,7 +1279,7 @@ msgstr "Inizia Multiplayer!"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:155
 msgid "Capture limit:"
-msgstr "Limiti catture:"
+msgstr "Limite catture:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:159
 msgid "Lives:"
@@ -1306,11 +1307,11 @@ msgstr "Tasti \"bind\" definiti dall'utente"
 
 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.c:42
 msgid "Command when pressed:"
-msgstr "Comando mentre premuto:"
+msgstr "Comando quando premuto:"
 
 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.c:45
 msgid "Command when released:"
-msgstr "Comando mentre rilasciato:"
+msgstr "Comando quando rilasciato:"
 
 #: qcsrc/menu/xonotic/dialog_settings_input_userbind.c:48
 msgid "Save"
@@ -1335,7 +1336,7 @@ msgstr "Campo di vista:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:92
 msgid "View bobbing:"
-msgstr "View bobbing:"
+msgstr "Ondeggiamento vista:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:96
 msgid "Zoom factor:"
@@ -1356,7 +1357,7 @@ msgstr "Mirino:"
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:111
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:143
 msgid "Per weapon"
-msgstr "Per ogni arma"
+msgstr "Per singola arma"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:130
 msgid "Crosshair size:"
@@ -1396,7 +1397,7 @@ msgstr "Nemici"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:161
 msgid "Waypoints setup..."
-msgstr "Setup dei Waypoint..."
+msgstr "Setup dei waypoint..."
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:167
 msgid "Enter HUD editor"
@@ -1412,7 +1413,7 @@ msgstr "MDL^Nessuno"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:176
 msgid "MDL^Custom"
-msgstr "MDL^Personalizzaoto"
+msgstr "MDL^Personalizzato"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:177
 msgid "MDL^All"
@@ -1420,7 +1421,7 @@ msgstr "MDL^Tutti"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:179
 msgid "Disable gore effects"
-msgstr "Disabilita effetti gore"
+msgstr "Disabilita effetti sangue"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:181
 msgid "Gibs:"
@@ -1444,7 +1445,7 @@ msgstr "GIBS^Parecchi"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:190
 msgid "Damage splash:"
-msgstr "Damage splash:"
+msgstr "Schizzo del danno:"
 
 #: qcsrc/menu/xonotic/cvarlist.c:84
 msgid "will be saved to config.cfg"
@@ -1456,7 +1457,7 @@ msgstr "non sarà salvato"
 
 #: qcsrc/menu/xonotic/cvarlist.c:88
 msgid "private"
-msgstr "privato"
+msgstr "privata"
 
 #: qcsrc/menu/xonotic/cvarlist.c:90
 msgid "engine setting"
@@ -1529,7 +1530,7 @@ msgstr "Permetti spettatori"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:31
 msgid "Spawn shield:"
-msgstr "Protezione dallo Spawn:"
+msgstr "Protezione nascita:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:36
 msgid "Game speed:"
@@ -1541,7 +1542,7 @@ msgstr "Impostazioni Teamplay:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:43
 msgid "Friendly fire scale:"
-msgstr "Fattore di fuoco amico:"
+msgstr "Scala di fuoco amico:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:47
 msgid "Virtual friendly fire (effect only)"
@@ -1569,35 +1570,35 @@ msgstr "Nessun voto"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:69
 msgid "2 choices"
-msgstr "2 voti"
+msgstr "2 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:70
 msgid "3 choices"
-msgstr "3 voti"
+msgstr "3 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:71
 msgid "4 choices"
-msgstr "4 voti"
+msgstr "4 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:72
 msgid "5 choices"
-msgstr "5 voti"
+msgstr "5 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:73
 msgid "6 choices"
-msgstr "6 voti"
+msgstr "6 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:74
 msgid "7 choices"
-msgstr "7 voti"
+msgstr "7 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:75
 msgid "8 choices"
-msgstr "8 voti"
+msgstr "8 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:76
 msgid "9 choices"
-msgstr "9 voti"
+msgstr "9 scelte"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:79
 msgid "Simple majority wins vcall"
@@ -1611,7 +1612,7 @@ msgstr "Ricevuta richiesta HTTP per un invalido id %d.\n"
 #: qcsrc/menu/xonotic/util.qc:278
 #, c-format
 msgid "error receiving update notification: status is %d\n"
-msgstr "errore durante notifica aggiornamento: lo stato è impostato su %d\n"
+msgstr "errore durante la notifica d'aggiornamento: lo stato è impostato su %d\n"
 
 #: qcsrc/menu/xonotic/util.qc:283
 msgid "error: received HTML instead of an update notification\n"
@@ -1637,7 +1638,7 @@ msgstr "Autogenerando le mapinfo per le nuove mappe..."
 #: qcsrc/menu/xonotic/util.qc:425
 #, c-format
 msgid "Update to %s now!"
-msgstr "Aggiorna da %s ora!"
+msgstr "Aggiorna a %s ora!"
 
 #: qcsrc/menu/xonotic/util.qc:502
 msgid ""
@@ -1645,7 +1646,7 @@ msgid ""
 "^1Expect visual problems.\n"
 msgstr ""
 "^1ERRORE: La compressione texture è richiesta ma non supportata.\n"
-"^1Previsti problemi di visione.\n"
+"^1Previsti problemi visuali.\n"
 
 #: qcsrc/menu/xonotic/util.qc:524
 msgid "Arena"
@@ -1726,7 +1727,7 @@ msgstr "Sfondo:"
 #: qcsrc/menu/xonotic/util.qc:634
 #: qcsrc/menu/xonotic/util.qc:646
 msgid "Default"
-msgstr "Prefefinito"
+msgstr "Predefinito"
 
 #: qcsrc/menu/xonotic/util.qc:612
 msgid "Use default"
@@ -1738,7 +1739,7 @@ msgstr "Colore Team:"
 
 #: qcsrc/menu/xonotic/playermodel.c:174
 msgid "<no model found>"
-msgstr "<no model found>"
+msgstr "<nessun modello trovato>"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_ammo.c:4
 msgid "Ammo Panel"
@@ -1794,11 +1795,11 @@ msgstr "Cambia automaticamente armi dopo raccolta"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:45
 msgid "Draw 1st person weapon model"
-msgstr "Mostra modello arma in 1^ persona"
+msgstr "Mostra modello arma in 1ª persona"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:48
 msgid "Left align"
-msgstr "Allina a sinistra"
+msgstr "Allinea a sinistra"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:50
 msgid "Right align"
@@ -1806,7 +1807,7 @@ msgstr "Allinea a destra"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c:53
 msgid "Flip view horizontally"
-msgstr "Volta la vista orizzontalmente"
+msgstr "Capovolgi la vista orizzontalmente"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:38
 msgid "Quality preset:"
@@ -1814,7 +1815,7 @@ msgstr "Preset qualità:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:41
 msgid "PRE^OMG!"
-msgstr "PRE^OMG!"
+msgstr "PRE^Oh mio dio!"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:42
 msgid "PRE^Low"
@@ -1846,7 +1847,7 @@ msgstr "Dettagli geometrici:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:54
 msgid "DET^Lowest"
-msgstr "DET^Molto Bassi"
+msgstr "DET^Molto bassi"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:55
 msgid "DET^Low"
@@ -1917,11 +1918,11 @@ msgstr "RES^Ottima"
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:91
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:94
 msgid "Avoid lossy texture compression"
-msgstr "Evita compressione lossy delle texture"
+msgstr "Evita compressione texture con perdita"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:100
 msgid "Anisotropy:"
-msgstr "Filtro Anisotropico:"
+msgstr "Anisotropia:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:102
 msgid "ANISO^Disabled"
@@ -1945,7 +1946,7 @@ msgstr "Distanza dei particolari:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:117
 msgid "Decals"
-msgstr "Simboli"
+msgstr "Segni"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:120
 msgid "Distance:"
@@ -1961,19 +1962,19 @@ msgstr "Usa lightmaps"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:133
 msgid "Deluxe mapping"
-msgstr "Deluxe mapping"
+msgstr "Mappaggio Deluxe"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:135
 msgid "Gloss"
-msgstr "Lucidezza"
+msgstr "Lucentezza"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:138
 msgid "Offset mapping"
-msgstr "Offset mapping"
+msgstr "Mappaggio in offset"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:140
 msgid "Relief mapping"
-msgstr "Relief mapping"
+msgstr "Mappaggio in rilievo"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:143
 msgid "Reflections:"
@@ -2001,7 +2002,7 @@ msgstr "Nessuna illuminazione dinamica"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:157
 msgid "Flash blend approximation"
-msgstr "Appromazione Flash blend"
+msgstr "Approssimazione Flash blend"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:159
 msgid "Realtime dynamic lighting"
@@ -2022,11 +2023,11 @@ msgstr "Usa mappe normali"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:170
 msgid "Soft shadows"
-msgstr "Ombre leggere"
+msgstr "Ombre morbide"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:173
 msgid "Coronas"
-msgstr "Coronas"
+msgstr "Corone"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:175
 msgid "Bloom"
@@ -2038,7 +2039,7 @@ msgstr "High Dynamic Range (HDR)"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:181
 msgid "Motion blur:"
-msgstr "Sfocamento in movimento:"
+msgstr "Sfocatura da movimento:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:187
 msgid "Damage blur:"
@@ -2066,11 +2067,11 @@ msgstr "ISDN"
 
 #: qcsrc/menu/xonotic/dialog_settings_network.c:37
 msgid "Slow ADSL"
-msgstr "ADSL Lenta"
+msgstr "ADSL lenta"
 
 #: qcsrc/menu/xonotic/dialog_settings_network.c:38
 msgid "Fast ADSL"
-msgstr "ADSL Veloce"
+msgstr "ADSL veloce"
 
 #: qcsrc/menu/xonotic/dialog_settings_network.c:39
 msgid "Broadband"
@@ -2184,7 +2185,7 @@ msgstr "Allineamento icone:"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_powerups.c:45
 msgid "Flip strength and shield positions"
-msgstr "Cambia posizioni dell'armatura e della vita"
+msgstr "Inverti posizioni di armatura e vita"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.c:27
 msgid "Master:"
@@ -2397,5 +2398,5 @@ msgstr "Pannello vita/armatura"
 
 #: qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c:45
 msgid "Flip health and armor positions"
-msgstr "Cambia posizioni vita e armatura"
+msgstr "Inverti posizioni di vita e armatura"
 

diff --git a/models/items/5hp.tga b/models/items/5hp.tga
new file mode 100644 (file)
index 0000000..e731fe4
Binary files /dev/null and b/models/items/5hp.tga differ

diff --git a/models/items/5hp_gloss.tga b/models/items/5hp_gloss.tga
new file mode 100644 (file)
index 0000000..4e4b32b
Binary files /dev/null and b/models/items/5hp_gloss.tga differ

diff --git a/models/items/5hp_glow.tga b/models/items/5hp_glow.tga
new file mode 100644 (file)
index 0000000..f1ae8f2
Binary files /dev/null and b/models/items/5hp_glow.tga differ

diff --git a/models/items/5hp_norm.tga b/models/items/5hp_norm.tga
new file mode 100644 (file)
index 0000000..78eb7c3
Binary files /dev/null and b/models/items/5hp_norm.tga differ

diff --git a/models/items/5hp_reflect.tga b/models/items/5hp_reflect.tga
new file mode 100644 (file)
index 0000000..e880795
Binary files /dev/null and b/models/items/5hp_reflect.tga differ

diff --git a/models/items/g_h1.md3 b/models/items/g_h1.md3
index 3b6e7e9707e09fc9ac91d920e79f30b201ffcdfd..9e6da7569bfc7cda57b456ac75d57c6c6233440d 100644 (file)
Binary files a/models/items/g_h1.md3 and b/models/items/g_h1.md3 differ

diff --git a/models/items/g_h100.md3 b/models/items/g_h100.md3
index 1893bc5387c3550f302a97406a6e985ce7e1431f..f589d08bc09a8a60a33798b80e17f281ae3f7f6b 100644 (file)
Binary files a/models/items/g_h100.md3 and b/models/items/g_h100.md3 differ

diff --git a/models/items/g_h25.md3 b/models/items/g_h25.md3
index 09ca47b04f2d5e3c9fd4143d6fded0c8efe83c4a..06419c944320e53db4b6056b738888a55cc9aa15 100644 (file)
Binary files a/models/items/g_h25.md3 and b/models/items/g_h25.md3 differ

diff --git a/models/items/g_h50.md3 b/models/items/g_h50.md3
index 9d26a567618d2b1962d622d12e7073c976c1a07a..90a91f2a59b9eec19b8d9b23c4a5871087503030 100644 (file)
Binary files a/models/items/g_h50.md3 and b/models/items/g_h50.md3 differ

diff --git a/models/items/glass_gloss.tga b/models/items/glass_gloss.tga
new file mode 100644 (file)
index 0000000..55e3793
Binary files /dev/null and b/models/items/glass_gloss.tga differ

diff --git a/models/items/h25.tga b/models/items/h25.tga
new file mode 100644 (file)
index 0000000..377c6e4
Binary files /dev/null and b/models/items/h25.tga differ

diff --git a/models/items/h25_gloss.tga b/models/items/h25_gloss.tga
new file mode 100644 (file)
index 0000000..73e16a1
Binary files /dev/null and b/models/items/h25_gloss.tga differ

diff --git a/models/items/h25_glow.tga b/models/items/h25_glow.tga
new file mode 100644 (file)
index 0000000..d76a2bc
Binary files /dev/null and b/models/items/h25_glow.tga differ

diff --git a/models/items/h25_norm.tga b/models/items/h25_norm.tga
new file mode 100644 (file)
index 0000000..769d388
Binary files /dev/null and b/models/items/h25_norm.tga differ

diff --git a/models/items/h25_reflect.tga b/models/items/h25_reflect.tga
new file mode 100644 (file)
index 0000000..73e16a1
Binary files /dev/null and b/models/items/h25_reflect.tga differ

diff --git a/models/items/h50.tga b/models/items/h50.tga
new file mode 100644 (file)
index 0000000..36cdbe0
Binary files /dev/null and b/models/items/h50.tga differ

diff --git a/models/items/h50_gloss.tga b/models/items/h50_gloss.tga
new file mode 100644 (file)
index 0000000..4a52e3f
Binary files /dev/null and b/models/items/h50_gloss.tga differ

diff --git a/models/items/h50_glow.tga b/models/items/h50_glow.tga
new file mode 100644 (file)
index 0000000..0b6efb0
Binary files /dev/null and b/models/items/h50_glow.tga differ

diff --git a/models/items/h50_norm.tga b/models/items/h50_norm.tga
new file mode 100644 (file)
index 0000000..4ef7475
Binary files /dev/null and b/models/items/h50_norm.tga differ

diff --git a/models/items/h50_reflect.tga b/models/items/h50_reflect.tga
new file mode 100644 (file)
index 0000000..272b07e
Binary files /dev/null and b/models/items/h50_reflect.tga differ

diff --git a/models/items/h_mega.tga b/models/items/h_mega.tga
new file mode 100644 (file)
index 0000000..2c56ea2
Binary files /dev/null and b/models/items/h_mega.tga differ

diff --git a/models/items/h_mega_gloss.tga b/models/items/h_mega_gloss.tga
new file mode 100644 (file)
index 0000000..26cb031
Binary files /dev/null and b/models/items/h_mega_gloss.tga differ

diff --git a/models/items/h_mega_glow.tga b/models/items/h_mega_glow.tga
new file mode 100644 (file)
index 0000000..ede6462
Binary files /dev/null and b/models/items/h_mega_glow.tga differ

diff --git a/models/items/h_mega_norm.tga b/models/items/h_mega_norm.tga
new file mode 100644 (file)
index 0000000..39a88d7
Binary files /dev/null and b/models/items/h_mega_norm.tga differ

diff --git a/models/items/h_mega_reflect.tga b/models/items/h_mega_reflect.tga
new file mode 100644 (file)
index 0000000..6fc8a8b
Binary files /dev/null and b/models/items/h_mega_reflect.tga differ

diff --git a/models/items/red.tga b/models/items/red.tga
new file mode 100644 (file)
index 0000000..07ce79a
Binary files /dev/null and b/models/items/red.tga differ

diff --git a/models/items/red_gloss.tga b/models/items/red_gloss.tga
new file mode 100644 (file)
index 0000000..55e3793
Binary files /dev/null and b/models/items/red_gloss.tga differ

diff --git a/models/items/red_reflect.tga b/models/items/red_reflect.tga
new file mode 100644 (file)
index 0000000..e8eaf4f
Binary files /dev/null and b/models/items/red_reflect.tga differ

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 09ec96eabaaa9ece2608496c64c551d646d1b695..7f1c6dafb75a3dfcd7fc584ee205a8c41b758cc1 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1096,7 +1096,7 @@ void CSQC_UpdateView(float w, float h)
                                        
 
                                // handle the values
-                               if (activeweapon == WEP_NEX && nex_charge && autocvar_crosshair_ring_nex) // ring around crosshair representing velocity-dependent damage for the nex
+                               if (autocvar_crosshair_ring && activeweapon == WEP_NEX && nex_charge && autocvar_crosshair_ring_nex) // ring around crosshair representing velocity-dependent damage for the nex
                                {
                                        if (nex_chargepool || use_nex_chargepool) { 
                                                use_nex_chargepool = 1; 
@@ -1116,7 +1116,7 @@ void CSQC_UpdateView(float w, float h)
                                        ring_rgb = wcross_color;
                                        ring_image = "gfx/crosshair_ring_nexgun.tga";
                                }
-                               else if (activeweapon == WEP_MINE_LAYER && minelayer_maxmines && autocvar_crosshair_ring_minelayer) 
+                               else if (autocvar_crosshair_ring && activeweapon == WEP_MINE_LAYER && minelayer_maxmines && autocvar_crosshair_ring_minelayer) 
                                {
                                        ring_value = bound(0, getstati(STAT_LAYED_MINES) / minelayer_maxmines, 1); // if you later need to use the count of bullets in another place, then add a float for it. For now, no need to.
                                        ring_alpha = autocvar_crosshair_ring_minelayer_alpha;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index d68f6322df83f4de90174ae3214f5c07d8fd0fa6..bda4acccd1f21a0ba03721045da0f596316d84e2 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -508,6 +508,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_PanelCvar_q("_progressbar");
                                        HUD_Write_PanelCvar_q("_progressbar_strength");
                                        HUD_Write_PanelCvar_q("_progressbar_shield");
+                                       HUD_Write_PanelCvar_q("_text");
                                        break;
                                case HUD_PANEL_HEALTHARMOR:
                                        HUD_Write_PanelCvar_q("_flip");
@@ -520,6 +521,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        break;
                                case HUD_PANEL_NOTIFY:
                                        HUD_Write_PanelCvar_q("_flip");
+                                       HUD_Write_PanelCvar_q("_fontsize");
                                        HUD_Write_PanelCvar_q("_print");
                                        break;
                                case HUD_PANEL_RADAR:
@@ -4958,7 +4960,7 @@ void HUD_InfoMessages(void)
                }
                else if(warmup_stage && !intermission && !spectatee_status)
                {
-                       s = strcat("^2Press ^3%s^2 to end warmup", getcommandkey("ready", "ready"));
+                       s = sprintf(_("^2Press ^3%s^2 to end warmup"), getcommandkey("ready", "ready"));
                        drawInfoMessage(s)
                }
 
@@ -5179,9 +5181,9 @@ void HUD_ShowAcceleration(void)
        }
 
        if (acceleration > 0)
-        HUD_Panel_DrawProgressBar(pos, eX * (vid_conwidth - pos_x) + eY * sz, "statusbar", 0, 0, acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+        HUD_Panel_DrawProgressBar(pos, eX * (vid_conwidth - pos_x) + eY * sz, "accelbar", 0, 0, acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
        else
-        HUD_Panel_DrawProgressBar(eY * pos_y, eX * pos_x + eY * sz, "statusbar", 0, 1, -acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+        HUD_Panel_DrawProgressBar(eY * pos_y, eX * pos_x + eY * sz, "accelbar", 0, 1, -acceleration * scale, rgb, alpha * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
 void HUD_Reset (void)

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index e94d6a68aa786786f9babdf009e71deeb5b64259..a9e7ca4a94beee110d55d8b85d3879fa03132eff 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -26,7 +26,7 @@ string MapVote_FormatMapItem(float id, string map, float count, float maxwidth,
        {
                if(count == 1)
                        post = _(" (1 vote)");
-               else
+               else if(count >= 0)
                        post = sprintf(_(" (%d votes)"), count);
        }
        else

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index d38b7c9ba0d4837de902f2b86a4d5bb6e2111d92..41ecb91efa915673aff7313c425b5c02af0c5b55 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -501,7 +501,7 @@ void drawpic_aspect_skin_expanding(vector position, string pic, vector scale, ve
        float sz;
        sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-       drawpic_skin(position + expandingbox_resize_centered_box_offset(sz, scale, 1), pic, scale * sz, rgb, alpha * (1 - fadelerp), flag);
+       drawpic_aspect_skin(position + expandingbox_resize_centered_box_offset(sz, scale, 1), pic, scale * sz, rgb, alpha * (1 - fadelerp), flag);
 }
 
 void drawpic_aspect_skin_expanding_two(vector position, string pic, vector scale, vector rgb, float alpha, float flag, float fadelerp)

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index b17a929004034fc8d8ea0ffddb82668c4e5095ba..84d090acc21e9eadc29d86e391612682f67770b6 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -720,7 +720,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 
                if(sv_gentle > 0 || autocvar_ekg) {
                        // remove corpse
-                       PlayerCorpseDamage (inflictor, attacker, 100.0, deathtype, hitloc, force);
+                       PlayerCorpseDamage (inflictor, attacker, autocvar_sv_gibhealth+1.0, deathtype, hitloc, force);
                }
 
                // reset fields the weapons may use just in case

diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index b31e1429381ca5637966f9dfd8a0bde4c308474c..cf16cecff77aedae5f569a8aff92b3f0901f8e51 100644 (file)
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -173,7 +173,7 @@ void place_flag()
 
        setattachment(self, world, "");
        self.mdl = self.model;
-       self.flags = FL_ITEM;
+       self.flags = FL_ITEM | FL_NOTARGET;
        self.solid = SOLID_TRIGGER;
        self.movetype = MOVETYPE_NONE;
        self.velocity = '0 0 0';
@@ -234,7 +234,7 @@ void RegenFlag(entity e)
        e.angles = e.mangle;
        e.cnt = FLAG_BASE;
        e.owner = world;
-       e.flags = FL_ITEM; // clear FL_ONGROUND and any other junk
+       e.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk
 };
 
 void ReturnFlag(entity e)
@@ -319,7 +319,7 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker)
                p.flagcarried = world;
        e.owner = world;
 
-       e.flags = FL_ITEM; // clear FL_ONGROUND and any other junk
+       e.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk
        e.solid = SOLID_TRIGGER;
        e.movetype = MOVETYPE_TOSS;
        // setsize(e, '-16 -16 0', '16 16 74');
@@ -549,7 +549,7 @@ void FlagTouch()
 
        if (self.cnt == FLAG_DROPPED)
        {
-               self.flags = FL_ITEM; // clear FL_ONGROUND and any other junk
+               self.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk
                if (other.team == self.team || (other.team != COLOR_TEAM1 && other.team != COLOR_TEAM2))
                {
                        // return flag

diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc
index b0085224fadb3064e9aef6a817c1c2a6fc263222..daec8754e2c02e9534a1316cfd4733b924e3da8f 100644 (file)
--- a/qcsrc/server/gamecommand.qc
+++ b/qcsrc/server/gamecommand.qc
@@ -779,10 +779,10 @@ void GameCommand(string command)
                                if(argc == 4)
                                {
                                        s = argv(2);
-                                       s = strreplace(s, "\n", "");
-                                       s = strreplace(s, "\\", "\\\\");
-                                       s = strreplace(s, "$", "$$");
-                                       s = strreplace(s, "\"", "\\\"");
+                                       s = strreplace("\n", "", s);
+                                       s = strreplace("\\", "\\\\", s);
+                                       s = strreplace("$", "$$", s);
+                                       s = strreplace("\"", "\\\"", s);
                                        stuffcmd(client, sprintf("\ninfobar %f \"%s\"\n", stof(argv(3)), s));
                                }
                                else

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index f4141c8a3df01899ca3754c2bcb20c8a98f24cfe..e0dfc6675342eb9282283f6f6599398896370e4a 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -605,37 +605,40 @@ void WarpZone_StartFrame()
                WarpZones_Reconnect();
        }
 
-       entity oldself, oldother;
-       oldself = self;
-       oldother = other;
-       for(e = world; (e = nextent(e)); )
+       if(warpzone_warpzones_exist)
        {
-               WarpZone_StoreProjectileData(e);
-               float f;
-               f = clienttype(e);
-               if(f == CLIENTTYPE_REAL)
-               {
-                       if(e.solid != SOLID_NOT) // not spectating?
-                               continue;
-                       if(e.movetype != MOVETYPE_NOCLIP && e.movetype != MOVETYPE_FLY) // not spectating? (this is to catch observers)
-                               continue;
-                       self = WarpZone_Find(e.origin + e.mins, e.origin + e.maxs);
-                       if(!self)
-                               continue;
-                       other = e;
-                       if(WarpZoneLib_ExactTrigger_Touch())
-                               continue;
-                       WarpZone_Teleport(e); // NOT triggering targets by this!
-               }
-               if(f == CLIENTTYPE_NOTACLIENT)
+               entity oldself, oldother;
+               oldself = self;
+               oldother = other;
+               for(e = world; (e = nextent(e)); )
                {
-                       for(; (e = nextent(e)); )
-                               WarpZone_StoreProjectileData(e);
-                       break;
+                       WarpZone_StoreProjectileData(e);
+                       float f;
+                       f = clienttype(e);
+                       if(f == CLIENTTYPE_REAL)
+                       {
+                               if(e.solid != SOLID_NOT) // not spectating?
+                                       continue;
+                               if(e.movetype != MOVETYPE_NOCLIP && e.movetype != MOVETYPE_FLY) // not spectating? (this is to catch observers)
+                                       continue;
+                               self = WarpZone_Find(e.origin + e.mins, e.origin + e.maxs);
+                               if(!self)
+                                       continue;
+                               other = e;
+                               if(WarpZoneLib_ExactTrigger_Touch())
+                                       continue;
+                               WarpZone_Teleport(e); // NOT triggering targets by this!
+                       }
+                       if(f == CLIENTTYPE_NOTACLIENT)
+                       {
+                               for(; (e = nextent(e)); )
+                                       WarpZone_StoreProjectileData(e);
+                               break;
+                       }
                }
+               self = oldself;
+               other = oldother;
        }
-       self = oldself;
-       other = oldother;
 }
 
 .float warpzone_reconnecting;

diff --git a/scripts/items.shader b/scripts/items.shader
new file mode 100644 (file)
index 0000000..4d65657
--- /dev/null
+++ b/scripts/items.shader
@@ -0,0 +1,41 @@
+models/items/5hp
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map models/items/5hp.tga
+               rgbgen lightingDiffuse
+       }
+}
+models/items/h25
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map models/items/h25.tga
+               rgbgen lightingDiffuse
+       }
+}
+models/items/red
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map models/items/red.tga
+               blendfunc filter
+               rgbgen lightingDiffuse
+       }
+}
+models/items/h50
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map models/items/h50.tga
+               rgbgen lightingDiffuse
+       }
+}
+models/items/h_mega
+{
+       dpreflectcube cubemaps/default/sky
+       {
+               map models/items/h_mega.tga
+               rgbgen lightingDiffuse
+       }
+}
\ No newline at end of file