From: terencehill Date: Sat, 23 May 2015 11:13:22 +0000 (+0200) Subject: Merge branch 'master' into terencehill/quickmenu X-Git-Tag: xonotic-v0.8.2~1987^2~19 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b09b7687da385e1cdc51e2f63fb7de4c9f9e12a3;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/quickmenu Conflicts: qcsrc/client/hud.qh qcsrc/menu/classes.inc --- b09b7687da385e1cdc51e2f63fb7de4c9f9e12a3 diff --cc qcsrc/client/hud.qh index 4e0588fa1,f880a810f..79d025976 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@@ -12,9 -12,21 +12,22 @@@ int HUD_PANEL_LAST int panel_order[HUD_PANEL_MAX]; string hud_panelorder_prev; + void HUD_Reset (void); + void HUD_Main (void); + + int vote_yescount; + int vote_nocount; + int vote_needed; + int vote_highlighted; // currently selected vote + + int vote_active; // is there an active vote? + int vote_prev; // previous state of vote_active to check for a change + float vote_alpha; + float vote_change; // "time" when vote_active changed + float hud_draw_maximized; float hud_panel_radar_maximized; +float hud_panel_quickmenu; float chat_panel_modified; float radar_panel_modified; @@@ -102,9 -115,27 +116,28 @@@ class(HUDPanel) .void() panel_draw float current_player; -float GetPlayerColorForce(int i); ++float mv_active; + + float stringwidth_colors(string s, vector theSize); ++float stringwidth_nocolors(string s, vector theSize); +float GetPlayerColorForce(int i); + int GetPlayerColor(int i); + string GetPlayerName(int i); -float stringwidth_nocolors(string s, vector theSize); + void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag); + + + // prev_* vars contain the health/armor at the previous FRAME + // set to -1 when player is dead or was not playing + int prev_health, prev_armor; + float health_damagetime, armor_damagetime; + int health_beforedamage, armor_beforedamage; + // old_p_* vars keep track of previous values when smoothing value changes of the progressbar + int old_p_health, old_p_armor; + float old_p_healthtime, old_p_armortime; + // prev_p_* vars contain the health/armor progressbar value at the previous FRAME + // set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h) + int prev_p_health, prev_p_armor; - float mv_active; #define HUD_PANELS(HUD_PANEL) \ HUD_PANEL(WEAPONS , HUD_Weapons , weapons) \ diff --cc qcsrc/client/mapvoting.qh index 2c3c58eef,cb7b4c645..d2b4bc4b7 --- a/qcsrc/client/mapvoting.qh +++ b/qcsrc/client/mapvoting.qh @@@ -1,8 -1,11 +1,10 @@@ #ifndef MAPVOTING_H #define MAPVOTING_H + #include "../common/constants.qh" + int mv_num_maps; -float mv_active; string mv_maps[MAPVOTE_COUNT]; string mv_pics[MAPVOTE_COUNT]; string mv_pk3[MAPVOTE_COUNT]; diff --cc qcsrc/menu/classes.inc index 000000000,68b90d586..12cace438 mode 000000,100644..100644 --- a/qcsrc/menu/classes.inc +++ b/qcsrc/menu/classes.inc @@@ -1,0 -1,132 +1,133 @@@ + #include "anim/animation.qc" + #include "anim/animhost.qc" + #include "anim/easing.qc" + #include "anim/keyframe.qc" + + #include "item.qc" + #include "item/borderimage.qc" + #include "item/button.qc" + #include "item/checkbox.qc" + #include "item/container.qc" + #include "item/dialog.qc" + #include "item/image.qc" + #include "item/inputbox.qc" + #include "item/inputcontainer.qc" + #include "item/label.qc" + #include "item/listbox.qc" + #include "item/modalcontroller.qc" + #include "item/nexposee.qc" + #include "item/radiobutton.qc" + #include "item/slider.qc" + #include "item/tab.qc" + #include "item/textslider.qc" + + #include "xonotic/bigbutton.qc" + #include "xonotic/bigcommandbutton.qc" + #include "xonotic/button.qc" + #include "xonotic/campaign.qc" + #include "xonotic/charmap.qc" + #include "xonotic/checkbox.qc" + #include "xonotic/checkbox_slider_invalid.qc" + #include "xonotic/checkbox_string.qc" + #include "xonotic/colorbutton.qc" + #include "xonotic/colorpicker.qc" + #include "xonotic/colorpicker_string.qc" + #include "xonotic/commandbutton.qc" + #include "xonotic/credits.qc" + #include "xonotic/crosshairbutton.qc" + #include "xonotic/cvarlist.qc" + #include "xonotic/demolist.qc" + #include "xonotic/dialog.qc" + #include "xonotic/dialog_credits.qc" + #include "xonotic/dialog_firstrun.qc" + #include "xonotic/dialog_hudpanel_ammo.qc" + #include "xonotic/dialog_hudpanel_buffs.qc" + #include "xonotic/dialog_hudpanel_centerprint.qc" + #include "xonotic/dialog_hudpanel_chat.qc" + #include "xonotic/dialog_hudpanel_engineinfo.qc" + #include "xonotic/dialog_hudpanel_healtharmor.qc" + #include "xonotic/dialog_hudpanel_infomessages.qc" + #include "xonotic/dialog_hudpanel_modicons.qc" + #include "xonotic/dialog_hudpanel_notification.qc" + #include "xonotic/dialog_hudpanel_physics.qc" + #include "xonotic/dialog_hudpanel_powerups.qc" + #include "xonotic/dialog_hudpanel_pressedkeys.qc" ++#include "xonotic/dialog_hudpanel_quickmenu.qc" + #include "xonotic/dialog_hudpanel_racetimer.qc" + #include "xonotic/dialog_hudpanel_radar.qc" + #include "xonotic/dialog_hudpanel_score.qc" + #include "xonotic/dialog_hudpanel_timer.qc" + #include "xonotic/dialog_hudpanel_vote.qc" + #include "xonotic/dialog_hudpanel_weapons.qc" + #include "xonotic/dialog_hudsetup_exit.qc" + #include "xonotic/dialog_monstertools.qc" + #include "xonotic/dialog_multiplayer.qc" + #include "xonotic/dialog_multiplayer_create.qc" + #include "xonotic/dialog_multiplayer_create_mapinfo.qc" + #include "xonotic/dialog_multiplayer_create_mutators.qc" + #include "xonotic/dialog_multiplayer_join.qc" + #include "xonotic/dialog_multiplayer_join_serverinfo.qc" + #include "xonotic/dialog_multiplayer_media.qc" + #include "xonotic/dialog_multiplayer_media_demo.qc" + #include "xonotic/dialog_multiplayer_media_demo_startconfirm.qc" + #include "xonotic/dialog_multiplayer_media_demo_timeconfirm.qc" + #include "xonotic/dialog_multiplayer_media_musicplayer.qc" + #include "xonotic/dialog_multiplayer_media_screenshot.qc" + #include "xonotic/dialog_multiplayer_media_screenshot_viewer.qc" + #include "xonotic/dialog_multiplayer_profile.qc" + #include "xonotic/dialog_quit.qc" + #include "xonotic/dialog_sandboxtools.qc" + #include "xonotic/dialog_settings.qc" + #include "xonotic/dialog_settings_audio.qc" + #include "xonotic/dialog_settings_effects.qc" + #include "xonotic/dialog_settings_game.qc" + #include "xonotic/dialog_settings_game_crosshair.qc" + #include "xonotic/dialog_settings_game_hudconfirm.qc" + #include "xonotic/dialog_settings_game_hud.qc" + #include "xonotic/dialog_settings_game_messages.qc" + #include "xonotic/dialog_settings_game_model.qc" + #include "xonotic/dialog_settings_game_view.qc" + #include "xonotic/dialog_settings_game_weapons.qc" + #include "xonotic/dialog_settings_input.qc" + #include "xonotic/dialog_settings_input_userbind.qc" + #include "xonotic/dialog_settings_misc.qc" + #include "xonotic/dialog_settings_misc_cvars.qc" + #include "xonotic/dialog_settings_misc_reset.qc" + #include "xonotic/dialog_settings_user.qc" + #include "xonotic/dialog_settings_user_languagewarning.qc" + #include "xonotic/dialog_settings_video.qc" + #include "xonotic/dialog_singleplayer.qc" + #include "xonotic/dialog_singleplayer_winner.qc" + #include "xonotic/dialog_teamselect.qc" + #include "xonotic/gametypelist.qc" + #include "xonotic/image.qc" + #include "xonotic/inputbox.qc" + #include "xonotic/keybinder.qc" + #include "xonotic/languagelist.qc" + #include "xonotic/listbox.qc" + #include "xonotic/mainwindow.qc" + #include "xonotic/maplist.qc" + #include "xonotic/nexposee.qc" + #include "xonotic/playerlist.qc" + #include "xonotic/playermodel.qc" + #include "xonotic/playlist.qc" + #include "xonotic/radiobutton.qc" + #include "xonotic/rootdialog.qc" + #include "xonotic/screenshotimage.qc" + #include "xonotic/screenshotlist.qc" + #include "xonotic/serverlist.qc" + #include "xonotic/skinlist.qc" + #include "xonotic/slider.qc" + #include "xonotic/slider_decibels.qc" + #include "xonotic/slider_particles.qc" + #include "xonotic/slider_picmip.qc" + #include "xonotic/slider_resolution.qc" + #include "xonotic/slider_sbfadetime.qc" + #include "xonotic/soundlist.qc" + #include "xonotic/statslist.qc" + #include "xonotic/tabcontroller.qc" + #include "xonotic/tab.qc" + #include "xonotic/textlabel.qc" + #include "xonotic/textslider.qc" + #include "xonotic/weaponarenacheckbox.qc" + #include "xonotic/weaponslist.qc" diff --cc qcsrc/menu/xonotic/mainwindow.qc index 280ab1d32,76e71381d..fd76fcf89 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@@ -134,12 -136,9 +136,12 @@@ void MainWindow_configureMainWindow(ent i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); + i = spawnXonoticHUDQuickMenuDialog(); + i.configureDialog(i); + me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z); // dialogs used by settings - me.userbindEditDialog = i = spawnXonoticUserbindEditDialog(); + me.userbindEditDialog = i = NEW(XonoticUserbindEditDialog); i.configureDialog(i); me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);