From 78692438325d9bc584a8303d6d7c4ecaad2fa10b Mon Sep 17 00:00:00 2001 From: failcoder Date: Wed, 26 Oct 2016 20:44:50 -0500 Subject: [PATCH] More skin fixes added orderhall skin --- SVUITheme_Simple/SVUITheme_Simple.lua | 36 +++++----- SVUI_!Core/SVUI_!Core.toc | 2 +- SVUI_!Core/libs/_SVUI_Lib/Registry.lua | 2 +- SVUI_!Core/system/debug.lua | 1 + SVUI_!Core/system/dock.lua | 72 +++++++++++++------- SVUI_!Core/xml/docks.xml | 16 +++++ SVUI_!Options/SVUI_!Options.toc | 2 +- SVUI_ActionBars/SVUI_ActionBars.toc | 2 +- SVUI_ActionBars/components/micro.lua | 2 +- SVUI_Auras/SVUI_Auras.toc | 2 +- SVUI_Chat/SVUI_Chat.toc | 2 +- SVUI_CraftOMatic/components/archaeology.lua | 17 ++--- SVUI_Inventory/SVUI_Inventory.toc | 2 +- SVUI_Maps/SVUI_Maps.lua | 6 +- SVUI_Maps/SVUI_Maps.toc | 2 +- SVUI_NamePlates/SVUI_NamePlates.lua | 10 +-- SVUI_NamePlates/SVUI_NamePlates.toc | 2 +- SVUI_PKG.toc | 2 +- SVUI_QuestTracker/SVUI_QuestTracker.toc | 2 +- SVUI_Skins/Loader.lua | 7 ++ SVUI_Skins/SVUI_Skins.lua | 2 +- SVUI_Skins/SVUI_Skins.toc | 2 +- SVUI_Skins/components/blizzard/_load.xml | 3 +- SVUI_Skins/components/blizzard/achievement.lua | 22 ++++-- SVUI_Skins/components/blizzard/artifact.lua | 41 +++++++++++ .../components/blizzard/encounterjournal.lua | 18 +++-- SVUI_Skins/components/blizzard/orderhall.lua | 53 ++++++++++++++ SVUI_Skins/components/blizzard/quest.lua | 13 ++-- SVUI_Tooltip/SVUI_Tooltip.toc | 2 +- SVUI_UnitFrames/SVUI_UnitFrames.toc | 2 +- 30 files changed, 252 insertions(+), 95 deletions(-) create mode 100644 SVUI_Skins/components/blizzard/artifact.lua create mode 100644 SVUI_Skins/components/blizzard/orderhall.lua diff --git a/SVUITheme_Simple/SVUITheme_Simple.lua b/SVUITheme_Simple/SVUITheme_Simple.lua index 5161575..8453331 100644 --- a/SVUITheme_Simple/SVUITheme_Simple.lua +++ b/SVUITheme_Simple/SVUITheme_Simple.lua @@ -112,10 +112,10 @@ local _SetThemedBackdrop = function(frame, isBottom) end local _SetBorderTheme = function(self) - self.Border.Top:SetPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) - self.Border.Top:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) - self.Border.Top:SetHeight(10) - self.Border.Top:SetBackdrop({ + self.Top:SetPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) + self.Top:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) + self.Top:SetHeight(10) + self.Top:SetBackdrop({ bgFile = [[Interface\BUTTONS\WHITE8X8]], edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = false, @@ -123,19 +123,19 @@ local _SetBorderTheme = function(self) edgeSize = 1, insets = {left = 0, right = 0, top = 0, bottom = 0} }) - self.Border.Top:SetBackdropColor(0,0,0,0) - self.Border.Top:SetBackdropBorderColor(0,0,0,0) - self.Border.Top:SetFrameLevel(0) - self.Border.Top:SetFrameStrata('BACKGROUND') - self.Border.Top:SetScript("OnShow", function(self) + self.Top:SetBackdropColor(0,0,0,0) + self.Top:SetBackdropBorderColor(0,0,0,0) + self.Top:SetFrameLevel(0) + self.Top:SetFrameStrata('BACKGROUND') + self.Top:SetScript("OnShow", function(self) self:SetFrameLevel(0) self:SetFrameStrata('BACKGROUND') end) - self.Border.Bottom:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) - self.Border.Bottom:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) - self.Border.Bottom:SetHeight(10) - self.Border.Bottom:SetBackdrop({ + self.Bottom:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) + self.Bottom:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) + self.Bottom:SetHeight(10) + self.Bottom:SetBackdrop({ bgFile = [[Interface\BUTTONS\WHITE8X8]], edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = false, @@ -143,11 +143,11 @@ local _SetBorderTheme = function(self) edgeSize = 1, insets = {left = 0, right = 0, top = 0, bottom = 0} }) - self.Border.Bottom:SetBackdropColor(0,0,0,0) - self.Border.Bottom:SetBackdropBorderColor(0,0,0,0) - self.Border.Bottom:SetFrameLevel(0) - self.Border.Bottom:SetFrameStrata('BACKGROUND') - self.Border.Bottom:SetScript("OnShow", function(self) + self.Bottom:SetBackdropColor(0,0,0,0) + self.Bottom:SetBackdropBorderColor(0,0,0,0) + self.Bottom:SetFrameLevel(0) + self.Bottom:SetFrameStrata('BACKGROUND') + self.Bottom:SetScript("OnShow", function(self) self:SetFrameLevel(0) self:SetFrameStrata('BACKGROUND') end) diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index 98fdf3b..2cc18b4 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media, SVUI_Shared diff --git a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua index 33bf87a..3bd4540 100644 --- a/SVUI_!Core/libs/_SVUI_Lib/Registry.lua +++ b/SVUI_!Core/libs/_SVUI_Lib/Registry.lua @@ -1153,7 +1153,7 @@ function lib:NewCore(gfile, efile, pfile, mfile, sfile) CoreObject.NameID = CoreGlobalName; CoreObject.Version = AddonVersion; CoreObject.GameVersion = tonumber(InterfaceVersion); - CoreObject.DebugMode = false; + CoreObject.DebugMode = true; CoreObject.HasErrors = false; CoreObject.Schema = GetAddOnMetadata(CoreName, SchemaFromMeta); CoreObject.TitleID = GetAddOnMetadata(CoreName, HeaderFromMeta); diff --git a/SVUI_!Core/system/debug.lua b/SVUI_!Core/system/debug.lua index 433345f..8674619 100644 --- a/SVUI_!Core/system/debug.lua +++ b/SVUI_!Core/system/debug.lua @@ -394,6 +394,7 @@ local function InitializeScriptError() SV.API:Set("ScrollBar", SVUI_ScriptErrorDialogScrollBar) --ScriptErrorDialog:SetStyle("!_Frame", "Transparent") ScriptErrorDialog.Input:SetScript("OnTextChanged", ScriptError_OnTextChanged) + SV.ScriptError:SetPoint("CENTER"); SV.ScriptError:RegisterForDrag("LeftButton"); end diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua index 0420081..27fea81 100644 --- a/SVUI_!Core/system/dock.lua +++ b/SVUI_!Core/system/dock.lua @@ -48,7 +48,6 @@ ADDON local SV = select(2, ...); local L = SV.L; local MOD = SV:NewPackage("Dock", L["Docks"]); -MOD.Border = {}; --[[ ########################################################## LOCALS @@ -87,6 +86,13 @@ THEMEABLE ITEMS MOD.ButtonSound = SV.Sounds:Blend("DockButton", "Buttons", "Levers"); MOD.ErrorSound = SV.Sounds:Blend("Malfunction", "Sparks", "Wired"); +local function getParentAnchor(location) + if (location:find("BOTTOM")) then + return MOD.Bottom; + end + return MOD.Top; +end + local function copyTable(tab) local copy = {}; for k, v in pairs(tab) do @@ -272,15 +278,15 @@ end local function ScreenBorderVisibility() if SV.db.Dock.bottomPanel then - SVUIDock_BottomBorder:Show() + SVUI_DockBarBottom:Show() else - SVUIDock_BottomBorder:Hide() + SVUI_DockBarBottom:Hide() end if SV.db.Dock.topPanel then - SVUIDock_TopBorder:Show() + SVUI_DockBarTop:Show() else - SVUIDock_TopBorder:Hide() + SVUI_DockBarTop:Hide() end end @@ -409,11 +415,24 @@ function MOD.SetThemedBackdrop(frame, forceTop) frame.UpdateBackdrop = UpdateBackdrop; end +function SV:AdjustTopDockBar(size) + MOD.Top:ClearAllPoints() + if (not size) then + MOD.Top:SetPoint("TOPLEFT", 0, 0); + MOD.Top:SetPoint("TOPRIGHT", 0, 0); + MOD.Top:SetAlpha(1) + else + MOD.Top:SetPoint("TOPLEFT", 0, -size); + MOD.Top:SetPoint("TOPRIGHT", 0, -size); + MOD.Top:SetAlpha(0) + end +end + function MOD:SetBorderTheme() - self.Border.Top:SetPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) - self.Border.Top:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) - self.Border.Top:SetHeight(10) - self.Border.Top:SetBackdrop({ + self.Top:SetPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) + self.Top:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) + self.Top:SetHeight(10) + self.Top:SetBackdrop({ bgFile = SV.media.background.button, edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = false, @@ -421,19 +440,19 @@ function MOD:SetBorderTheme() edgeSize = 1, insets = {left = 0, right = 0, top = 0, bottom = 0} }) - self.Border.Top:SetBackdropColor(unpack(SV.media.color.dark)) - self.Border.Top:SetBackdropBorderColor(0,0,0,1) - self.Border.Top:SetFrameLevel(0) - self.Border.Top:SetFrameStrata('BACKGROUND') - self.Border.Top:SetScript("OnShow", function(self) + self.Top:SetBackdropColor(unpack(SV.media.color.dark)) + self.Top:SetBackdropBorderColor(0,0,0,1) + self.Top:SetFrameLevel(0) + self.Top:SetFrameStrata('BACKGROUND') + self.Top:SetScript("OnShow", function(self) self:SetFrameLevel(0) self:SetFrameStrata('BACKGROUND') end) - self.Border.Bottom:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) - self.Border.Bottom:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) - self.Border.Bottom:SetHeight(10) - self.Border.Bottom:SetBackdrop({ + self.Bottom:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) + self.Bottom:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) + self.Bottom:SetHeight(10) + self.Bottom:SetBackdrop({ bgFile = SV.media.background.button, edgeFile = [[Interface\BUTTONS\WHITE8X8]], tile = false, @@ -441,11 +460,11 @@ function MOD:SetBorderTheme() edgeSize = 1, insets = {left = 0, right = 0, top = 0, bottom = 0} }) - self.Border.Bottom:SetBackdropColor(unpack(SV.media.color.dark)) - self.Border.Bottom:SetBackdropBorderColor(0,0,0,1) - self.Border.Bottom:SetFrameLevel(0) - self.Border.Bottom:SetFrameStrata('BACKGROUND') - self.Border.Bottom:SetScript("OnShow", function(self) + self.Bottom:SetBackdropColor(unpack(SV.media.color.dark)) + self.Bottom:SetBackdropBorderColor(0,0,0,1) + self.Bottom:SetFrameLevel(0) + self.Bottom:SetFrameStrata('BACKGROUND') + self.Bottom:SetScript("OnShow", function(self) self:SetFrameLevel(0) self:SetFrameStrata('BACKGROUND') end) @@ -1495,6 +1514,8 @@ end DOCKS ########################################################## ]]-- +MOD.Top = _G["SVUI_DockBarTop"]; +MOD.Bottom = _G["SVUI_DockBarBottom"]; MOD.TopCenter = _G["SVUI_DockTopCenter"]; MOD.BottomCenter = _G["SVUI_DockBottomCenter"]; @@ -1999,8 +2020,6 @@ function MOD:Load() -- [[ TOP AND BOTTOM BORDERS ]] -- - self.Border.Top = CreateFrame("Frame", "SVUIDock_TopBorder", SV.Screen); - self.Border.Bottom = CreateFrame("Frame", "SVUIDock_BottomBorder", SV.Screen); self:SetBorderTheme(); ScreenBorderVisibility(); @@ -2014,11 +2033,12 @@ function MOD:Load() local barReverse = SV:GetReversePoint(barAnchor); local isBottom = settings[3]; local vertMod = isBottom and 1 or -1 + local anchorParent = getParentAnchor(anchor); dock.Bar:SetParent(SV.Screen) dock.Bar:ClearAllPoints() dock.Bar:SetSize(width, buttonsize) - dock.Bar:SetPoint(anchor, SV.Screen, anchor, (2 * mod), (2 * vertMod)) + dock.Bar:SetPoint(anchor, anchorParent, anchor, (2 * mod), (2 * vertMod)) local highlight = CreateFrame("Frame", nil, dock.Bar) highlight:SetFrameStrata("BACKGROUND") diff --git a/SVUI_!Core/xml/docks.xml b/SVUI_!Core/xml/docks.xml index a91563d..56f1085 100644 --- a/SVUI_!Core/xml/docks.xml +++ b/SVUI_!Core/xml/docks.xml @@ -1,4 +1,20 @@  + + + + + + + + + + + + + + + + diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index c5d0083..b9d6440 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Options|r ## Notes: SVUI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI_!Core diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 945540e..a24b866 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Action Bars|r ## Notes: Action Bar Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0, LibActionButton-1.0 diff --git a/SVUI_ActionBars/components/micro.lua b/SVUI_ActionBars/components/micro.lua index 7b7f4f9..6e5d1d9 100644 --- a/SVUI_ActionBars/components/micro.lua +++ b/SVUI_ActionBars/components/micro.lua @@ -134,7 +134,7 @@ function MOD:InitializeMicroBar() microBar:SetSize(barWidth, barHeight) microBar:SetFrameStrata("HIGH") microBar:SetFrameLevel(0) - microBar:SetPoint('BOTTOMLEFT', SV.Dock.TopLeft.Bar.ToolBar, 'BOTTOMRIGHT', 4, 0) + microBar:SetPoint('TOPLEFT', SV.Dock.TopLeft.Bar.ToolBar, 'TOPRIGHT', 4, 0) SV:ManageVisibility(microBar) for i=1,16 do diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index e9f8efb..cdd1de2 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Auras|r ## Notes: Aura Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Chat/SVUI_Chat.toc b/SVUI_Chat/SVUI_Chat.toc index f1638b3..3c14d29 100644 --- a/SVUI_Chat/SVUI_Chat.toc +++ b/SVUI_Chat/SVUI_Chat.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Chat|r ## Notes: Chat Plugin for [|cff9911FFSVUI|r]. ## SavedVariables: SVUI_Global_ChatCache diff --git a/SVUI_CraftOMatic/components/archaeology.lua b/SVUI_CraftOMatic/components/archaeology.lua index 05d5250..878d39c 100644 --- a/SVUI_CraftOMatic/components/archaeology.lua +++ b/SVUI_CraftOMatic/components/archaeology.lua @@ -444,26 +444,19 @@ function PLUGIN:LoadArchaeologyMode() ArchCrafting:InsetPoints(ModeLogsFrame) local BAR_WIDTH = (ArchCrafting:GetWidth() * 0.33) - 4 - local BAR_HEIGHT = (ArchCrafting:GetHeight() / 5) - 4 + local BAR_HEIGHT = (ArchCrafting:GetHeight() / math.floor(ArchRaces / 3)) - 4 for i = 1, ArchRaces do local bar = CreateFrame("StatusBar", nil, ArchCrafting) local solve = CreateFrame("Button", nil, bar, "SecureHandlerClickTemplate") - local yOffset,xOffset = 0,0; + local xMod = (i == 1) and 0 or ((i-1) % 3); + local xOffset = ((BAR_WIDTH + 4) * xMod) + 4; + local yMod = (i == 1) and 0 or math.floor((i-1) / 3); + local yOffset = ((BAR_HEIGHT + 4) * yMod) + 4; bar:SetStyle("Frame", "Bar") bar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) bar:SetSize(BAR_WIDTH,BAR_HEIGHT) - if(i > 10) then - xOffset = (BAR_WIDTH * 2) + 6 - yOffset = ((i - 11) * (BAR_HEIGHT + 4)) + 4 - elseif(i > 5) then - xOffset = BAR_WIDTH + 4 - yOffset = ((i - 6) * (BAR_HEIGHT + 4)) + 4 - else - xOffset = 2 - yOffset = ((i - 1) * (BAR_HEIGHT + 4)) + 4; - end bar:SetPoint("TOPLEFT", ArchCrafting, "TOPLEFT", xOffset, -yOffset) bar:SetStatusBarColor(0.2, 0.2, 0.8, 0.5) diff --git a/SVUI_Inventory/SVUI_Inventory.toc b/SVUI_Inventory/SVUI_Inventory.toc index 8eee4e2..029389b 100644 --- a/SVUI_Inventory/SVUI_Inventory.toc +++ b/SVUI_Inventory/SVUI_Inventory.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Inventory|r ## Notes: Inventory Plugin for [|cff9911FFSVUI|r]. ## SavedVariables: SVUI_LootCache diff --git a/SVUI_Maps/SVUI_Maps.lua b/SVUI_Maps/SVUI_Maps.lua index 9b82aae..076710f 100644 --- a/SVUI_Maps/SVUI_Maps.lua +++ b/SVUI_Maps/SVUI_Maps.lua @@ -818,7 +818,7 @@ function MOD:Load() self.Holder:SetFrameLevel(Minimap:GetFrameLevel() - 2) self.Holder:SetFrameStrata("LOW") - self.Holder:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", -15, -20) + self.Holder:SetPoint("TOPRIGHT", SV.Dock.Top, "TOPRIGHT", -15, -18) self.Holder:SetSize(MM_WIDTH, MM_HEIGHT) self.Holder.Square = CreateFrame("Frame", nil, self.Holder) @@ -887,8 +887,8 @@ function MOD:Load() self.InfoTop:SetPoint("TOPLEFT", self.Holder, "TOPLEFT", 4, -4) --self.InfoTop:SetSize(100, 22) self.InfoTop:SetStyle("Frame") - self.InfoTop:SetPanelColor("yellow") - self.InfoTop:SetBackdropColor(1, 1, 0, 1) + self.InfoTop:SetPanelColor("yellow") + self.InfoTop:SetBackdropColor(1, 1, 0, 1) self.InfoTop:SetFrameLevel(Minimap:GetFrameLevel() + 2) self.InfoTop.Text:SetShadowColor(0, 0, 0, 0.3) diff --git a/SVUI_Maps/SVUI_Maps.toc b/SVUI_Maps/SVUI_Maps.toc index bc5a269..a74d658 100644 --- a/SVUI_Maps/SVUI_Maps.toc +++ b/SVUI_Maps/SVUI_Maps.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Maps|r ## Notes: Maps Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_NamePlates/SVUI_NamePlates.lua b/SVUI_NamePlates/SVUI_NamePlates.lua index c0a067b..31f21df 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.lua +++ b/SVUI_NamePlates/SVUI_NamePlates.lua @@ -992,17 +992,19 @@ function UnitFrameMixin:Create(unitframe) self.name:SetJustifyH'CENTER' self.aggroHighlight = h:CreateTexture(nil, 'OVERLAY', nil, 1) - self.aggroHighlight:SetTexture("Interface\\RaidFrame\\Raid-FrameHighlights"); - self.aggroHighlight:SetTexCoord(unpack(AggroTexCoords)); + --self.aggroHighlight:SetTexture("Interface\\RaidFrame\\Raid-FrameHighlights"); + --self.aggroHighlight:SetTexCoord(unpack(AggroTexCoords)); + self.aggroHighlight:SetTexture(SV.media.statusbar.default) + self.aggroHighlight:SetVertexColor(1, 1, 1, 0.25) self.aggroHighlight:SetAllPoints(h); self.aggroHighlight:Hide() self.hoverHighlight = h:CreateTexture(nil, 'ARTWORK', nil, 1) - self.hoverHighlight:SetTexture(HighlightTex) + self.hoverHighlight:SetTexture(SV.media.statusbar.default) + self.hoverHighlight:SetVertexColor(1, 1, 1, 0.25) self.hoverHighlight:SetAllPoints(h) - self.hoverHighlight:SetVertexColor(1, 1, 1) self.hoverHighlight:SetBlendMode('ADD') self.hoverHighlight:SetTexCoord(unpack(HiTexCoord)) self.hoverHighlight:Hide() diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index 1100eb7..257a57a 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00NamePlates|r ## Notes: NamePlates Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_PKG.toc b/SVUI_PKG.toc index 9126784..00dc63d 100644 --- a/SVUI_PKG.toc +++ b/SVUI_PKG.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI|r ## RequiredDeps: SVUI_!Core, SVUI_!Options ## X-Email: munglunch@gmail.com diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index c0f06cf..6a3e7d0 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r ## Notes: QuestTracker Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Skins/Loader.lua b/SVUI_Skins/Loader.lua index 83a62ae..6530e0c 100644 --- a/SVUI_Skins/Loader.lua +++ b/SVUI_Skins/Loader.lua @@ -60,6 +60,7 @@ SV.defaults[Schema] = { ["enableAddonDock"] = true, ["blizzard"] = { ["enable"] = true, + ["artifact"] = true, ["bags"] = true, ["bmah"] = true, ["chat"] = true, @@ -117,6 +118,7 @@ SV.defaults[Schema] = { ["losscontrol"] = true, ["itemUpgrade"] = true, ["talkingHead"] = true, + ["orderhall"] = true, }, ["addons"] = { ["enable"] = true, @@ -446,6 +448,11 @@ function MOD:LoadOptions() name = L["PvP Frames"], desc = L["TOGGLEART_DESC"] }, + orderhall = { + type = "toggle", + name = L["Order Hall"], + desc = L["TOGGLEART_DESC"] + }, nonraid = { type = "toggle", name = L["Non-Raid Frame"], diff --git a/SVUI_Skins/SVUI_Skins.lua b/SVUI_Skins/SVUI_Skins.lua index 52c9467..e4796e4 100644 --- a/SVUI_Skins/SVUI_Skins.lua +++ b/SVUI_Skins/SVUI_Skins.lua @@ -53,7 +53,7 @@ MOD.EventListeners = {}; MOD.OnLoadAddons = {}; MOD.SkinnedAddons = {}; MOD.Debugging = false; -MOD.DebugInternal = false; +MOD.DebugInternal = true; MOD.DebugExternal = false; --[[ ########################################################## diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index d177285..7fd8563 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -1,6 +1,6 @@ ## Interface: 70100 ## Author: Failcoder, Azilroka, Sortokk -## Version: 1.3.5 +## Version: 1.3.7 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Skins|r ## Notes: SVUI [|cff9911FFSkins System and AddOn Frames|r]. ## SavedVariables: SVUIUI_STYLE_GLOBAL diff --git a/SVUI_Skins/components/blizzard/_load.xml b/SVUI_Skins/components/blizzard/_load.xml index 5b51d0b..b08251b 100644 --- a/SVUI_Skins/components/blizzard/_load.xml +++ b/SVUI_Skins/components/blizzard/_load.xml @@ -2,6 +2,7 @@