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"
seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
seta hud_panel_infomessages_flip "" "1 = align the items to the right"
+<<<<<<< HEAD
seta hud_panel_physics "" "enable/disable this panel, 1 = show if not observing, 2 = show always"
seta hud_panel_physics_pos "" "position of this base of the panel"
seta hud_panel_physics_size "" "size of this panel"
seta hud_panel_physics_progressbar "" "enable progressbar in panel (2 = only for speed; 3 = only for acceleration)"
seta hud_panel_physics_acceleration_progressbar_mode "" "0 = progressbar increases from the center to the right if the acceleration is positive, to the left if it's negative; 1 = progressbar increases from the border in the same direction for both positive and negative accelerations"
seta hud_panel_physics_text "" "show text in panel (2 = only for speed; 3 = only for acceleration)"
+=======
+seta hud_panel_shownames "" "enable/disable this panel, 1 = teammates only, 2 = everyone"
+seta hud_panel_shownames_pos "" "position of this base of the panel"
+seta hud_panel_shownames_size "" "size of this panel"
+seta hud_panel_shownames_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_shownames_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_shownames_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_shownames_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_shownames_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_shownames_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+>>>>>>> fruitiex/better_shownames
--- /dev/null
+// 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
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"
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
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
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
// 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
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
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
seta hud_panel_ammo_maxammo "40" "when you have this much ammo, the ammo status bar is full"
-seta hud_panel_healtharmor_maxhealth "250" "when you have this much health, the health status bar is full"
-seta hud_panel_healtharmor_maxarmor "150" "when you have this much armor, the armor status bar is full"
+seta hud_panel_healtharmor_maxhealth "200" "when you have this much health, the health status bar is full"
+seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the armor status bar is full"
seta hud_panel_healtharmor_progressbar_gfx 1 "add graphic effects to the progressbars when spawning and when being damaged"
seta hud_panel_notify_time 10 "time that a new entry stays until it fades out"
seta hud_panel_physics_acceleration_max 1.5 "acceleration progressbar gets completely filled up by this value (in g)"
seta hud_panel_physics_acceleration_vertical 0 "include the acceleration on the Z-axis"
+seta hud_panel_shownames_sustain 0.5 "seconds that shownames will sustain after not aiming at a player anymore"
+
seta hud_showbinds 1 "what to show in the HUD to indicate certain keys to press: 0 display commands, 1 bound keys, 2 both"
seta hud_showbinds_limit 2 "maximum number of bound keys to show for a command. 0 for unlimited"
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"
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
seta hud_progressbar_acceleration_color "0.5 0.75 1"
seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
-seta _hud_panelorder "12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 15 "
+seta _hud_panelorder "15 12 9 10 5 6 14 0 7 4 11 2 1 3 8 13 16 "
seta hud_configure_grid "1"
seta hud_configure_grid_xsize "0.010000"
seta hud_panel_powerups_bg_color_team ""
seta hud_panel_powerups_bg_alpha ""
seta hud_panel_powerups_bg_border ""
-seta hud_panel_powerups_bg_padding "0"
-seta hud_panel_powerups_flip "0"
+seta hud_panel_powerups_bg_padding ""
+seta hud_panel_powerups_flip "1"
seta hud_panel_powerups_iconalign "3"
seta hud_panel_powerups_baralign "3"
seta hud_panel_powerups_progressbar "1"
seta hud_panel_physics_progressbar "1"
seta hud_panel_physics_text "1"
+seta hud_panel_shownames 1
+seta hud_panel_shownames_pos "0.350000 0.700000"
+seta hud_panel_shownames_size "0.300000 0.050000"
+seta hud_panel_shownames_bg "0"
+seta hud_panel_shownames_bg_color ""
+seta hud_panel_shownames_bg_color_team ""
+seta hud_panel_shownames_bg_alpha ""
+seta hud_panel_shownames_bg_border ""
+seta hud_panel_shownames_bg_padding "0"
+
menu_sync
seta hud_progressbar_acceleration_color "0.5 0.75 1"
seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
-seta _hud_panelorder "10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 15 "
+seta _hud_panelorder "15 10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 16 "
seta hud_configure_grid "1"
seta hud_configure_grid_xsize "0.010000"
seta hud_progressbar_acceleration_color "0.5 0.75 1"
seta hud_progressbar_acceleration_neg_color "0.125 0.25 0.5"
-seta _hud_panelorder "3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 15 "
+seta _hud_panelorder "15 3 1 2 11 10 0 14 6 9 13 4 12 7 5 8 "
seta hud_configure_grid "1"
seta hud_configure_grid_xsize "0.010000"
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"
seta hud_progressbar_acceleration_color "0.25 1 0.25"
seta hud_progressbar_acceleration_neg_color "1 0.25 0.25"
-seta _hud_panelorder "0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 15 "
+seta _hud_panelorder "15 0 11 8 5 6 14 9 13 7 2 3 1 10 12 4 "
seta hud_configure_grid "1"
seta hud_configure_grid_xsize "0.01"
fi Finnish "Suomi"
fr French "Français"
hu Hungarian "Magyar"
+it Italian "Italiano"
nl Dutch "Nederlands"
pt Portuguese "Português"
ro Romanian "Romana"
-# 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"
#: 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
#: 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"
#: 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)"
#: 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"
#: 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:"
#: 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:"
#: 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
#: 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"
#: 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"
#: 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:"
#: 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
#: 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:"
#: 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
#: 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..."
#: 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"
#: 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"
#: 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!"
#: 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
#: 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
#: 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
#: 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
#: 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"
#: 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
#: 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"
#: 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"
#: 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:"
#: 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
#: 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:"
#: 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"
#: 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..."
#: 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:"
#: 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"
#: 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:"
#: 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:"
#: 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"
#: 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"
#: 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:"
#: 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"
#: qcsrc/menu/xonotic/cvarlist.c:88
msgid "private"
-msgstr "privato"
+msgstr "privata"
#: qcsrc/menu/xonotic/cvarlist.c:90
msgid "engine setting"
#: 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:"
#: 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)"
#: 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"
#: 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"
#: 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 ""
"^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"
#: 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"
#: 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"
#: 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"
#: 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:"
#: 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"
#: 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"
#: 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"
#: qcsrc/menu/xonotic/dialog_settings_effects.c:117
msgid "Decals"
-msgstr "Simboli"
+msgstr "Segni"
#: qcsrc/menu/xonotic/dialog_settings_effects.c:120
msgid "Distance:"
#: 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:"
#: 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"
#: 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"
#: 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:"
#: 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"
#: 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:"
#: 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"
float serverflags;
float uid2name_dialog;
+
+string shownames_netname;
+float shownames_health;
+float shownames_armor;
+float shownames_time;
weapontime = time; // ping the weapon panel
}
+void Net_ShowNames()
+{
+ string thename;
+ float thehealth, thearmor;
+
+ if(shownames_netname)
+ strunzone(shownames_netname);
+ thename = strzone(ReadString());
+ thehealth = ReadByte();
+ thearmor = ReadByte();
+
+ if(autocvar_hud_panel_shownames == 1 && thehealth > 0) // teammates only
+ {
+ shownames_netname = thename;
+ shownames_health = thehealth;
+ shownames_armor = thearmor;
+
+ shownames_time = time + autocvar_hud_panel_shownames_sustain;
+ }
+ else if(autocvar_hud_panel_shownames == 2)
+ {
+ shownames_netname = thename;
+ shownames_health = thehealth;
+ shownames_armor = thearmor;
+
+ shownames_time = time + autocvar_hud_panel_shownames_sustain;
+ }
+}
+
// CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
// You must ALWAYS first acquire the temporary ID, which is sent as a byte.
// Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
Net_WeaponComplain();
bHandled = true;
break;
+ case TE_CSQC_SHOWNAMES:
+ Net_ShowNames();
+ bHandled = true;
+ break;
default:
// No special logic for this temporary entity; return 0 so the engine can handle it
bHandled = false;
// 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;
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;
float autocvar_hud_panel_radar_zoommode;
float autocvar_hud_panel_score;
float autocvar_hud_panel_score_rankings;
+float autocvar_hud_panel_shownames;
+float autocvar_hud_panel_shownames_sustain;
float autocvar_hud_panel_timer;
float autocvar_hud_panel_timer_increment;
float autocvar_hud_panel_vote;
vector HUD_Get_Num_Color (float x, float maxvalue)
{
+ float blinkingamt;
vector color;
- if(x > maxvalue) {
- color_x = 0;
+ if(x >= maxvalue) {
+ color_x = sin(2*M_PI*time);
color_y = 1;
- color_z = 0;
+ color_z = sin(2*M_PI*time);
}
else if(x > maxvalue * 0.75) {
color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
color_y = 0;
color_z = 0;
}
+
+ blinkingamt = (1 - x/maxvalue/0.25);
+ if(blinkingamt > 0)
+ {
+ color_x = color_x - color_x * blinkingamt * sin(2*M_PI*time);
+ color_y = color_y - color_y * blinkingamt * sin(2*M_PI*time);
+ color_z = color_z - color_z * blinkingamt * sin(2*M_PI*time);
+ }
return color;
}
}
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)
}
}
}
-// Physics panel (#15)
+// ShowNames (#15)
+//
+float shownames_alpha;
+void HUD_ShowNames(void)
+{
+ if(shownames_time < time && shownames_alpha == 0 && !autocvar__hud_configure)
+ return;
+
+ if(autocvar__hud_configure)
+ {
+ shownames_alpha = 1;
+ }
+ else
+ {
+ if(shownames_time < time)
+ shownames_alpha = bound(0, shownames_alpha - 2 * frametime, 1);
+ else
+ shownames_alpha = bound(0, shownames_alpha + 4 * frametime, 1);
+ }
+
+ if(!autocvar_hud_panel_shownames && !autocvar__hud_configure)
+ return;
+
+ hud_configure_active_panel = HUD_PANEL_SHOWNAMES;
+ HUD_Panel_UpdateCvars(shownames);
+ panel_fg_alpha *= shownames_alpha;
+ vector myPos, mySize;
+ myPos = panel_pos;
+ mySize = panel_size;
+
+ HUD_Panel_DrawBg(shownames_alpha);
+ if(panel_bg_padding)
+ {
+ myPos += '1 1 0' * panel_bg_padding;
+ mySize -= '2 2 0' * panel_bg_padding;
+ }
+
+ vector iconpos, iconsize;
+ vector namepos, namesize;
+ if(mySize_x/mySize_y > 6)
+ {
+ iconpos = myPos;
+ iconsize = eX * 2 * mySize_y + eY * mySize_y;
+
+ namepos = myPos + eX * 2 * mySize_y;
+ namesize = eX * mySize_x - eX * 2 * mySize_y + eY * mySize_y;
+ }
+ else
+ {
+ iconpos = myPos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_y;
+ iconsize = eX * mySize_y + eY * 0.5 * mySize_y;
+
+ namepos = myPos + eY * 0.5 * mySize_y;
+ namesize = eX * mySize_x + eY * 0.5 * mySize_y;
+ }
+
+ if(shownames_health > 0) // otherwise player is an enemy
+ {
+ // "ghost" backgrounds
+ drawpic_aspect_skin(iconpos, "health", '1 1 0' * iconsize_y, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
+ drawpic_aspect_skin(iconpos + '0.5 0 0' * iconsize_x, "armor", '1 1 0' * iconsize_y, '0 0 0', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
+
+ drawsetcliparea(0, myPos_y + iconsize_y - iconsize_y * min(1, shownames_health/autocvar_hud_panel_healtharmor_maxhealth), vid_conwidth, myPos_y + iconsize_y);
+ drawpic_aspect_skin(iconpos, "health", '1 1 0' * iconsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+
+ drawsetcliparea(0, myPos_y + iconsize_y - iconsize_y * min(1, shownames_armor/autocvar_hud_panel_healtharmor_maxarmor), vid_conwidth, myPos_y + iconsize_y);
+ drawpic_aspect_skin(iconpos + '0.5 0 0' * iconsize_x, "armor", '1 1 0' * iconsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawresetcliparea();
+ }
+ else
+ {
+ drawpic_aspect_skin(iconpos, "health_unknown", '1 1 0' * iconsize_y, '0 0 0', panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawpic_aspect_skin(iconpos + '0.5 0 0' * iconsize_x, "armor_unknown", '1 1 0' * iconsize_y, '0 0 0', panel_fg_alpha, DRAWFLAG_NORMAL);
+ }
+
+ if(autocvar__hud_configure)
+ drawcolorcodedstring_aspect(namepos, "Player1234", namesize, panel_fg_alpha, DRAWFLAG_NORMAL);
+ else
+ drawcolorcodedstring_aspect(namepos, shownames_netname, namesize, panel_fg_alpha, DRAWFLAG_NORMAL);
+}
+
+// Physics panel (#16)
//
vector acc_prevspeed;
float acc_prevtime, acc_avg, top_speed, top_speed_time;
-
void HUD_Physics(void)
{
if(!autocvar__hud_configure)
HUD_Panel_GetProgressBarColor(acceleration_neg);
else
HUD_Panel_GetProgressBarColor(acceleration);
- HUD_Panel_DrawProgressBar(panel_pos + acceleration_offset, panel_size, "progressbar", acceleration/autocvar_hud_panel_physics_acceleration_max, 0, acceleration_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
+ HUD_Panel_DrawProgressBar(panel_pos + acceleration_offset, panel_size, "accelbar", acceleration/autocvar_hud_panel_physics_acceleration_max, 0, acceleration_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
}
if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 3)
drawstring_aspect(panel_pos + acceleration_offset, strcat(ftos_decimals(acceleration, 2), "g"), panel_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
HUD_InfoMessages(); break;\
case (HUD_PANEL_PHYSICS):\
HUD_Physics(); break;\
+ case (HUD_PANEL_SHOWNAMES):\
+ HUD_ShowNames(); break;\
} ENDS_WITH_CURLY_BRACE
void HUD_Main (void)
HUD_Panel_GetMenuPos()\
} ENDS_WITH_CURLY_BRACE
+// FTEQCC I HATE YOU WHY DO YOU MAKE ME DO THIS??? :(
+// max macro length is 1024 characters, I must split it up :(
+
// Update all common cvars of given panel id
#define HUD_Panel_UpdateCvarsForId_Part2(id) \
switch(id) { \
case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdateCvars(infomessages) break; \
case HUD_PANEL_PHYSICS: HUD_Panel_UpdateCvars(physics); break;\
+ case HUD_PANEL_SHOWNAMES: HUD_Panel_UpdateCvars(shownames) break; \
}
#define HUD_Panel_UpdateCvarsForId(id) \
switch(id) { \
case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdatePosSize(infomessages) break;\
case HUD_PANEL_PHYSICS: HUD_Panel_UpdatePosSize(physics); break;\
+ case HUD_PANEL_SHOWNAMES: HUD_Panel_UpdatePosSize(shownames)\
}
+
#define HUD_Panel_UpdatePosSizeForId(id) \
switch(id) { \
case HUD_PANEL_WEAPONS: HUD_Panel_UpdatePosSize(weapons) break;\
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:
drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL);
-}
\ No newline at end of file
+}
{
if(count == 1)
post = _(" (1 vote)");
- else
+ else if(count >= 0)
post = sprintf(_(" (%d votes)"), count);
}
else
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)
const float TE_CSQC_WEAPONCOMPLAIN = 113;
const float TE_CSQC_NEX_SCOPE = 116;
const float TE_CSQC_MINELAYER_MAXMINES = 117;
+const float TE_CSQC_SHOWNAMES = 118;
const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
const float RACE_NET_CHECKPOINT_CLEAR = 1;
float WR_IMPACTEFFECT = 11; // (CSQC) impact effect
float WR_SWITCHABLE = 12; // (CSQC) impact effect
-
float HUD_PANEL_WEAPONS = 0;
float HUD_PANEL_AMMO = 1;
float HUD_PANEL_POWERUPS = 2;
float HUD_PANEL_ENGINEINFO = 13;
float HUD_PANEL_INFOMESSAGES = 14;
float HUD_PANEL_PHYSICS = 15;
-float HUD_PANEL_NUM = 16; // always last panel id + 1, please increment when adding a new panel
+float HUD_PANEL_SHOWNAMES = 16;
+float HUD_PANEL_NUM = 17; // always last panel id + 1, please increment when adding a new panel
string HUD_PANELNAME_WEAPONS = "weapons";
string HUD_PANELNAME_AMMO = "ammo";
string HUD_PANELNAME_ENGINEINFO = "engineinfo";
string HUD_PANELNAME_INFOMESSAGES = "infomessages";
string HUD_PANELNAME_PHYSICS = "physics";
+string HUD_PANELNAME_SHOWNAMES = "shownames";
+
+float HUD_MENU_ENABLE = 0;
#define SERVERFLAG_ALLOW_FULLBRIGHT 1
#define SERVERFLAG_TEAMPLAY 2
case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \
case HUD_PANEL_INFOMESSAGES: panel_name = HUD_PANELNAME_INFOMESSAGES; break; \
case HUD_PANEL_PHYSICS: panel_name = HUD_PANELNAME_PHYSICS; break; \
+ case HUD_PANEL_SHOWNAMES: panel_name = HUD_PANELNAME_SHOWNAMES; break; \
} ENDS_WITH_CURLY_BRACE
// Get name of specified panel id
case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \
case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \
case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \
-}\
-HUD_Panel_GetName_Part2(id)
+ default: HUD_Panel_GetName_Part2(id)\
+}
vector vec2(vector v);
#include "xonotic/dialog_hudpanel_chat.c"
#include "xonotic/dialog_hudpanel_engineinfo.c"
#include "xonotic/dialog_hudpanel_infomessages.c"
+#include "xonotic/dialog_hudpanel_shownames.c"
#include "xonotic/dialog_hudpanel_weapons.c"
#include "xonotic/dialog_hudpanel_physics.c"
#include "xonotic/slider_picmip.c"
float i;
me.TR(me);
- me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_panel_physics"));
+ me.TD(me, 1, 4, e = makeXonoticTextSlider("hud_panel_physics"));
e.addValue(e, _("Panel disabled"), "0");
e.addValue(e, _("Panel enabled if not observing"), "1");
e.addValue(e, _("Panel always enabled"), "2");
// me.TD(me, 1, 0.6, e = makeXonoticInputBox(1, "hud_panel_physics_acceleration_max"));
// setDependent(e, "hud_panel_physics_progressbar", 1, 1);
}
-#endif
\ No newline at end of file
+#endif
--- /dev/null
+#ifdef INTERFACE
+CLASS(XonoticHUDShownamesDialog) EXTENDS(XonoticRootDialog)
+ METHOD(XonoticHUDShownamesDialog, fill, void(entity))
+ ATTRIB(XonoticHUDShownamesDialog, title, string, _("Shownames Panel"))
+ ATTRIB(XonoticHUDShownamesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+ ATTRIB(XonoticHUDShownamesDialog, intendedWidth, float, 0.4)
+ ATTRIB(XonoticHUDShownamesDialog, rows, float, 17)
+ ATTRIB(XonoticHUDShownamesDialog, columns, float, 4)
+ ATTRIB(XonoticHUDShownamesDialog, name, string, "HUDshownames")
+ENDCLASS(XonoticHUDShownamesDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDShownamesDialog_fill(entity me)
+{
+ entity e;
+ string panelname = "shownames";
+ float i;
+
+ me.TR(me);
+ me.TD(me, 1, 4, e = makeXonoticTextSlider("hud_panel_shownames"));
+ e.addValue(e, _("Panel disabled"), "0");
+ e.addValue(e, _("Panel enabled on teammates"), "1");
+ e.addValue(e, _("Panel always enabled"), "2");
+ e.configureXonoticTextSliderValues(e);
+
+ DIALOG_HUDPANEL_COMMON_NOTOGGLE();
+
+}
+#endif
i.configureDialog(i);
me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ i = spawnXonoticHUDShownamesDialog();
+ i.configureDialog(i);
+ me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
me.advancedDialog = i = spawnXonoticAdvancedDialog();
i.configureDialog(i);
me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
{
// become fully visible
self.alpha = 1;
- // clear selected player display
- ClearSelectedPlayer();
// throw a weapon
SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
}
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
}
}
-float UpdateSelectedPlayer_countvalue(float v)
+void net_shownames(entity selected, float teammate)
{
- return max(0, (v - 1.0) / 0.5);
-}
-
-// returns: -2 if no hit, otherwise cos of the angle
-// uses the global v_angle
-float UpdateSelectedPlayer_canSee(entity p, float mincosangle, float maxdist)
-{
- vector so, d;
- float c;
-
- if(p == self)
- return -2;
-
- if(p.deadflag)
- return -2;
-
- so = self.origin + self.view_ofs;
- d = p.origin - so;
-
- // misaimed?
- if(dist_point_line(d, '0 0 0', v_forward) > maxdist)
- return -2;
-
- // now find the cos of the angle...
- c = normalize(d) * v_forward;
-
- if(c <= mincosangle)
- return -2;
-
- // not visible in any way? forget it
- if(!checkpvs(so, p))
- return -2;
-
- traceline(so, p.origin, MOVE_NOMONSTERS, self);
- if(trace_fraction < 1)
- return -2;
-
- return c;
-}
-
-void ClearSelectedPlayer()
-{
- if(self.selected_player)
- {
- centerprint_expire(self, CENTERPRIO_POINT);
- self.selected_player = world;
- self.selected_player_display_needs_update = FALSE;
- }
+ float teammate_health, teammate_armor;
+ if(teammate)
+ {
+ teammate_health = selected.health;
+ teammate_armor = selected.armorvalue;
+ }
+
+ msg_entity = self;
+ WRITESPECTATABLE_MSG_ONE({
+ WriteByte(MSG_ONE, SVC_TEMPENTITY);
+ WriteByte(MSG_ONE, TE_CSQC_SHOWNAMES);
+ WriteString(MSG_ONE, playername(selected));
+ WriteByte(MSG_ONE, teammate_health);
+ WriteByte(MSG_ONE, teammate_armor);
+ });
}
void UpdateSelectedPlayer()
{
- entity selected;
- float selected_score;
- selected = world;
- selected_score = 0.95; // 18 degrees
+ entity selected;
+ selected = world;
if(!autocvar_sv_allow_shownames)
return;
if(self.cvar_cl_shownames == 0)
return;
- if(self.cvar_cl_shownames == 1 && !teams_matter)
- return;
-
makevectors(self.v_angle); // sets v_forward
- // 1. cursor trace is always right
- WarpZone_crosshair_trace(self);
- if(trace_ent && trace_ent.classname == "player" && !trace_ent.deadflag)
- {
- selected = trace_ent;
- }
- else
- {
- // 2. if we don't have a cursor trace, find the player which is least
- // mis-aimed at
- entity p;
- FOR_EACH_PLAYER(p)
- {
- float c;
- c = UpdateSelectedPlayer_canSee(p, selected_score, 100); // 100 = 2.5 meters
- if(c >= -1)
- {
- selected = p;
- selected_score = c;
- }
- }
- }
+ // cursor trace
+ if(self.selected_player_display_timeout < time)
+ {
+ WarpZone_crosshair_trace(self);
+ if(trace_ent && trace_ent.classname == "player" && !trace_ent.deadflag)
+ {
+ selected = trace_ent;
+ self.last_selected_player = selected;
+ self.selected_player_display_timeout = time + 0.1; // update at 0.1s intervals
+ }
+ }
if(selected)
{
- self.selected_player_display_timeout = time + self.cvar_scr_centertime;
- }
- else
- {
- if(time < self.selected_player_display_timeout)
- if(UpdateSelectedPlayer_canSee(self.selected_player, 0.7, 200) >= -1) // 5 meters, 45 degrees
- selected = self.selected_player;
- }
-
- if(selected)
- {
- if(selected == self.selected_player)
- {
- float save;
- save = UpdateSelectedPlayer_countvalue(self.selected_player_count);
- self.selected_player_count = self.selected_player_count + frametime;
- if(save != UpdateSelectedPlayer_countvalue(self.selected_player_count))
- {
- string namestr, healthstr;
- namestr = playername(selected);
- if(teams_matter)
- {
- healthstr = ftos(floor(selected.health));
- if(self.team == selected.team)
- {
- namestr = strcat(namestr, " (", healthstr, "%)");
- self.selected_player_display_needs_update = TRUE;
- }
- }
- centerprint_atprio(self, CENTERPRIO_POINT, namestr);
- }
- }
- else
- {
- ClearSelectedPlayer();
- self.selected_player = selected;
- self.selected_player_time = time;
- self.selected_player_count = 0;
- self.selected_player_display_needs_update = FALSE;
- }
- }
- else
- {
- ClearSelectedPlayer();
- }
-
- if(self.selected_player)
- self.last_selected_player = self.selected_player;
+ if(teams_matter && self.team == selected.team)
+ net_shownames(selected, 1);
+ else
+ net_shownames(selected, 0);
+ }
}
.float muted; // to be used by prvm_edictset server playernumber muted 1
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';
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)
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');
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
string W_Name(float weaponid);
void UpdateSelectedPlayer();
-void ClearSelectedPlayer();
-.entity selected_player;
.entity last_selected_player;
-.float selected_player_time; // when this player has been selected
-.float selected_player_count; // how long this player has been directly pointed to
-.float selected_player_display_needs_update; // are regular updates necessary? (health)
.float selected_player_display_timeout; // when the selection will time out
void FixIntermissionClient(entity e);
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
#define TELEPORT_FLAGS_TELEPORTER (TELEPORT_FLAG_SOUND | TELEPORT_FLAG_PARTICLES | TELEPORT_FLAG_TDEATH)
void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity, vector telefragmin, vector telefragmax, float tflags)
{
- entity oldself;
entity telefragger;
vector from;
}
player.lastteleporttime = time;
-
- // stop player name display
- {
- oldself = self;
- self = player;
- ClearSelectedPlayer();
- self = oldself;
- }
}
}
--- /dev/null
+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
projects / xonotic / xonotic-data.pk3dir.git / commitdiff