diff --git a/.github/workflows/package_beta.yml b/.github/workflows/package_beta.yml index 9ffd3b53..13e31591 100644 --- a/.github/workflows/package_beta.yml +++ b/.github/workflows/package_beta.yml @@ -34,17 +34,17 @@ jobs: - name: Create Mainline Package uses: BigWigsMods/packager@v2 - tbc: + wrath: needs: is_beta runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Create TBC Package + - name: Create Wrath Package uses: BigWigsMods/packager@v2 with: - args: -g bcc -m .pkgmeta-tbc + args: -g wrath -m .pkgmeta-wrath vanilla: needs: is_beta diff --git a/Skin/Classic/Interface/AddOns/Blizzard_LookingForGroupUI.lua b/Skin/Classic/Interface/AddOns/Blizzard_LookingForGroupUI.lua index 4016d90a..7592994c 100644 --- a/Skin/Classic/Interface/AddOns/Blizzard_LookingForGroupUI.lua +++ b/Skin/Classic/Interface/AddOns/Blizzard_LookingForGroupUI.lua @@ -52,7 +52,7 @@ function private.AddOns.Blizzard_LookingForGroupUI() _G.LFGParentFramePortrait:Hide() - + ----====####$$$$%%%%$$$$####====---- -- LFGListing -- ----====####$$$$%%%%$$$$####====---- diff --git a/Skin/Classic/Interface/FrameXML/Blizzard_TalentUITemplates.lua b/Skin/Classic/Interface/FrameXML/Blizzard_TalentUITemplates.lua index 2440dafd..87682049 100644 --- a/Skin/Classic/Interface/FrameXML/Blizzard_TalentUITemplates.lua +++ b/Skin/Classic/Interface/FrameXML/Blizzard_TalentUITemplates.lua @@ -6,9 +6,7 @@ if private.shouldSkip() then return end --[[ Core ]] local Aurora = private.Aurora -local Base = Aurora.Base -local Hook, Skin = Aurora.Hook, Aurora.Skin -local Color, Util = Aurora.Color, Aurora.Util +local Skin = Aurora.Skin do --[[ FrameXML\Blizzard_TalentUITemplates.lua ]] function Skin.TalentButtonTemplate(Button) @@ -24,7 +22,7 @@ end function private.FrameXML.Blizzard_TalentUITemplates() ----====####$$$$%%%%$$$$####====---- - -- Blizzard_TalentUITemplates -- + -- Blizzard_TalentUITemplates -- ----====####$$$$%%%%$$$$####====---- ------------- diff --git a/Skin/Classic/Interface/SharedXML/HybridScrollFrame.lua b/Skin/Classic/Interface/SharedXML/HybridScrollFrame.lua index 90b211bd..f9d5e296 100644 --- a/Skin/Classic/Interface/SharedXML/HybridScrollFrame.lua +++ b/Skin/Classic/Interface/SharedXML/HybridScrollFrame.lua @@ -19,6 +19,8 @@ do --[[ SharedXML\HybridScrollFrame.lua ]] Skin[buttonTemplate](self.buttons[i]) end self._auroraNumSkinned = numButtons + else + private.debug("Missing template for HybridScrollFrame:", buttonTemplate) end end end diff --git a/Skin/Classic/Interface_Wrath/AddOns/Blizzard_TalentUI.lua b/Skin/Classic/Interface_Wrath/AddOns/Blizzard_TalentUI.lua index c18a8432..b3b78d03 100644 --- a/Skin/Classic/Interface_Wrath/AddOns/Blizzard_TalentUI.lua +++ b/Skin/Classic/Interface_Wrath/AddOns/Blizzard_TalentUI.lua @@ -108,7 +108,7 @@ function private.AddOns.Blizzard_TalentUI() _G.PlayerTalentFrameScrollFrame:ClearAllPoints() _G.PlayerTalentFrameScrollFrame:SetPoint("TOPLEFT", bg, 5, -45) - _G.PlayerTalentFrameScrollFrame:SetPoint("BOTTOMRIGHT", PlayerTalentFramePointsBar, "TOPRIGHT", -25, 5) + _G.PlayerTalentFrameScrollFrame:SetPoint("BOTTOMRIGHT", _G.PlayerTalentFramePointsBar, "TOPRIGHT", -25, 5) Skin.UIPanelScrollFrameTemplate(_G.PlayerTalentFrameScrollFrame) _G.PlayerTalentFrameScrollFrameBackgroundTop:Hide() diff --git a/Skin/Classic/Interface_Wrath/FrameXML/CharacterFrame.lua b/Skin/Classic/Interface_Wrath/FrameXML/CharacterFrame.lua index c9011c11..78bccb91 100644 --- a/Skin/Classic/Interface_Wrath/FrameXML/CharacterFrame.lua +++ b/Skin/Classic/Interface_Wrath/FrameXML/CharacterFrame.lua @@ -2,7 +2,7 @@ local _, private = ... if private.shouldSkip() then return end --[[ Lua Globals ]] --- luacheck: globals +-- luacheck: globals wipe tinsert --[[ Core ]] local Aurora = private.Aurora @@ -19,7 +19,7 @@ do --[[ FrameXML\CharacterFrame.lua ]] end end - local bg = CharacterFrame:GetBackdropTexture("bg") + local bg = _G.CharacterFrame:GetBackdropTexture("bg") Util.PositionRelative("TOPLEFT", bg, "BOTTOMLEFT", 20, -1, 1, "Right", CharTabtable) end end diff --git a/Skin/Classic/Interface_Wrath/FrameXML/InterfaceOptionsPanels.lua b/Skin/Classic/Interface_Wrath/FrameXML/InterfaceOptionsPanels.lua index 72a6b16b..b42755d1 100644 --- a/Skin/Classic/Interface_Wrath/FrameXML/InterfaceOptionsPanels.lua +++ b/Skin/Classic/Interface_Wrath/FrameXML/InterfaceOptionsPanels.lua @@ -174,7 +174,6 @@ function private.FrameXML.InterfaceOptionsPanels() -------------- -- Features -- -------------- - local Features = _G.InterfaceOptionsFeaturesPanel Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsFeaturesPanelEquipmentManager) Skin.InterfaceOptionsCheckButtonTemplate(_G.InterfaceOptionsFeaturesPanelPreviewTalentChanges) diff --git a/Skin/Classic/Interface_Wrath/FrameXML/MainMenuBarMicroButtons.lua b/Skin/Classic/Interface_Wrath/FrameXML/MainMenuBarMicroButtons.lua index 3f35a0cc..a3865236 100644 --- a/Skin/Classic/Interface_Wrath/FrameXML/MainMenuBarMicroButtons.lua +++ b/Skin/Classic/Interface_Wrath/FrameXML/MainMenuBarMicroButtons.lua @@ -125,7 +125,7 @@ function private.FrameXML.MainMenuBarMicroButtons() SetMicroButton(_G.QuestLogMicroButton, "Quest") SetMicroButton(_G.SocialsMicroButton, "Socials") --SetMicroButton(_G.PVPMicroButton, "") - PVPMicroButton.texture:SetPoint("TOP", 3, -30) + _G.PVPMicroButton.texture:SetPoint("TOP", 3, -30) SetMicroButton(_G.LFGMicroButton, "LFG") SetMicroButton(_G.MainMenuMicroButton, "MainMenu") SetMicroButton(_G.HelpMicroButton, [[Interface\Icons\INV_Misc_QuestionMark]]) diff --git a/Skin/Classic/Interface_Wrath/FrameXML/QuestFrame.lua b/Skin/Classic/Interface_Wrath/FrameXML/QuestFrame.lua index 4908cb21..e8d54179 100644 --- a/Skin/Classic/Interface_Wrath/FrameXML/QuestFrame.lua +++ b/Skin/Classic/Interface_Wrath/FrameXML/QuestFrame.lua @@ -136,7 +136,7 @@ do --[[ FrameXML\QuestFrameTemplates.xml ]] center:Hide() right:Hide() - local titleBG = _G.CreateFrame("Frame", nil, TitleFrame) + local titleBG = _G.CreateFrame("Frame", nil, Button) titleBG:SetPoint("TOPLEFT", left, -2, 0) titleBG:SetPoint("BOTTOMRIGHT", right, 0, -1) Base.SetBackdrop(titleBG, Color.frame) diff --git a/Skin/Classic/Interface_Wrath/FrameXML/QuestLogFrame.lua b/Skin/Classic/Interface_Wrath/FrameXML/QuestLogFrame.lua index af9b12a6..76da6c88 100644 --- a/Skin/Classic/Interface_Wrath/FrameXML/QuestLogFrame.lua +++ b/Skin/Classic/Interface_Wrath/FrameXML/QuestLogFrame.lua @@ -7,14 +7,27 @@ if private.shouldSkip() then return end --[[ Core ]] local Aurora = private.Aurora local Hook, Skin = Aurora.Hook, Aurora.Skin -local Color = Aurora.Color do --[[ FrameXML\QuestLogFrame.lua ]] function Hook.QuestLog_Update(Button) local numEntries = _G.GetNumQuestLogEntries() local questIndex, questLogTitle, isHeader, _ + local scrollOffset = _G.HybridScrollFrame_GetOffset(_G.QuestLogListScrollFrame) + local buttons = _G.QuestLogListScrollFrame.buttons for i = 1, _G.QUESTS_DISPLAYED do + questIndex = i + scrollOffset + questLogTitle = buttons[i] + if questIndex <= numEntries then + _, _, _, isHeader = _G.GetQuestLogTitle(questIndex) + if isHeader then + questLogTitle._minus:Show() + questLogTitle:GetHighlightTexture():SetTexture("") + else + questLogTitle._minus:Hide() + questLogTitle._plus:Hide() + end + end end end function Hook.QuestLog_UpdateQuestDetails(doNotScroll) @@ -64,16 +77,16 @@ function private.FrameXML.QuestLogFrame() bottom = 4, }) - local portrait, topLeft, topRight, bottomLeft, bottomRight, topLeftBG, topRightBG, bottomLeftBG, bottomRightBG = QuestLogDetailFrame:GetRegions() + local portrait, topLeft, topRight, botLeft, botRight, topLeftBG, topRightBG, botLeftBG, botRightBG = QuestLogDetailFrame:GetRegions() portrait:Hide() topLeft:Hide() topRight:Hide() - bottomLeft:Hide() - bottomRight:Hide() + botLeft:Hide() + botRight:Hide() topLeftBG:Hide() topRightBG:Hide() - bottomLeftBG:Hide() - bottomRightBG:Hide() + botLeftBG:Hide() + botRightBG:Hide() local bg = QuestLogDetailFrame:GetBackdropTexture("bg") _G.QuestLogDetailTitle:ClearAllPoints() @@ -99,12 +112,13 @@ function private.FrameXML.QuestLogFrame() bottom = 11, }) - local portrait, paneLeft, paneRight = QuestLogFrame:GetRegions() + local paneLeft, paneRight + portrait, paneLeft, paneRight = QuestLogFrame:GetRegions() portrait:Hide() paneLeft:Hide() paneRight:Hide() - local bg = QuestLogFrame:GetBackdropTexture("bg") + bg = QuestLogFrame:GetBackdropTexture("bg") _G.QuestLogTitleText:ClearAllPoints() _G.QuestLogTitleText:SetPoint("TOPLEFT", bg) _G.QuestLogTitleText:SetPoint("BOTTOMRIGHT", bg, "TOPRIGHT", 0, -private.FRAME_TITLE_HEIGHT) @@ -112,12 +126,12 @@ function private.FrameXML.QuestLogFrame() Skin.UIPanelCloseButton(_G.QuestLogFrameCloseButton) Skin.UIPanelButtonTemplate(_G.QuestLogFrameCancelButton) - TopLeft, TopRight, BotLeft, BotRight = _G.EmptyQuestLogFrame:GetRegions() + topLeft, topRight, botLeft, botRight = _G.EmptyQuestLogFrame:GetRegions() portrait:Hide() - TopLeft:Hide() - TopRight:Hide() - BotLeft:Hide() - BotRight:Hide() + topLeft:Hide() + topRight:Hide() + botLeft:Hide() + botRight:Hide() _G.QuestLogCountTopRight:Hide() _G.QuestLogCountBottomRight:Hide() @@ -132,4 +146,5 @@ function private.FrameXML.QuestLogFrame() _G.QuestLogSkillHighlight:SetColorTexture(1, 1, 1, 0.5) Skin.HybridScrollBarTemplate(_G.QuestLogListScrollFrameScrollBar) + Hook.HybridScrollFrame_CreateButtons(_G.QuestLogListScrollFrame, "QuestLogTitleButtonTemplate") -- Called here since the original is called OnLoad end