Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Build 16539
  • Loading branch information
tekkub committed Feb 5, 2013
1 parent fb3e778 commit b7d7ebb
Show file tree
Hide file tree
Showing 27 changed files with 1,159 additions and 463 deletions.
30 changes: 21 additions & 9 deletions AddOns/Blizzard_ArenaUI/Blizzard_ArenaUI.xml
Expand Up @@ -177,14 +177,6 @@
<Color r="0" g="0" b="0" a="0.5"/>
</Texture>
</Layer>
<Layer level="ARTWORK">
<Texture name="$parentMyHealPredictionBar" inherits="MyHealPredictionBarTemplate"/>
<Texture name="$parentOtherHealPredictionBar" inherits="OtherHealPredictionBarTemplate"/>
<Texture name="$parentTotalAbsorbBar" inherits="TotalAbsorbBarTemplate"/>
</Layer>
<Layer level="ARTWORK" textureSubLevel="1">
<Texture name="$parentTotalAbsorbBarOverlay" inherits="TotalAbsorbBarOverlayTemplate"/>
</Layer>
</Layers>
<Frames>
<Frame name="$parentDropDown" inherits="UIDropDownMenuTemplate" id="1" hidden="true" parentKey="DropDown">
Expand Down Expand Up @@ -240,7 +232,6 @@
<Anchor point="TOPLEFT" relativeTo="$parentClassPortrait" relativePoint="CENTER" x="0" y="4"/>
</Anchors>
</Texture>
<Texture name="$parentOverAbsorbGlow" inherits="OverAbsorbGlowTemplate"/>
</Layer>
<Layer level="OVERLAY">
<Texture name="$parentDisconnect" file="Interface\CharacterFrame\Disconnect-Icon" hidden="true">
Expand Down Expand Up @@ -313,7 +304,28 @@
</Scripts>
</Button>
<Button name="ArenaEnemyFrameTemplate" frameStrata="LOW" toplevel="true" movable="true" hidden="true" inherits="ArenaPrepFrameTemplate" virtual="true">
<Layers>
<Layer level="ARTWORK">
<Texture name="$parentMyHealPredictionBar" inherits="MyHealPredictionBarTemplate"/>
<Texture name="$parentOtherHealPredictionBar" inherits="OtherHealPredictionBarTemplate"/>
<Texture name="$parentTotalAbsorbBar" inherits="TotalAbsorbBarTemplate"/>
</Layer>
<Layer level="ARTWORK" textureSubLevel="1">
<Texture name="$parentTotalAbsorbBarOverlay" inherits="TotalAbsorbBarOverlayTemplate"/>
</Layer>
</Layers>
<Frames>
<Frame setAllPoints="true">
<Frames>
<Frame setAllPoints="true">
<Layers>
<Layer level="OVERLAY">
<Texture name="$parentOverAbsorbGlow" inherits="OverAbsorbGlowTemplate"/>
</Layer>
</Layers>
</Frame>
</Frames>
</Frame>
<Button name="$parentPetFrame" inherits="ArenaEnemyPetFrameTemplate" parentKey="petFrame"/>
</Frames>
<Scripts>
Expand Down
6 changes: 3 additions & 3 deletions AddOns/Blizzard_Calendar/Blizzard_Calendar.lua
Expand Up @@ -1635,10 +1635,10 @@ function CalendarFrame_UpdateDayTextures(dayButton, numEvents, firstEventButton,
eventBackground:Show();

-- set day texture
local title, hour, minute, calendarType, sequenceType, eventType, texture =
CalendarGetDayEvent(monthOffset, day, firstEventButton.eventIndex);
local title, hour, minute, calendarType, sequenceType, eventType, texture,
_, _, _, _, _, _, numSequenceDays = CalendarGetDayEvent(monthOffset, day, firstEventButton.eventIndex);
eventTex:SetTexture();
if ( CALENDAR_USE_SEQUENCE_FOR_EVENT_TEXTURE ) then
if ( CALENDAR_USE_SEQUENCE_FOR_EVENT_TEXTURE and numSequenceDays ~= 2) then
texturePath, tcoords = _CalendarFrame_GetTextureFile(texture, calendarType, sequenceType, eventType);
else
texturePath, tcoords = _CalendarFrame_GetTextureFile(texture, calendarType, "", eventType);
Expand Down
2 changes: 2 additions & 0 deletions AddOns/Blizzard_GMChatUI/Blizzard_GMChatUI.lua
Expand Up @@ -135,6 +135,8 @@ function GMChatFrame_OnShow(self)
for _,gmName in ipairs(self.lastGM) do
ChatEdit_SetLastTellTarget(gmName, "WHISPER");
end
GMChatFrameEditBox:SetAttribute("tellTarget", ChatEdit_GetLastTellTarget());
GMChatFrameEditBox:SetAttribute("chatType", "WHISPER");
table.wipe(self.lastGM);
if ( self.lastGMForCVar ) then
SetCVar("lastTalkedToGM", self.lastGMForCVar);
Expand Down
4 changes: 2 additions & 2 deletions AddOns/Blizzard_ItemUpgradeUI/Blizzard_ItemUpgradeUI.lua
Expand Up @@ -69,7 +69,7 @@ function ItemUpgradeFrame_Update(self)
ItemUpgradeFrame.ItemButton.MissingText:Hide();
ItemUpgradeFrame.ItemButton.Cost.Amount:SetText(cost);
local _, _, currencyTexture = GetCurrencyInfo(currencyType);
ItemUpgradeFrame.ItemButton.Cost.Icon:SetTexture("Interface\\Icons\\"..currencyTexture);
ItemUpgradeFrame.ItemButton.Cost.Icon:SetTexture(currencyTexture);
ItemUpgradeFrame.MissingDescription:Hide();
ItemUpgradeFrame.MissingFadeOut:Hide();
ItemUpgradeFrame.TitleTextLeft:Show();
Expand Down Expand Up @@ -128,7 +128,7 @@ function ItemUpgradeFrame_Update(self)
if ( cost and cost > 0 ) then
local _, amount, currencyTexture = GetCurrencyInfo(currencyType);
ItemUpgradeFrameMoneyFrame.Currency.currencyID = currencyType;
ItemUpgradeFrameMoneyFrame.Currency.icon:SetTexture("Interface\\Icons\\"..currencyTexture);
ItemUpgradeFrameMoneyFrame.Currency.icon:SetTexture(currencyTexture);
ItemUpgradeFrameMoneyFrame.Currency.count:SetText(amount);
ItemUpgradeFrameMoneyFrame.Currency:Show();
if ( cost > amount ) then
Expand Down

0 comments on commit b7d7ebb

Please sign in to comment.