diff --git a/SVUI_!Core/Changelog-SVUI_!Core-r20150307221226.txt b/SVUI_!Core/Changelog-SVUI_!Core-r20150307221226.txt new file mode 100644 index 0000000..2a2774c --- /dev/null +++ b/SVUI_!Core/Changelog-SVUI_!Core-r20150307221226.txt @@ -0,0 +1,48 @@ +Steven Jackson: + - Final revision of the Ace overrides + - Update to Ace hacks + - lib changes + - rollback on embedded libdatabroker + - rollback on embedded libdatabroker + - lib changes + - fixed dockable options + - minor version update, revised profiles and data + - Fixed bad aurabar filter crashes and colorpicker crashes + - toc update + - Last minute adjustments to default presets + - toc update + - Cleaning bad globals and option lua errors + - updates + - Updated chat, maps and more + - Updated chat, maps and more + - toc update + - fixes for automations, and custom profiles + - toc update + - ace modifications + - Fixed exp bug and custom profiles + - Fixed profiles, filters and lua errors + - Fixed profiles, filters and vendoring + - api updates + - transfer wizard code added + - api updates + - api updates + - Styling update of quest items and garrison panels + - build update + - issue #60 and #61 fixed + - release 1.0.04 + - fixed more installer issues, visual adjustments + - Combat closing of anchors fixed + - toc updates + - colors, installer, profiles updated + - installer issues fixed + - more updates + - toc update + - pkgmeta update + - fix for struct part 2 + - fix for file struct + - changing for packager + - Updating to the new core + - Cleaning up +Munglunch: + - 5.4.2 + - First Commit diff --git a/SVUI_!Core/SVUI_!Core.toc b/SVUI_!Core/SVUI_!Core.toc index eecd879..1a10f99 100644 --- a/SVUI_!Core/SVUI_!Core.toc +++ b/SVUI_!Core/SVUI_!Core.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.01 +## Version: 1.1.03 ## Title: |cffFF9900SuperVillain UI: |r|cff00FF00!Core|r ## Notes: SVUI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors, SVUI_Filters, SVUI_Media @@ -13,5 +13,9 @@ ## X-Donate: PayPal:munglunch@gmail.com ## X-License: All Rights Reserved ## X-Category: Interface Enhancements +## X-Curse-Packaged-Version: r20150307221226 +## X-Curse-Project-Name: SuperVillain UI: Core +## X-Curse-Project-ID: supervillain-ui +## X-Curse-Repository-ID: wow/supervillain-ui/mainline SVUI_!Core.xml diff --git a/SVUI_!Core/libs/AceVillain/AceVillain.xml b/SVUI_!Core/libs/AceVillain/AceVillain.xml index 61c699a..0543140 100644 --- a/SVUI_!Core/libs/AceVillain/AceVillain.xml +++ b/SVUI_!Core/libs/AceVillain/AceVillain.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="AceGUI-3.0.lua"/> + <Script file="AceVillain_GUI.lua"/> <!-- Container --> <Script file="widgets\AceGUIContainer-BlizOptionsGroup.lua"/> <Script file="widgets\AceGUIContainer-DropDownGroup.lua"/> diff --git a/SVUI_!Options/SVUI_!Options.toc b/SVUI_!Options/SVUI_!Options.toc index e811e6b..908930e 100644 --- a/SVUI_!Options/SVUI_!Options.toc +++ b/SVUI_!Options/SVUI_!Options.toc @@ -23,5 +23,9 @@ ## X-Curse-Project-Name: SuperVillain UI: Core ## X-Curse-Project-ID: supervillain-ui ## X-Curse-Repository-ID: wow/supervillain-ui/mainline +## X-Curse-Packaged-Version: r20150307221226 +## X-Curse-Project-Name: SuperVillain UI: Core +## X-Curse-Project-ID: supervillain-ui +## X-Curse-Repository-ID: wow/supervillain-ui/mainline SVUI_!Options.xml diff --git a/SVUI_ActionBars/Changelog-SVUI_ActionBars-r20150305001905.txt b/SVUI_ActionBars/Changelog-SVUI_ActionBars-r20150305001905.txt new file mode 100644 index 0000000..7422c3d --- /dev/null +++ b/SVUI_ActionBars/Changelog-SVUI_ActionBars-r20150305001905.txt @@ -0,0 +1,10 @@ +Steven Jackson: + - toc update + - Cleaning bad globals and option lua errors + - updates + - build update + - updating with core + - toc update + - fix file struct + - Fix + - First commit diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua index 8e7704f..0bfcc5d 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.lua +++ b/SVUI_ActionBars/SVUI_ActionBars.lua @@ -80,6 +80,15 @@ local SetSpellFlyoutHook local NewFrame = CreateFrame local NewHook = hooksecurefunc local NUM_ACTIONBAR_BUTTONS = NUM_ACTIONBAR_BUTTONS; +local SEQUENCE_PATTERN = '%s [bar:%d] %d;'; +--[[ + Quick explaination of what Im doing with all of these locals... + What I have done is set local variables for every database value + that the module can read efficiently. The function "UpdateLocals" + is used to refresh these any time a change is made to configs + and once when the mod is loaded. +]]-- +local TOTAL_BARS = 6; --[[ ########################################################## LOCAL FUNCTIONS @@ -462,7 +471,7 @@ function MOD:UpdateAllBindings(event) end MOD:UnregisterEvent("PLAYER_REGEN_DISABLED") if InCombatLockdown() then return end - for i = 1, 6 do + for i = 1, TOTAL_BARS do local barName = ("SVUI_ActionBar%d"):format(i) local bar = _G[barName] if(bar and bar.buttons) then @@ -511,12 +520,13 @@ function MOD:SetBarConfigData(bar) end function MOD:UpdateBarPagingDefaults() - local parse, custom; - if SV.db.ActionBars.Bar6.enable then - parse = "[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13; [bar:3] 3; [bar:4] 4; [bar:5] 5; [bar:6] 6; %s"; - else - parse = "[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13; [bar:2] 2; [bar:3] 3; [bar:4] 4; [bar:5] 5; [bar:6] 6; %s"; + local custom; + local parse = "[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13; [bar:2] 2; [bar:3] 3; [bar:4] 4;"; + for i=5, TOTAL_BARS do + parse = SEQUENCE_PATTERN:format(parse, i, i) end + + parse = parse .. " %s"; local mainbar = _G["SVUI_ActionBar1"] if(mainbar) then @@ -529,7 +539,7 @@ function MOD:UpdateBarPagingDefaults() mainbar.conditions = parse:format(GetVehicleBarIndex(), GetVehicleBarIndex(), GetOverrideBarIndex(), custom); end - for i=2, 6 do + for i=2, TOTAL_BARS do local id = ("Bar%d"):format(i) local bar = _G["SVUI_Action" .. id] if(bar and SV.db.ActionBars[id].useCustomPaging) then @@ -827,7 +837,7 @@ function MOD:RefreshActionBars() end local id, bar - for i = 1, 6 do + for i = 1, TOTAL_BARS do id = ("Bar%d"):format(i) bar = _G[("SVUI_Action%s"):format(id)] self:RefreshBar(id) @@ -887,7 +897,7 @@ local ResetAllBindings = function(self) if InCombatLockdown() then return end local bar - for i = 1, 6 do + for i = 1, TOTAL_BARS do bar = _G[("SVUI_ActionBar%d"):format(i)] if(bar) then ClearOverrideBindings(bar) @@ -920,9 +930,8 @@ local barBindingIndex = { local barPageIndex = {1, 5, 6, 4, 3, 2, 7, 8, 9, 10} CreateActionBars = function(self) - local count = SV.db.ActionBars.barCount or 6 local lastExtendedBar; - for i = 1, count do + for i = 1, TOTAL_BARS do local barID = ("Bar%d"):format(i) local barName = ("SVUI_Action%s"):format(barID) local buttonMax = NUM_ACTIONBAR_BUTTONS @@ -1483,12 +1492,21 @@ end BUILD FUNCTION / UPDATE ########################################################## ]]-- +function MOD:UpdateLocals() + local db = SV.db.ActionBars + if not db then return end + + TOTAL_BARS = db.barCount +end + function MOD:ReLoad() self:RefreshActionBars(); end function MOD:Load() RemoveDefaults(); + + self:UpdateLocals() self:UpdateBarPagingDefaults() diff --git a/SVUI_ActionBars/SVUI_ActionBars.toc b/SVUI_ActionBars/SVUI_ActionBars.toc index 9f842ad..86e1748 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.toc +++ b/SVUI_ActionBars/SVUI_ActionBars.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.0 +## Version: 1.0.09 ## 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_Auras/Changelog-SVUI_Auras-r20150306005526.txt b/SVUI_Auras/Changelog-SVUI_Auras-r20150306005526.txt new file mode 100644 index 0000000..697236d --- /dev/null +++ b/SVUI_Auras/Changelog-SVUI_Auras-r20150306005526.txt @@ -0,0 +1,9 @@ +Steven Jackson: + - minor version update, revised profiles and data + - Cleaning bad globals and optimizing code + - updates + - build update + - updating with core + - toc update + - fix for file struct + - First commit diff --git a/SVUI_Auras/SVUI_Auras.toc b/SVUI_Auras/SVUI_Auras.toc index 3be1a96..9fdc867 100644 --- a/SVUI_Auras/SVUI_Auras.toc +++ b/SVUI_Auras/SVUI_Auras.toc @@ -20,5 +20,9 @@ ## X-Curse-Project-Name: SuperVillain UI: Auras ## X-Curse-Project-ID: supervillain-ui-auras ## X-Curse-Repository-ID: wow/supervillain-ui-auras/mainline +## X-Curse-Packaged-Version: r20150306005526 +## X-Curse-Project-Name: SuperVillain UI: Auras +## X-Curse-Project-ID: supervillain-ui-auras +## X-Curse-Repository-ID: wow/supervillain-ui-auras/mainline SVUI_Auras.xml diff --git a/SVUI_CraftOMatic/Changelog-SVUI_CraftOMatic-r20150305002001.txt b/SVUI_CraftOMatic/Changelog-SVUI_CraftOMatic-r20150305002001.txt new file mode 100644 index 0000000..1da2ef4 --- /dev/null +++ b/SVUI_CraftOMatic/Changelog-SVUI_CraftOMatic-r20150305002001.txt @@ -0,0 +1,8 @@ +Steven Jackson: + - Cleaning bad globals and optimizing code + - updates + - build update + - release 1.0.04 + - updating with core + - toc update + - first commit diff --git a/SVUI_CraftOMatic/SVUI_CraftOMatic.toc b/SVUI_CraftOMatic/SVUI_CraftOMatic.toc index 531a52c..c02a671 100644 --- a/SVUI_CraftOMatic/SVUI_CraftOMatic.toc +++ b/SVUI_CraftOMatic/SVUI_CraftOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.0 +## Version: 1.0.09 ## Title: |cffFF9900SVUI Plugin: |r|cffFF69B4Craft-O-Matic|r ## Notes: Supervillain UI [|cff9911FFProfession Tools|r]. ## RequiredDeps: SVUI_!Core diff --git a/SVUI_NamePlates/Changelog-SVUI_NamePlates-r20150306005738.txt b/SVUI_NamePlates/Changelog-SVUI_NamePlates-r20150306005738.txt new file mode 100644 index 0000000..697236d --- /dev/null +++ b/SVUI_NamePlates/Changelog-SVUI_NamePlates-r20150306005738.txt @@ -0,0 +1,9 @@ +Steven Jackson: + - minor version update, revised profiles and data + - Cleaning bad globals and optimizing code + - updates + - build update + - updating with core + - toc update + - fix for file struct + - First commit diff --git a/SVUI_NamePlates/SVUI_NamePlates.toc b/SVUI_NamePlates/SVUI_NamePlates.toc index f3ad2f8..934f197 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.toc +++ b/SVUI_NamePlates/SVUI_NamePlates.toc @@ -20,5 +20,9 @@ ## X-Curse-Project-Name: SuperVillain UI: NamePlates ## X-Curse-Project-ID: supervillain-ui-nameplates ## X-Curse-Repository-ID: wow/supervillain-ui-nameplates/mainline +## X-Curse-Packaged-Version: r20150306005738 +## X-Curse-Project-Name: SuperVillain UI: NamePlates +## X-Curse-Project-ID: supervillain-ui-nameplates +## X-Curse-Repository-ID: wow/supervillain-ui-nameplates/mainline SVUI_NamePlates.xml diff --git a/SVUI_QuestTracker/Changelog-SVUI_QuestTracker-r20150305002017.txt b/SVUI_QuestTracker/Changelog-SVUI_QuestTracker-r20150305002017.txt new file mode 100644 index 0000000..c41612c --- /dev/null +++ b/SVUI_QuestTracker/Changelog-SVUI_QuestTracker-r20150305002017.txt @@ -0,0 +1,11 @@ +Steven Jackson: + - Cleaning bad globals and optimizing code + - updates + - fixes for automations, and custom profiles + - ace modifications, petbattle adjustments + - build update + - updating with core + - toc update + - more updates + - fix for file struct + - First commit diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.toc b/SVUI_QuestTracker/SVUI_QuestTracker.toc index e4ddda8..4c62375 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.toc +++ b/SVUI_QuestTracker/SVUI_QuestTracker.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.0 +## Version: 1.0.09 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00QuestTracker|r ## Notes: QuestTracker Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_Skins/Changelog-SVUI_Skins-r20150307001429.txt b/SVUI_Skins/Changelog-SVUI_Skins-r20150307001429.txt new file mode 100644 index 0000000..d729036 --- /dev/null +++ b/SVUI_Skins/Changelog-SVUI_Skins-r20150307001429.txt @@ -0,0 +1,22 @@ +Steven Jackson: + - lib changes + - fixed dockable options + - minor version update, revised profiles and data + - Battle pet list shows levels again + - Cleaning bad globals and optimizing code + - updates + - misc bug fixed + - fixes for automations, and custom profiles + - ace modifications, petbattle adjustments + - Fixed profiles, filters and lua errors + - updated styles in interface options + - api updates + - Styling update of quest items and garrison panels + - build update + - 6.1 style update + - updating with core + - toc update + - DBM fix + - more updates + - fix for file struct + - First Commit diff --git a/SVUI_Skins/SVUI_Skins.toc b/SVUI_Skins/SVUI_Skins.toc index 07c8429..16298fe 100644 --- a/SVUI_Skins/SVUI_Skins.toc +++ b/SVUI_Skins/SVUI_Skins.toc @@ -26,5 +26,9 @@ ## X-Curse-Project-Name: SuperVillain UI: Skins ## X-Curse-Project-ID: supervillain-ui-skins ## X-Curse-Repository-ID: wow/supervillain-ui-skins/mainline +## X-Curse-Packaged-Version: r20150307001429 +## X-Curse-Project-Name: SuperVillain UI: Skins +## X-Curse-Project-ID: supervillain-ui-skins +## X-Curse-Repository-ID: wow/supervillain-ui-skins/mainline SVUI_Skins.xml diff --git a/SVUI_Skins/components/blizzard/garrison.lua b/SVUI_Skins/components/blizzard/garrison.lua index 11ded7f..e47f454 100644 --- a/SVUI_Skins/components/blizzard/garrison.lua +++ b/SVUI_Skins/components/blizzard/garrison.lua @@ -547,6 +547,12 @@ local function LoadGarrisonStyle() SV.API:Set("DropDown", GarrisonRecruiterFramePickThreatDropDown) GarrisonRecruiterFrame.Pick.Radio1:SetStyle("!_Checkbox", false, -3, -3, true) GarrisonRecruiterFrame.Pick.Radio2:SetStyle("!_Checkbox", false, -3, -3, true) + GarrisonRecruiterFrame.PortraitTexture:Die() + SV.API:Set("CloseButton", GarrisonRecruiterFrame.CloseButton) + SV.API:Set("Button", GarrisonRecruiterFrame.Pick.ChooseRecruits) + SV.API:Set("Button", GarrisonRecruiterFrame.Random.ChooseRecruits) + + --GarrisonRecruiterFrame.UnavailableFrame:RemoveTextures(true) SV.API:Set("Window", GarrisonRecruitSelectFrame, true) GarrisonRecruitSelectFrame.FollowerSelection:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index 58dde7e..98c4949 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -149,7 +149,7 @@ local function StyleTradeSlots(name) local bg = CreateFrame("Frame", nil, button) bg:SetStyle("Frame", "Inset") bg:SetPoint("TOPLEFT", button, "TOPRIGHT", 4, 0) - bg:SetPoint("BOTTOMRIGHT", anchor, "BOTTOMRIGHT", 0, 14) + bg:SetPoint("BOTTOMRIGHT", anchor, "BOTTOMRIGHT", -10, 14) local level = button:GetFrameLevel() if(level < 3) then @@ -589,12 +589,13 @@ local function MiscStyles() end if(SV.db.Skins.blizzard.tabard) then - for i=1, TabardFrame:GetNumRegions() do + for i=1, TabardFrame:GetNumRegions() do local region = select(i, TabardFrame:GetRegions()) - if(region and region:GetObjectType() == "Texture") then + if(region and region.GetObjectType and region:GetObjectType() == "Texture") then local regionName = region:GetName(); - if(TABARD_REGIONS[regionName]) then return end - region:Die() + if(not TABARD_REGIONS[regionName]) then + region:Die() + end end end @@ -661,6 +662,8 @@ local function MiscStyles() TradeRecipientEnchantInset:Die() TradeRecipientMoneyInset:Die() TradeRecipientMoneyBg:Die() + TradeFramePlayerPortrait:Die() + TradeFrameRecipientPortrait:Die() SV.API:Set("Window", TradeFrame, true) @@ -685,21 +688,21 @@ local function MiscStyles() StyleTradeSlots("TradeRecipientItem"..i) end - TradeHighlightPlayerTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerMiddle:SetTexture(0, 1, 0, 0.2) + TradeHighlightPlayerTop:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerBottom:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerMiddle:SetTexture(0.28, 0.75, 1, 0.2) TradeHighlightPlayer:SetFrameStrata("HIGH") - TradeHighlightPlayerEnchantTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchantBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightPlayerEnchantMiddle:SetTexture(0, 1, 0, 0.2) + TradeHighlightPlayerEnchantTop:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerEnchantBottom:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightPlayerEnchantMiddle:SetTexture(0.28, 0.75, 1, 0.2) TradeHighlightPlayerEnchant:SetFrameStrata("HIGH") - TradeHighlightRecipientTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientMiddle:SetTexture(0, 1, 0, 0.2) + TradeHighlightRecipientTop:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientBottom:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientMiddle:SetTexture(0.28, 0.75, 1, 0.2) TradeHighlightRecipient:SetFrameStrata("HIGH") - TradeHighlightRecipientEnchantTop:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchantBottom:SetTexture(0, 1, 0, 0.2) - TradeHighlightRecipientEnchantMiddle:SetTexture(0, 1, 0, 0.2) + TradeHighlightRecipientEnchantTop:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientEnchantBottom:SetTexture(0.28, 0.75, 1, 0.2) + TradeHighlightRecipientEnchantMiddle:SetTexture(0.28, 0.75, 1, 0.2) TradeHighlightRecipientEnchant:SetFrameStrata("HIGH") end diff --git a/SVUI_Tooltip/Changelog-SVUI_Tooltip-r20150305001918.txt b/SVUI_Tooltip/Changelog-SVUI_Tooltip-r20150305001918.txt new file mode 100644 index 0000000..a0108ba --- /dev/null +++ b/SVUI_Tooltip/Changelog-SVUI_Tooltip-r20150305001918.txt @@ -0,0 +1,9 @@ +Steven Jackson: + - toc update + - Cleaning bad globals and optimizing code + - updates + - build update + - updating with core + - toc update + - fix for file struct + - First commit diff --git a/SVUI_Tooltip/SVUI_Tooltip.toc b/SVUI_Tooltip/SVUI_Tooltip.toc index fafa530..a8cf7a4 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.toc +++ b/SVUI_Tooltip/SVUI_Tooltip.toc @@ -1,6 +1,6 @@ ## Interface: 60100 ## Author: Munglunch -## Version: 1.1.0 +## Version: 1.0.09 ## Title: |cffFF9900SuperVillain UI: |r|cffFFEF00Tooltip|r ## Notes: Tooltip Plugin for [|cff9911FFSVUI|r]. ## OptionalDeps: LibSharedMedia-3.0 diff --git a/SVUI_UnitFrames/Changelog-SVUI_UnitFrames-r20150306005506.txt b/SVUI_UnitFrames/Changelog-SVUI_UnitFrames-r20150306005506.txt new file mode 100644 index 0000000..8b5fe95 --- /dev/null +++ b/SVUI_UnitFrames/Changelog-SVUI_UnitFrames-r20150306005506.txt @@ -0,0 +1,14 @@ +Steven Jackson: + - minor version update, revised profiles and data + - power bars hide when not needed + - Cleaning bad globals and optimizing code + - updates + - Fixed profiles, filters and lua errors + - api updates + - build update + - release 1.0.04 + - updating with core + - toc update + - color updates + - fix for file struct + - First commit diff --git a/SVUI_UnitFrames/Loader.lua b/SVUI_UnitFrames/Loader.lua index a0df525..923d060 100644 --- a/SVUI_UnitFrames/Loader.lua +++ b/SVUI_UnitFrames/Loader.lua @@ -44,7 +44,7 @@ local unitframeColors = { ["spark"] = {0, 0.42, 1}, ["interrupt"] = {0.78, 0, 1}, ["shield_bars"] = {0.56, 0.4, 0.62}, - ["buff_bars"] = {0.31, 0.31, 0.31}, + ["buff_bars"] = {0.04, 0.52, 0.95}, ["debuff_bars"] = {0.8, 0.1, 0.1}, ["predict"] = { ["personal"] = {0, 1, 0.5, 0.25}, diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.lua b/SVUI_UnitFrames/SVUI_UnitFrames.lua index d0dee05..3fdb744 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.lua +++ b/SVUI_UnitFrames/SVUI_UnitFrames.lua @@ -374,25 +374,30 @@ function MOD:RefreshUnitLayout(frame, template) PORTRAIT_STYLE = db.portrait.style; PORTRAIT_OVERLAY = (not GRID_MODE and PORTRAIT_ENABLED and PORTRAIT_STYLE == '3DOVERLAY'); PORTRAIT_OVERLAY_ANIMATION = (PORTRAIT_OVERLAY) and SV.db.UnitFrames.overlayAnimation or false; - if(PORTRAIT_ENABLED and (not PORTRAIT_OVERLAY)) then - PORTRAIT_WIDTH = ((db.portrait.width * TOP_MODIFIER) + (1 * TOP_MODIFIER)); + if(PORTRAIT_ENABLED and (not PORTRAIT_OVERLAY)) then + if(PORTRAIT_STYLE == '2D') then + PORTRAIT_WIDTH = ((UNIT_HEIGHT * TOP_MODIFIER) + (1 * TOP_MODIFIER)); + else + PORTRAIT_WIDTH = ((db.portrait.width * TOP_MODIFIER) + (1 * TOP_MODIFIER)); + end + end + if(frame.PortraitModel) then + frame.PortraitModel:Hide() + frame.PortraitModel:ClearAllPoints() end - - if(frame.Portrait) then - frame.Portrait:Hide() - frame.Portrait:ClearAllPoints() - end if(frame.PortraitTexture and frame.PortraitModel) then if(PORTRAIT_STYLE == '2D') then frame.Portrait = frame.PortraitTexture + PORTRAIT_GRIP = frame.PortraitTexture:GetParent(); else frame.PortraitModel.UserRotation = db.portrait.rotation; frame.PortraitModel.UserCamDistance = db.portrait.camDistanceScale; frame.Portrait = frame.PortraitModel + PORTRAIT_GRIP = frame.PortraitModel; end + else + PORTRAIT_GRIP = frame.Portrait; end - - PORTRAIT_GRIP = frame.Portrait; end local BUFF_GRIP = frame.Buffs; @@ -402,7 +407,7 @@ function MOD:RefreshUnitLayout(frame, template) MASTER_GRIP:ClearAllPoints(); MASTER_GRIP:ModPoint(TOP_ANCHOR1, frame, TOP_ANCHOR1, (1 * BOTTOM_MODIFIER), -1); - MASTER_GRIP:ModPoint(BOTTOM_ANCHOR1, frame, BOTTOM_ANCHOR1, PORTRAIT_WIDTH, POWER_HEIGHT); + MASTER_GRIP:ModPoint(BOTTOM_ANCHOR1, frame, BOTTOM_ANCHOR1, PORTRAIT_WIDTH, 1); if(frame.StatusPanel) then if(template ~= "player" and template ~= "pet" and template ~= "target" and template ~= "targettarget" and template ~= "focus" and template ~= "focustarget") then @@ -639,49 +644,25 @@ function MOD:RefreshUnitLayout(frame, template) --[[ PORTRAIT LAYOUT ]]-- if(PORTRAIT_GRIP) then - local portrait = frame.Portrait; - - if(PORTRAIT_ENABLED) then - PORTRAIT_GRIP:Show() + local PORTRAIT = frame.Portrait; + if(PORTRAIT and PORTRAIT_ENABLED) then if not frame:IsElementEnabled('Portrait')then frame:EnableElement('Portrait') end - PORTRAIT_GRIP:ClearAllPoints() + PORTRAIT_GRIP:SetAlpha(1) - + PORTRAIT_GRIP:ClearAllPoints() if(PORTRAIT_OVERLAY) then - if(PORTRAIT_STYLE == '3D') then - PORTRAIT_GRIP:SetFrameLevel(frame.ActionPanel:GetFrameLevel()) - PORTRAIT_GRIP:ForceUpdate() - elseif(PORTRAIT_STYLE == '2D') then - PORTRAIT_GRIP.anchor:SetFrameLevel(frame.ActionPanel:GetFrameLevel()) - end - - PORTRAIT_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, (1 * TOP_MODIFIER), -1) - PORTRAIT_GRIP:ModPoint(BOTTOM_ANCHOR2, frame, BOTTOM_ANCHOR2, (1 * BOTTOM_MODIFIER), 1) - - PORTRAIT_GRIP.Panel:Show() + PORTRAIT_GRIP:SetAllPoints(MASTER_GRIP) else - PORTRAIT_GRIP.Panel:Show() - if(PORTRAIT_STYLE == '3D') then - PORTRAIT_GRIP:SetFrameLevel(frame.ActionPanel:GetFrameLevel()) - PORTRAIT_GRIP:ForceUpdate() - elseif(PORTRAIT_STYLE == '2D') then - PORTRAIT_GRIP.anchor:SetFrameLevel(frame.ActionPanel:GetFrameLevel()) - end - - if(not POWER_ENABLED) then - PORTRAIT_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, (1 * TOP_MODIFIER), -1) - PORTRAIT_GRIP:ModPoint(BOTTOM_ANCHOR2, MASTER_GRIP, BOTTOM_ANCHOR1, (4 * BOTTOM_MODIFIER), 0) - else - PORTRAIT_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, (1 * TOP_MODIFIER), -1) - PORTRAIT_GRIP:ModPoint(BOTTOM_ANCHOR2, POWER_GRIP, BOTTOM_ANCHOR1, (4 * BOTTOM_MODIFIER), 0) - end + PORTRAIT_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, (1 * TOP_MODIFIER), -1) + PORTRAIT_GRIP:ModPoint(BOTTOM_ANCHOR2, MASTER_GRIP, BOTTOM_ANCHOR1, (1 * BOTTOM_MODIFIER), 1) end + PORTRAIT:ForceUpdate() + PORTRAIT_GRIP:Show() else PORTRAIT_GRIP:Hide() - PORTRAIT_GRIP.Panel:Hide() if frame:IsElementEnabled('Portrait') then frame:DisableElement('Portrait') diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.toc b/SVUI_UnitFrames/SVUI_UnitFrames.toc index f1f787d..30edb9f 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.toc +++ b/SVUI_UnitFrames/SVUI_UnitFrames.toc @@ -25,5 +25,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline SVUI_UnitFrames.xml diff --git a/SVUI_UnitFrames/elements/auras.lua b/SVUI_UnitFrames/elements/auras.lua index 2d9590b..9bf68ff 100644 --- a/SVUI_UnitFrames/elements/auras.lua +++ b/SVUI_UnitFrames/elements/auras.lua @@ -58,7 +58,7 @@ if(not MOD) then return end local oUF_SVUI = MOD.oUF assert(oUF_SVUI, "SVUI UnitFrames: unable to locate oUF.") -local DEFAULT_BUFFS_COLOR = {.2, .6, 1}; +local DEFAULT_BUFFS_COLOR = {0.04, 0.52, 0.95}; local BUFFS_COLOR = DEFAULT_BUFFS_COLOR; local DEFAULT_DEBUFFS_COLOR = {.9, 0, 0}; local DEBUFFS_COLOR = DEFAULT_DEBUFFS_COLOR; diff --git a/SVUI_UnitFrames/elements/essentials.lua b/SVUI_UnitFrames/elements/essentials.lua index c5af2e1..f2a3460 100644 --- a/SVUI_UnitFrames/elements/essentials.lua +++ b/SVUI_UnitFrames/elements/essentials.lua @@ -751,33 +751,24 @@ function MOD:CreatePortrait(frame,smallUnit,isPlayer) portrait3D:SetStyle("Frame", "UnitLarge") end - local overlay = CreateFrame("Frame",nil,portrait3D) - overlay:SetAllPoints(portrait3D.Panel) - overlay:SetFrameLevel(3) - portrait3D.overlay = overlay; portrait3D.UserRotation = 0; portrait3D.UserCamDistance = 1.3; -- 2D Portrait - local portrait2Danchor = CreateFrame('Frame',nil,frame) + local portrait2Danchor = CreateFrame('Frame', nil, frame) portrait2Danchor:SetFrameStrata("LOW") portrait2Danchor:SetFrameLevel(2) - local portrait2D = portrait2Danchor:CreateTexture(nil,'OVERLAY') - portrait2D:SetTexCoord(0.15,0.85,0.15,0.85) - portrait2D:SetAllPoints(portrait2Danchor) - portrait2D.anchor = portrait2Danchor; if smallUnit then - portrait2Danchor:SetStyle("!_Frame") + portrait2Danchor:SetStyle("Frame", "UnitSmall") else - portrait2Danchor:SetStyle("!_Frame") - end - portrait2D.Panel = portrait2Danchor.Panel; + portrait2Danchor:SetStyle("Frame", "UnitLarge") + end - local overlay = CreateFrame("Frame",nil,portrait2Danchor) - overlay:SetAllPoints(portrait2D.Panel) - overlay:SetFrameLevel(3) - portrait2D.overlay = overlay; + local portrait2D = portrait2Danchor:CreateTexture(nil,'OVERLAY') + portrait2D:InsetPoints(portrait2Danchor) + portrait2D:SetTexCoord(0.15,0.85,0.15,0.85) + portrait2D:SetBlendMode("ADD") -- Assign To Frame frame.PortraitModel = portrait3D; diff --git a/SVUI_UnitFrames/frames.lua b/SVUI_UnitFrames/frames.lua index a21f0af..5b52c43 100644 --- a/SVUI_UnitFrames/frames.lua +++ b/SVUI_UnitFrames/frames.lua @@ -97,19 +97,11 @@ local UpdateTargetGlow = function(self) if(UnitIsUnit(unit, "target")) then self.TargetGlow:Show() local reaction = UnitReaction(unit, "player") - if(UnitIsPlayer(unit)) then - local _, class = UnitClass(unit) - if class then - local colors = RAID_CLASS_COLORS[class] - self.TargetGlow:SetBackdropBorderColor(colors.r, colors.g, colors.b) - else - self.TargetGlow:SetBackdropBorderColor(1, 1, 1) - end - elseif(reaction) then + if(reaction) then local colors = FACTION_BAR_COLORS[reaction] self.TargetGlow:SetBackdropBorderColor(colors.r, colors.g, colors.b) else - self.TargetGlow:SetBackdropBorderColor(1, 1, 1) + self.TargetGlow:SetBackdropBorderColor(0.2, 1, 0.3) end else self.TargetGlow:Hide() diff --git a/SVUI_UnitFrames/groups.lua b/SVUI_UnitFrames/groups.lua index 00666eb..4f18d96 100644 --- a/SVUI_UnitFrames/groups.lua +++ b/SVUI_UnitFrames/groups.lua @@ -173,19 +173,11 @@ local UpdateTargetGlow = function(self) if(UnitIsUnit(unit, "target")) then self.TargetGlow:Show() local reaction = UnitReaction(unit, "player") - if(UnitIsPlayer(unit)) then - local _, class = UnitClass(unit) - if class then - local colors = RAID_CLASS_COLORS[class] - self.TargetGlow:SetBackdropBorderColor(colors.r, colors.g, colors.b) - else - self.TargetGlow:SetBackdropBorderColor(1, 1, 1) - end - elseif(reaction) then + if(reaction) then local colors = FACTION_BAR_COLORS[reaction] self.TargetGlow:SetBackdropBorderColor(colors.r, colors.g, colors.b) else - self.TargetGlow:SetBackdropBorderColor(1, 1, 1) + self.TargetGlow:SetBackdropBorderColor(0.2, 1, 0.3) end else self.TargetGlow:Hide() diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc b/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc index 1fbcad0..36dc5f1 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc @@ -29,5 +29,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_ActionPanel.lua \ No newline at end of file diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Afflicted/oUF_Afflicted.toc b/SVUI_UnitFrames/libs/Plugins/oUF_Afflicted/oUF_Afflicted.toc index f4f88ef..9a44571 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Afflicted/oUF_Afflicted.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Afflicted/oUF_Afflicted.toc @@ -29,5 +29,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_ActionPanel.lua \ No newline at end of file diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc b/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc index 38e1d5b..56d6b79 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.toc @@ -29,5 +29,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_AuraWatch.lua \ No newline at end of file diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_CombatFader/oUF_CombatFader.toc b/SVUI_UnitFrames/libs/Plugins/oUF_CombatFader/oUF_CombatFader.toc index 40eb460..630b92c 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_CombatFader/oUF_CombatFader.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_CombatFader/oUF_CombatFader.toc @@ -28,5 +28,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_CombatFader.lua \ No newline at end of file diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.toc b/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.toc index 242320a..e08bbb1 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Druidness/oUF_Druidness.toc @@ -29,6 +29,10 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_Druidness.lua diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Experience/oUF_Experience.toc b/SVUI_UnitFrames/libs/Plugins/oUF_Experience/oUF_Experience.toc index 9b01252..a31c0a0 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Experience/oUF_Experience.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Experience/oUF_Experience.toc @@ -28,5 +28,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_Experience.lua diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Friendship/oUF_Friendship.toc b/SVUI_UnitFrames/libs/Plugins/oUF_Friendship/oUF_Friendship.toc index cfb20b4..94ed976 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Friendship/oUF_Friendship.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Friendship/oUF_Friendship.toc @@ -28,5 +28,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_Friendship.lua diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.toc b/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.toc index 26ead53..379b95f 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Gladiator/oUF_Gladiator.toc @@ -29,5 +29,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_Gladiator.lua \ No newline at end of file diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_MageMagic/oUF_MageMagic.toc b/SVUI_UnitFrames/libs/Plugins/oUF_MageMagic/oUF_MageMagic.toc index 486100f..ec7c84c 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_MageMagic/oUF_MageMagic.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_MageMagic/oUF_MageMagic.toc @@ -28,5 +28,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_MageMagic.lua \ No newline at end of file diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_RaidDebuffs/oUF_RaidDebuffs.toc b/SVUI_UnitFrames/libs/Plugins/oUF_RaidDebuffs/oUF_RaidDebuffs.toc index f764c09..1c17371 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_RaidDebuffs/oUF_RaidDebuffs.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_RaidDebuffs/oUF_RaidDebuffs.toc @@ -27,5 +27,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_RaidDebuffs.lua diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_Reputation/oUF_Reputation.toc b/SVUI_UnitFrames/libs/Plugins/oUF_Reputation/oUF_Reputation.toc index 21fe146..be07f0a 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_Reputation/oUF_Reputation.toc +++ b/SVUI_UnitFrames/libs/Plugins/oUF_Reputation/oUF_Reputation.toc @@ -28,5 +28,9 @@ ## X-Curse-Project-Name: SuperVillain UI: UnitFrames ## X-Curse-Project-ID: supervillain-ui-unitframes ## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline +## X-Curse-Packaged-Version: r20150306005506 +## X-Curse-Project-Name: SuperVillain UI: UnitFrames +## X-Curse-Project-ID: supervillain-ui-unitframes +## X-Curse-Repository-ID: wow/supervillain-ui-unitframes/mainline oUF_Reputation.lua