Commit 3867f876 authored by Tukz's avatar Tukz

Build 30901

parent 3d931308
......@@ -13,7 +13,7 @@ StaticPopupDialogs["CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS"] = {
button1 = OKAY,
button2 = CANCEL,
OnAccept = function(self)
SaveBindings(KeyBindingFrame.which);
AttemptToSaveBindings(KeyBindingFrame.which);
KeyBindingFrame.outputText:SetText("");
KeyBindingFrame_SetSelected(nil);
HideUIPanel(KeyBindingFrame);
......@@ -628,7 +628,7 @@ function OkayButton_OnClick(self)
end
end
end
SaveBindings(KeyBindingFrame.which);
AttemptToSaveBindings(KeyBindingFrame.which);
KeyBindingFrame.outputText:SetText("");
KeyBindingFrame_SetSelected(nil);
HideUIPanel(KeyBindingFrame);
......
......@@ -190,7 +190,7 @@ function PvPCommentatorMixin:SetDefaultBindings()
SetBinding("T", "TOGGLESMOOTHFOLLOWTRANSITIONS");
SetBinding("C", "TOGGLECAMERACOLLISION");
SetBinding("V", "CYCLEFOLLOWTRANSITONSPEED");
SaveBindings(GetCurrentBindingSet());
AttemptToSaveBindings(GetCurrentBindingSet());
end
function PvPCommentatorMixin:SetNeedsFullRefresh(needed)
......
......@@ -46,7 +46,7 @@ function InspectHonorFrame_Update()
InspectHonorFrameLifeTimeRankValue:SetText(rankName);
-- Set rank name and number
rankName, rankNumber = GetPVPRankInfo(UnitPVPRank("player"));
rankName, rankNumber = GetPVPRankInfo(UnitPVPRank("target"));
if ( not rankName ) then
rankName = NONE;
end
......@@ -64,13 +64,13 @@ function InspectHonorFrame_Update()
end
-- Set rank progress and bar color
local factionGroup, factionName = UnitFactionGroup("player");
local factionGroup, factionName = UnitFactionGroup("target");
if ( factionGroup == "Alliance" ) then
InspectHonorFrameProgressBar:SetStatusBarColor(0.05, 0.15, 0.36);
else
InspectHonorFrameProgressBar:SetStatusBarColor(0.63, 0.09, 0.09);
end
InspectHonorFrameProgressBar:SetValue(GetPVPRankProgress());
InspectHonorFrameProgressBar:SetValue(GetInspectPVPRankProgress());
-- Recenter rank text
InspectHonorFrameCurrentPVPTitle:SetPoint("TOP", "InspectHonorFrame", "TOP", - InspectHonorFrameCurrentPVPRank:GetWidth()/2, -83);
......
......@@ -149,7 +149,7 @@ function InterfaceOptionsControlsPanelAutoLootKeyDropDown_OnEvent (self, event,
self.value = value;
UIDropDownMenu_SetSelectedValue(self, value);
SetModifiedClick("AUTOLOOTTOGGLE", value);
SaveBindings(GetCurrentBindingSet());
AttemptToSaveBindings(GetCurrentBindingSet());
self.tooltip = _G["OPTION_TOOLTIP_AUTO_LOOT_"..value.."_KEY"];
end
self.GetValue =
......@@ -282,7 +282,7 @@ function InterfaceOptionsCombatPanelSelfCastKeyDropDown_OnEvent (self, event, ..
self.value = value;
UIDropDownMenu_SetSelectedValue(self, value);
SetModifiedClick("SELFCAST", value);
SaveBindings(GetCurrentBindingSet());
AttemptToSaveBindings(GetCurrentBindingSet());
self.tooltip = _G["OPTION_TOOLTIP_AUTO_SELF_CAST_"..value.."_KEY"];
end;
self.GetValue =
......@@ -453,7 +453,7 @@ end
self.value = value;
UIDropDownMenu_SetSelectedValue(self, value);
SetModifiedClick("FOCUSCAST", value);
SaveBindings(GetCurrentBindingSet());
AttemptToSaveBindings(GetCurrentBindingSet());
self.tooltip = _G["OPTION_TOOLTIP_FOCUS_CAST_"..value.."_KEY"];
end;
self.GetValue =
......@@ -1192,7 +1192,7 @@ function InterfaceOptionsActionBarsPanelPickupActionKeyDropDown_OnEvent (self, e
self.value = value;
UIDropDownMenu_SetSelectedValue(self, value);
SetModifiedClick("PICKUPACTION", value);
SaveBindings(GetCurrentBindingSet());
AttemptToSaveBindings(GetCurrentBindingSet());
self.tooltip = _G["OPTION_TOOLTIP_PICKUP_ACTION_"..value.."_KEY"];
end
self.GetValue =
......
......@@ -455,7 +455,7 @@ function GroupLootDropDown_OnLoad(self)
end
function GroupLootDropDown_Initialize()
local info = UIDropDownMenu_CreateInfo();
--[[local info = UIDropDownMenu_CreateInfo();
info.isTitle = 1;
info.text = MASTER_LOOTER;
info.fontObject = GameFontNormalLeft;
......@@ -469,7 +469,10 @@ function GroupLootDropDown_Initialize()
UIDropDownMenu_AddButton(info);
info.text = REQUEST_ROLL;
info.func = function() DoMasterLootRoll(LootFrame.selectedSlot); end;
UIDropDownMenu_AddButton(info);
UIDropDownMenu_AddButton(info);]]
-- Removing the Request Roll option but keeping the modern Master Loot UI, so we'll just shortcut straight to that.
MasterLooterFrame_Show();
end
function GroupLootFrame_OpenNewFrame(id, rollTime)
......
......@@ -57,36 +57,23 @@ end
function Minimap_SetTooltip( pvpType, factionName )
if ( GameTooltip:IsOwned(MinimapZoneTextButton) ) then
GameTooltip:SetOwner(MinimapZoneTextButton, "ANCHOR_LEFT");
local zoneName = GetZoneText();
local subzoneName = GetSubZoneText();
if ( subzoneName == zoneName ) then
subzoneName = "";
end
GameTooltip:AddLine( zoneName, 1.0, 1.0, 1.0 );
GameTooltip:AddLine( GetMinimapZoneText() );
if ( pvpType == "sanctuary" ) then
GameTooltip:AddLine( subzoneName, 0.41, 0.8, 0.94 );
GameTooltip:AddLine(SANCTUARY_TERRITORY, 0.41, 0.8, 0.94);
GameTooltip:AddLine(SANCTUARY_TERRITORY);
elseif ( pvpType == "arena" ) then
GameTooltip:AddLine( subzoneName, 1.0, 0.1, 0.1 );
GameTooltip:AddLine(FREE_FOR_ALL_TERRITORY, 1.0, 0.1, 0.1);
GameTooltip:AddLine(FREE_FOR_ALL_TERRITORY);
elseif ( pvpType == "friendly" ) then
if (factionName and factionName ~= "") then
GameTooltip:AddLine( subzoneName, 0.1, 1.0, 0.1 );
GameTooltip:AddLine(format(FACTION_CONTROLLED_TERRITORY, factionName), 0.1, 1.0, 0.1);
GameTooltip:AddLine(format(FACTION_CONTROLLED_TERRITORY, factionName));
end
elseif ( pvpType == "hostile" ) then
if (factionName and factionName ~= "") then
GameTooltip:AddLine( subzoneName, 1.0, 0.1, 0.1 );
GameTooltip:AddLine(format(FACTION_CONTROLLED_TERRITORY, factionName), 1.0, 0.1, 0.1);
GameTooltip:AddLine(format(FACTION_CONTROLLED_TERRITORY, factionName));
end
elseif ( pvpType == "contested" ) then
GameTooltip:AddLine( subzoneName, 1.0, 0.7, 0.0 );
GameTooltip:AddLine(CONTESTED_TERRITORY, 1.0, 0.7, 0.0);
GameTooltip:AddLine(CONTESTED_TERRITORY);
elseif ( pvpType == "combat" ) then
GameTooltip:AddLine( subzoneName, 1.0, 0.1, 0.1 );
GameTooltip:AddLine(COMBAT_ZONE, 1.0, 0.1, 0.1);
else
GameTooltip:AddLine( subzoneName, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b );
GameTooltip:AddLine(COMBAT_ZONE);
end
GameTooltip:Show();
end
......
......@@ -300,7 +300,7 @@ local function GetGroupRosterInfo(kind, index)
elseif ( GetPartyAssignment("MAINASSIST", unit) ) then
role = "MAINASSIST";
end
assignedRole = UnitGroupRolesAssigned(unit)
assignedRole = "NONE";--UnitGroupRolesAssigned(unit)
end
subgroup = 1;
end
......
......@@ -3702,10 +3702,10 @@ function RefreshBuffs(frame, unit, numBuffs, suffix, checkCVar)
buffIcon:SetTexture(icon);
-- setup the cooldown
local coolDown = _G[buffName.."Cooldown"];
--[[local coolDown = _G[buffName.."Cooldown"];
if ( coolDown ) then
CooldownFrame_Set(coolDown, expirationTime - duration, duration, true);
end
end]]
-- show the aura
_G[buffName]:Show();
......@@ -3760,10 +3760,10 @@ function RefreshDebuffs(frame, unit, numDebuffs, suffix, checkCVar)
debuffTotal = debuffTotal + 1;
-- setup the cooldown
local coolDown = _G[debuffName.."Cooldown"];
--[[local coolDown = _G[debuffName.."Cooldown"];
if ( coolDown ) then
CooldownFrame_Set(coolDown, expirationTime - duration, duration, true);
end
end]]
-- show the aura
_G[debuffName]:Show();
......
......@@ -997,9 +997,9 @@ function UnitPopup_HideButtons ()
shown = false;
end
elseif ( value == "REPORT_PLAYER" ) then
if not playerLocation or not playerLocation:IsValid() or not C_ChatInfo.CanReportPlayer(playerLocation) then
-- if not playerLocation or not playerLocation:IsValid() or not C_ChatInfo.CanReportPlayer(playerLocation) then
shown = false;
end
-- end
elseif ( value == "REPORT_SPAM" ) then
if not playerLocation:IsChatLineID() and not playerLocation:IsCommunityInvitation() then
shown = false;
......@@ -1241,7 +1241,8 @@ function UnitPopup_HideButtons ()
elseif ( dropdownMenu.name ) then
if ( dropdownMenu.name == UnitName("player") ) then
shown = false;
elseif ( not UnitInBattleground(dropdownMenu.name) and not IsInActiveWorldPVP(dropdownMenu.name) ) then
-- elseif ( not UnitInBattleground(dropdownMenu.name) and not IsInActiveWorldPVP(dropdownMenu.name) ) then
elseif ( not UnitInBattleground(dropdownMenu.name) ) then
shown = false;
end
end
......
......@@ -2,10 +2,10 @@ local MAX_SCORE_BUTTONS = 22;
local MAX_NUM_STAT_COLUMNS = 7;
local SCOREFRAME_BASE_COLUMNS = 4;
local SCOREFRAME_COLUMN_SPACING = 77;
local SCOREFRAME_BUTTON_TEXT_OFFSET = -32;
local SCOREFRAME_BUTTON_TEXT_OFFSET = -31;
local SCOREFRAME_BASE_WIDTH = 530;
SCORE_BUTTON_HEIGHT = 15;
SCORE_BUTTON_HEIGHT = 16;
function WorldStateScoreFrame_OnLoad(self)
self:RegisterEvent("PLAYER_ENTERING_WORLD");
......@@ -184,7 +184,14 @@ function WorldStateScoreFrame_Update()
end
if ( index <= numScores ) then
scoreButton.index = index;
name, killingBlows, honorableKills, deaths, honorGained, faction, race, class, classToken, damageDone, healingDone, bgRating, ratingChange, preMatchMMR, mmrChange, talentSpec, honorLevel = GetBattlefieldScore(index);
name, killingBlows, honorableKills, deaths, honorGained, faction, rank, race, class, classToken = GetBattlefieldScore(index);
rankName, rankNumber = GetPVPRankInfo(rank, faction);
if ( rankNumber > 0 ) then
scoreButton.rankButton.icon:SetTexture(format("%s%02d","Interface\\PvPRankBadges\\PvPRank", rankNumber));
scoreButton.rankButton:Show();
else
scoreButton.rankButton:Hide();
end
scoreButton.name.text:SetText(name);
if ( not race ) then
......@@ -195,6 +202,7 @@ function WorldStateScoreFrame_Update()
end
scoreButton.name.name = name;
scoreButton.name.tooltip = race.." "..class;
scoreButton.rankButton.tooltip = rankName;
scoreButton.killingBlows:SetText(killingBlows);
teamDataFailed = 0;
teamName, teamRating, newTeamRating, teamMMR = GetBattlefieldTeamInfo(faction);
......
......@@ -52,7 +52,7 @@
</Texture>
</Layer>
<Layer level="ARTWORK">
<FontString name="$parentHonorableKills" inherits="GameFontNormalSmall" parentKey="honorableKills">
<FontString name="$parentHonorableKills" inherits="GameFontNormal" parentKey="honorableKills">
<Anchors>
<Anchor point="CENTER" relativePoint="LEFT">
<Offset>
......@@ -61,7 +61,7 @@
</Anchor>
</Anchors>
</FontString>
<FontString name="$parentKillingBlows" inherits="GameFontNormalSmall" parentKey="killingBlows">
<FontString name="$parentKillingBlows" inherits="GameFontNormal" parentKey="killingBlows">
<Anchors>
<Anchor point="CENTER" relativePoint="LEFT">
<Offset>
......@@ -70,7 +70,7 @@
</Anchor>
</Anchors>
</FontString>
<FontString name="$parentDeaths" inherits="GameFontNormalSmall" parentKey="deaths">
<FontString name="$parentDeaths" inherits="GameFontNormal" parentKey="deaths">
<Anchors>
<Anchor point="CENTER" relativePoint="LEFT">
<Offset>
......@@ -210,7 +210,36 @@
</Layer>
</Layers>
<Frames>
<Button name="$parentName" parentKey="name">
<Frame name="$parentRankButton" parentKey="rankButton" enableMouse="true">
<Size>
<AbsDimension x="16" y="16"/>
</Size>
<Anchors>
<Anchor point="LEFT">
<Offset>
<AbsDimension x="0" y="0"/>
</Offset>
</Anchor>
</Anchors>
<Layers>
<Layer level="BACKGROUND">
<Texture name="$parentIcon" parentKey="icon"/>
</Layer>
</Layers>
<Scripts>
<OnEnter>
if ( self.tooltip ) then
GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
GameTooltip:SetText(self.tooltip);
end
</OnEnter>
<OnLeave>
GameTooltip:Hide();
</OnLeave>
</Scripts>
</Frame>
<Button
name="$parentName" parentKey="name">
<Size x="160" y="16"/>
<Anchors>
<Anchor point="LEFT" x="15" y="1"/>
......
......@@ -3057,7 +3057,7 @@ end
function CharSelectEnterWorldButton_OnEnter(button)
GlueTooltip:SetOwner(button, "ANCHOR_LEFT", 4, -8);
if ( not CharacterSelect_AllowedToEnterWorld() ) then
if ( not button:IsEnabled() ) then
local hours = GetLaunchETA();
if (hours > 0) then
text = LAUNCH_ETA:format(hours);
......@@ -3065,7 +3065,7 @@ function CharSelectEnterWorldButton_OnEnter(button)
text = LAUNCH_ETA_SOON;
end
GlueTooltip:AddLine(text);
GlueTooltip:SetText(text);
else
GlueTooltip:Hide();
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment