Skip to content

Commit

Permalink
Build 15739
Browse files Browse the repository at this point in the history
  • Loading branch information
@tekkub
tekkub committed Aug 30, 2012
1 parent 484b564 commit c602f95
Show file tree
Hide file tree
Showing 52 changed files with 808 additions and 492 deletions.
31 changes: 11 additions & 20 deletions AddOns/Blizzard_AchievementUI/Blizzard_AchievementUI.lua
View file
Expand Up @@ -1230,11 +1230,9 @@ function AchievementButton_DisplayAchievement (button, category, achievement, se
if ( button.id ~= id ) then
local saturatedStyle;
if ( bit.band(flags, ACHIEVEMENT_FLAGS_ACCOUNT) == ACHIEVEMENT_FLAGS_ACCOUNT ) then
button.accountIcon:Show();
button.accountWide = true;
saturatedStyle = "account";
else
button.accountIcon:Hide();
button.accountWide = nil;
if ( IN_GUILD_VIEW ) then
saturatedStyle = "guild";
Expand Down Expand Up @@ -1422,7 +1420,7 @@ function AchievementShield_SetPoints(points, pointString, normalFont, smallFont)
pointString:SetText("");
return;
end
if ( points <= 100 ) then
if ( points < 100 ) then
pointString:SetFontObject(normalFont);
else
pointString:SetFontObject(smallFont);
Expand Down Expand Up @@ -2178,11 +2176,9 @@ function AchievementFrameSummary_UpdateAchievements(...)

local saturatedStyle;
if ( bit.band(flags, ACHIEVEMENT_FLAGS_ACCOUNT) == ACHIEVEMENT_FLAGS_ACCOUNT ) then
button.accountIcon:Show();
button.accountWide = true;
saturatedStyle = "account";
else
button.accountIcon:Hide();
button.accountWide = nil;
if ( IN_GUILD_VIEW ) then
saturatedStyle = "guild";
Expand All @@ -2201,13 +2197,9 @@ function AchievementFrameSummary_UpdateAchievements(...)
end

if ( isGuild ) then
button.shield.BNicon:Hide();
button.shield.points:Show();
button.shield.wasEarnedByMe = nil;
button.shield.earnedBy = nil;
else
button.shield.BNicon:SetShown(completed and not wasEarnedByMe);
button.shield.points:SetShown(not (completed and not wasEarnedByMe));
button.shield.wasEarnedByMe = not (completed and not wasEarnedByMe);
button.shield.earnedBy = earnedBy;
end
Expand Down Expand Up @@ -2250,8 +2242,6 @@ function AchievementFrameSummary_UpdateAchievements(...)
else
button.shield.icon:SetTexture([[Interface\AchievementFrame\UI-Achievement-Shields-NoPoints]]);
end
button.shield.BNicon:SetShown(completed and not wasEarnedByMe);
button.shield.points:SetShown(not (completed and not wasEarnedByMe));
button.shield.wasEarnedByMe = not (completed and not wasEarnedByMe);
button.shield.earnedBy = earnedBy;
button.icon.texture:SetTexture(icon);
Expand Down Expand Up @@ -2838,12 +2828,10 @@ function AchievementFrameComparison_DisplayAchievement (button, category, index)

local saturatedStyle = "normal";
if ( bit.band(flags, ACHIEVEMENT_FLAGS_ACCOUNT) == ACHIEVEMENT_FLAGS_ACCOUNT ) then
button.accountIcon:Show();
player.accountWide = true;
friend.accountWide = true;
saturatedStyle = "account";
else
button.accountIcon:Hide();
player.accountWide = nil;
friend.accountWide = nil;
end
Expand All @@ -2866,8 +2854,6 @@ function AchievementFrameComparison_DisplayAchievement (button, category, index)
AchievementShield_SetPoints(points, player.shield.points, ACHIEVEMENTCOMPARISON_PLAYERSHIELDFONT1, ACHIEVEMENTCOMPARISON_PLAYERSHIELDFONT2);
AchievementShield_SetPoints(points, friend.shield.points, ACHIEVEMENTCOMPARISON_FRIENDSHIELDFONT1, ACHIEVEMENTCOMPARISON_FRIENDSHIELDFONT2);

player.shield.BNicon:SetShown(completed and not wasEarnedByMe);
player.shield.points:SetShown(not (completed and not wasEarnedByMe));
player.shield.wasEarnedByMe = not (completed and not wasEarnedByMe);
player.shield.earnedBy = earnedBy;

Expand Down Expand Up @@ -3330,19 +3316,24 @@ function AchievementMeta_OnLeave(self)
end

function AchievementShield_OnEnter(self)
if ( self.earnedBy and not self.wasEarnedByMe ) then
GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
GameTooltip:SetText(format(ACHIEVEMENT_EARNED_BY,self.earnedBy));
local parent = self:GetParent();
GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
if ( parent.accountWide ) then
GameTooltip:AddLine(ACCOUNT_WIDE_ACHIEVEMENT);
GameTooltip:Show();
return;
end
if ( self.earnedBy ) then
GameTooltip:AddLine(format(ACHIEVEMENT_EARNED_BY,self.earnedBy));
GameTooltip:Show();
return;
end
-- pass-through to the achievement button
local parent = self:GetParent();
local func = parent:GetScript("OnEnter");
if ( func ) then
func(parent);
end

GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
AchievementFrameAchievements_CheckGuildMembersTooltip(self);
GameTooltip:Show();
end
Expand Down
103 changes: 2 additions & 101 deletions AddOns/Blizzard_AchievementUI/Blizzard_AchievementUI.xml
View file
Expand Up @@ -828,67 +828,6 @@
</OnMouseUp>
</Scripts>
</Frame>
<Frame name="AchievementAccountIconTemplate" virtual="true" hidden="true">
<Size x="24" y="24"/>
<Layers>
<Layer level="BACKGROUND">
<Texture file="Interface\LFGFrame\WaitAnim" setAllPoints="true">
<TexCoords left="0" right="0.5" top="0" bottom="0.5"/>
</Texture>
</Layer>
<Layer level="ARTWORK">
<Texture file="Interface\FriendsFrame\PlusManz-BattleNet">
<Size x="19" y="19"/>
<Anchors>
<Anchor point="CENTER" x="1" y="-1"/>
</Anchors>
</Texture>
</Layer>
<Layer level="OVERLAY">
<Texture file="Interface\Minimap\MiniMap-TrackingBorder">
<Size x="56" y="56"/>
<Anchors>
<Anchor point="CENTER" x="13" y="-13"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Scripts>
<OnEnter>
GameTooltip:SetOwner(self, "ANCHOR_TOP");
GameTooltip:SetText(ACCOUNT_WIDE_ACHIEVEMENT);
</OnEnter>
<OnLeave>
GameTooltip:Hide();
</OnLeave>
</Scripts>
</Frame>
<Frame name="AchievementAccountIconSmallTemplate" virtual="true" hidden="true">
<Size x="20" y="20"/>
<Layers>
<Layer level="BACKGROUND">
<Texture file="Interface\LFGFrame\WaitAnim" setAllPoints="true">
<TexCoords left="0" right="0.5" top="0" bottom="0.5"/>
</Texture>
</Layer>
<Layer level="ARTWORK">
<Texture file="Interface\FriendsFrame\PlusManz-BattleNet">
<Size x="15" y="19"/>
<Anchors>
<Anchor point="CENTER" x="1" y="0"/>
</Anchors>
</Texture>
</Layer>
<Layer level="OVERLAY">
<Texture file="Interface\Minimap\MiniMap-TrackingBorder">
<Size x="45" y="45"/>
<Anchors>
<Anchor point="CENTER" x="10" y="-10"/>
</Anchors>
</Texture>
</Layer>
</Layers>
</Frame>

<Button name="AchievementTemplate" virtual="true">
<Size>
Expand Down Expand Up @@ -1263,11 +1202,6 @@
</Anchor>
</Anchors>
</Frame>
<Frame inherits="AchievementAccountIconTemplate" parentKey="accountIcon">
<Anchors>
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.icon" x="0" y="4"/>
</Anchors>
</Frame>
<Frame name="$parentTabard" inherits="AchievementGuildTabardTemplate" parentKey="tabard">
<Anchors>
<Anchor point="TOPRIGHT">
Expand Down Expand Up @@ -1305,12 +1239,6 @@
</Texture>
</Layer>
<Layer level="OVERLAY">
<Texture name="$parentBNIcon" file="Interface\FriendsFrame\PlusManz-BattleNet" parentKey="BNicon" hidden="true">
<Size x="18" y="18"/>
<Anchors>
<Anchor point="CENTER" relativePoint="$parentIcon" x="-2" y="-4"/>
</Anchors>
</Texture>
<FontString name="$parentPoints" inherits="AchievementPointsFont" parentKey="points">
<Size x="42" y="16"/>
<Anchors>
Expand Down Expand Up @@ -1570,17 +1498,11 @@
</Texture>
</Layer>
<Layer level="OVERLAY">
<Texture name="$parentBNIcon" file="Interface\FriendsFrame\PlusManz-BattleNet" parentKey="BNicon" hidden="true">
<Size x="16" y="16"/>
<Anchors>
<Anchor point="CENTER" relativePoint="$parentIcon" x="-1" y="1"/>
</Anchors>
</Texture>
<FontString name="$parentPoints" inherits="GameFontNormal" text="60" parentKey="points">
<FontString name="$parentPoints" inherits="GameFontNormal" justifyH="CENTER" text="60" parentKey="points">
<Anchors>
<Anchor point="CENTER">
<Offset>
<AbsDimension x="-1" y="3"/>
<AbsDimension x="0" y="3"/>
</Offset>
</Anchor>
</Anchors>
Expand All @@ -1601,16 +1523,6 @@
<Frame name="SummaryAchievementTemplate" inherits="ComparisonPlayerTemplate" virtual="true">
<Size x="100" y="48"/>
<Frames>
<Frame inherits="AchievementAccountIconSmallTemplate" parentKey="accountIcon">
<Anchors>
<Anchor point="BOTTOMRIGHT" relativeKey="$parent.icon" x="2" y="8"/>
</Anchors>
<Scripts>
<OnLoad>
self:SetFrameLevel(self:GetParent().icon:GetFrameLevel() + 2);
</OnLoad>
</Scripts>
</Frame>
<Frame name="$parentHighlight" setAllPoints="true" hidden="true" enableMouse="false" parentKey="highlight">
<Layers>
<Layer level="OVERLAY">
Expand Down Expand Up @@ -1725,11 +1637,6 @@
<Anchor point="LEFT"/>
</Anchors>
</Frame>
<Frame inherits="AchievementAccountIconSmallTemplate" parentKey="accountIcon">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeKey="$parent.player" x="33" y="6"/>
</Anchors>
</Frame>
<Frame name="$parentFriend" parentKey="friend">
<Size x="120" y="50"/>
<Anchors>
Expand Down Expand Up @@ -1892,12 +1799,6 @@
</Texture>
</Layer>
<Layer level="OVERLAY">
<Texture name="$parentBNIcon" file="Interface\FriendsFrame\PlusManz-BattleNet" parentKey="BNicon" hidden="true">
<Size x="18" y="18"/>
<Anchors>
<Anchor point="CENTER" relativePoint="$parentIcon" x="-2" y="-4"/>
</Anchors>
</Texture>
<FontString name="$parentPoints" inherits="GameFontNormalSmall" text="60" parentKey="points">
<Anchors>
<Anchor point="CENTER">
Expand Down
14 changes: 10 additions & 4 deletions AddOns/Blizzard_AuctionUI/Blizzard_AuctionUI.lua
View file
Expand Up @@ -413,7 +413,9 @@ function BrowseButton_OnClick(button)
assert(button);

if ( GetCVarBool("auctionDisplayOnCharacter") ) then
DressUpItemLink(GetAuctionItemLink("list", button:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
if ( not DressUpItemLink(GetAuctionItemLink("list", button:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame))) ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("list", button:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
SetSelectedAuctionItem("list", button:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame));
-- Close any auction related popups
Expand Down Expand Up @@ -1117,7 +1119,9 @@ function BidButton_OnClick(button)
assert(button)

if ( GetCVarBool("auctionDisplayOnCharacter") ) then
DressUpItemLink(GetAuctionItemLink("bidder", button:GetID() + FauxScrollFrame_GetOffset(BidScrollFrame)));
if ( not DressUpItemLink(GetAuctionItemLink("bidder", button:GetID() + FauxScrollFrame_GetOffset(BidScrollFrame))) ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("bidder", button:GetID() + FauxScrollFrame_GetOffset(BidScrollFrame)));
end
end
SetSelectedAuctionItem("bidder", button:GetID() + FauxScrollFrame_GetOffset(BidScrollFrame));
-- Close any auction related popups
Expand Down Expand Up @@ -1386,7 +1390,9 @@ function AuctionsButton_OnClick(button)
assert(button);

if ( GetCVarBool("auctionDisplayOnCharacter") ) then
DressUpItemLink(GetAuctionItemLink("owner", button:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame)));
if ( not DressUpItemLink(GetAuctionItemLink("owner", button:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame))) ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("owner", button:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame)));
end
end
SetSelectedAuctionItem("owner", button:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame));
-- Close any auction related popups
Expand Down Expand Up @@ -1720,4 +1726,4 @@ function AuctionProgressFrame_OnUpdate(self)
self:SetAlpha(1);
end
end
end
end
36 changes: 30 additions & 6 deletions AddOns/Blizzard_AuctionUI/Blizzard_AuctionUITemplates.xml
View file
Expand Up @@ -259,7 +259,11 @@
</OnLeave>
<OnClick>
if ( IsModifiedClick() ) then
HandleModifiedItemClick(GetAuctionItemLink("list", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
if ( not HandleModifiedItemClick(GetAuctionItemLink("list", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame))) ) then
if ( IsModifiedClick("DRESSUP") ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("list", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
else
BrowseButton_OnClick(self:GetParent());
end
Expand Down Expand Up @@ -404,7 +408,11 @@
<Scripts>
<OnClick>
if ( IsModifiedClick() ) then
HandleModifiedItemClick(GetAuctionItemLink("list", self:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
if ( not HandleModifiedItemClick(GetAuctionItemLink("list", self:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame))) ) then
if ( IsModifiedClick("DRESSUP") ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("list", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
else
BrowseButton_OnClick(self);
end
Expand Down Expand Up @@ -564,7 +572,11 @@
</OnLeave>
<OnClick>
if ( IsModifiedClick() ) then
HandleModifiedItemClick(GetAuctionItemLink("bidder", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BidScrollFrame)));
if ( not HandleModifiedItemClick(GetAuctionItemLink("bidder", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BidScrollFrame))) ) then
if ( IsModifiedClick("DRESSUP") ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("bidder", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
else
BidButton_OnClick(self:GetParent());
end
Expand Down Expand Up @@ -664,7 +676,11 @@
<Scripts>
<OnClick>
if ( IsModifiedClick() ) then
HandleModifiedItemClick(GetAuctionItemLink("bidder", self:GetID() + FauxScrollFrame_GetOffset(BidScrollFrame)));
if ( not HandleModifiedItemClick(GetAuctionItemLink("bidder", self:GetID() + FauxScrollFrame_GetOffset(BidScrollFrame))) ) then
if ( IsModifiedClick("DRESSUP") ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("bidder", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
else
BidButton_OnClick(self);
end
Expand Down Expand Up @@ -812,7 +828,11 @@
</OnLeave>
<OnClick>
if ( IsModifiedClick() ) then
HandleModifiedItemClick(GetAuctionItemLink("owner", self:GetParent():GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame)));
if ( not HandleModifiedItemClick(GetAuctionItemLink("owner", self:GetParent():GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame))) ) then
if ( IsModifiedClick("DRESSUP") ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("owner", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
else
AuctionsButton_OnClick(self:GetParent());
end
Expand Down Expand Up @@ -950,7 +970,11 @@
<Scripts>
<OnClick>
if ( IsModifiedClick() ) then
HandleModifiedItemClick(GetAuctionItemLink("owner", self:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame)));
if ( not HandleModifiedItemClick(GetAuctionItemLink("owner", self:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame))) ) then
if ( IsModifiedClick("DRESSUP") ) then
DressUpBattlePet(GetAuctionItemBattlePetInfo("owner", self:GetParent():GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)));
end
end
else
AuctionsButton_OnClick(self);
end
Expand Down
2 changes: 1 addition & 1 deletion AddOns/Blizzard_BattlefieldMinimap/Blizzard_BattlefieldMinimap.xml
View file
Expand Up @@ -158,7 +158,7 @@
</Anchors>
</HighlightTexture>
</Button>
<Frame name="BattlefieldMinimap" parent="UIParent" frameStrata="BACKGROUND" hidden="true">
<Frame name="BattlefieldMinimap" parent="UIParent" frameStrata="BACKGROUND" frameLevel="10" hidden="true">
<Size>
<AbsDimension x="225" y="150"/>
</Size>
Expand Down
3 changes: 2 additions & 1 deletion AddOns/Blizzard_GuildUI/Blizzard_GuildInfo.xml
View file
Expand Up @@ -271,7 +271,8 @@
GameTooltip:AddLine(" ")
GameTooltip:AddLine(_G["GUILD_CHALLENGE_TOOLTIP"..index], 1, 1, 1, 1, 1);
GameTooltip:AddLine(" ")
if ( GetGuildLevel() == MAX_GUILD_LEVEL ) then
local guildLevel, maxGuildLevel = GetGuildLevel();
if ( guildLevel == maxGuildLevel ) then
local goldString = GetMoneyString(maxGold * COPPER_PER_SILVER * SILVER_PER_GOLD);
GameTooltip:AddLine(string.format(GUILD_CHALLENGE_REWARD_GOLD, goldString), 1, 1, 1, 1, 1);
else
Expand Down

0 comments on commit c602f95

Please sign in to comment.