Commit c6783cd4 authored by Merathilis's avatar Merathilis

Merge branch 'development'

parents f4e78a15 174dbdf5
[b][color=orange]v3.35[/color], 29.08.2018[/b][list]
[*]Skin extra CharacterStatsPane from S&L Armory Mode.
[*]Updated LocPanel & MicroBar combat hide options.
[*]Show/hide the bags if the ScrappingMachine Frame is shown. Thx Whiro
[*]Fix a possible error if the panels table doesn't exist. Thx Whiro
[*]Added BfA Augementation Rune to the RaidBuffs.
[*]A lot of skin updates.[/list]
[b][color=orange]v3.34[/color], 22.08.2018[/b][list]
[*]Fixed an issue that the Changelog wasn't showing on version bumb.
[*]Added the option back to hide the Coords on the LocPanel.
[*]Ajust some DataTexts in my install.
[*]Add some frames to the E.FrameLocks. This will hide correctly some frames in Pet Battles.
[*]Some skin adjustments.
[*]Some skin adjustments.[/list]
[b][color=orange]v3.33[/color], 20.08.2018[/b][list]
[*]Update EFL.
......
** v3.35, 29.08.2018**
* Skin extra CharacterStatsPane from S&L Armory Mode.
* Updated LocPanel & MicroBar combat hide options.
* Show/hide the bags if the ScrappingMachine Frame is shown. Thx Whiro
* Fix a possible error if the panels table doesn't exist. Thx Whiro
* Added BfA Augementation Rune to the RaidBuffs.
* A lot of skin updates.
** v3.34, 22.08.2018**
* Fixed an issue that the Changelog wasn't showing on version bumb.
* Added the option back to hide the Coords on the LocPanel.
......
## Interface: 80000
## Author: Merathilis
## Credits: Benik, Blazeflack, Azilroka, Simpy, Whiro, Darth Predator, fgprodigal, Elv & all AddOn Authors who inspired me.
## Version: 3.34
## Version: 3.35
## Title: |cFF00c0faElvUI|r |cffff7d0aMerathilisUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -11,7 +11,7 @@
## SavedVariablesPerCharacter: MERDataPerChar
## OptionalDeps: SharedMedia, AddOnSkins, BigWigs, ls_Toasts
## X-ElvVersion: 10.79
## X-Curse-Packaged-Version: 3.34
## X-Curse-Packaged-Version: 3.35
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -17,17 +17,16 @@ local CLOSE = CLOSE
local ChangeLogData = {
"Changes:",
"• Fixed an issue that the Changelog wasn't showing on version bumb.",
"• Added the option back to hide the Coords on the LocPanel.",
"• Ajust some DataTexts in my install.",
"• Add some frames to the E.FrameLocks. This will hide correctly some frames in ",
" Pet Battles.",
"• Some skin adjustments.",
"• Skin extra CharacterStatsPane from S&L Armory Mode.",
"• Updated LocPanel & MicroBar combat hide options.",
"• Show/hide the bags if the ScrappingMachine Frame is shown. Thx Whiro",
"• Fix a possible error if the panels table doesn't exist. Thx Whiro",
"• Added BfA Augementation Rune to the RaidBuffs.",
"• A lot of skin updates.",
-- "• ''",
" ",
"Notes:",
"• Disabled the DBM skin for now, since it caused some lua errors.",
-- "• ''",
}
......
......@@ -1378,15 +1378,7 @@ function MER:SetupDts()
E.db["datatexts"]["minimapBottom"] = false
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].left = "BfA Missions"
if IsAddOnLoaded("Skada") then
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].middle = "Skada"
elseif IsAddOnLoaded("REKeys") then
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].middle = "REKeys"
elseif IsAddOnLoaded("Details") then
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].middle = "Details"
else
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].middle = "Quick Join"
end
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].middle = "Durability"
if IsAddOnLoaded("ElvUI_SLE") then
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].right = "S&L Currency"
......@@ -1394,9 +1386,9 @@ function MER:SetupDts()
E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"].right = "Gold"
end
E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["left"] = "MUI Professions"
E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["left"] = "Guild"
E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["middle"] = "MUI System"
E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["right"] = "Durability"
E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["right"] = "Friends"
-- define the default ElvUI datatexts
E.db["datatexts"]["panels"]["LeftChatDataPanel"]["left"] = ""
......
......@@ -404,7 +404,7 @@ function MERL:ShadowOverlay()
end
function MERL:ChatButtonHolder()
if E.private.chat.enable ~= true or E.db.mui.chat.sidePanel ~= true then return end
if E.private.chat.enable ~= true or E.db.mui.chat.sidePanel then return end
local ChatButtonHolder = _G["ChatButtonHolder"]
......
......@@ -322,6 +322,8 @@ L["Garrison/OrderHall Buttons Style"] = "Garnision/Ordenshallen Tasten Style"
L["Change the look of the Orderhall/Garrison Button"] = "Ändert das Aussehen der Garnision/Ordenshallen Taste"
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = "Zeigt den Namen von dem Spieler der auf der Minikarte gepingt hat."
L["Blinking Minimap"] = "Blinkende Minikarte"
L["Enable the blinking animation for new mail or pending invites."] = "Aktiviert die blinkende Animation für Neue Post oder austehende Kalendereinladungen."
-- Raid Marks
L["Raid Markers"] = "Schlachtzugs-Markierungen"
......
......@@ -321,6 +321,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
-- Raid Marks
L["Raid Markers"] = true
......
......@@ -310,6 +310,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
-- Raid Marks
L["Raid Markers"] = true
......
......@@ -310,6 +310,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
-- Raid Marks
L["Raid Markers"] = true
......
......@@ -310,6 +310,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
--Raid Marks
L["Raid Markers"] = true
......
......@@ -310,6 +310,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
-- Raid Marks
L["Raid Markers"] = true
......
......@@ -310,6 +310,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
-- Raid Marks
L["Raid Markers"] = true
......
......@@ -310,6 +310,8 @@ L["Garrison/OrderHall Buttons Style"] = true
L["Change the look of the Orderhall/Garrison Button"] = true
L["Minimap Ping"] = true
L["Shows the name of the player who pinged on the Minimap."] = true
L["Blinking Minimap"] = true
L["Enable the blinking animation for new mail or pending invites."] = true
--Raid Marks
L["Raid Markers"] = true
......
......@@ -101,6 +101,16 @@ function MAB:StyleBackdrops()
frame.backdrop:Styling()
end
end
-- Pet Buttons
for i = 1, NUM_PET_ACTION_SLOTS do
local petButtons = {_G['PetActionButton'..i]}
for _, button in pairs(petButtons) do
if button.backdrop then
button.backdrop:Styling()
end
end
end
end
-- Code taken from CleanBossButton
......
......@@ -23,6 +23,8 @@ local C_GarrisonIsPlayerInGarrison = C_Garrison.IsPlayerInGarrison
--Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS:
local microBar
local DELAY = 15
local elapsed = DELAY - 5
......@@ -459,18 +461,22 @@ function MB:Toggle()
end
function MB:PLAYER_REGEN_DISABLED()
if MB.db.hideInCombat then microBar:Hide() end
if MB.db.hideInCombat == true then microBar:SetAlpha(0) end
end
function MB:PLAYER_REGEN_ENABLED()
if MB.db.enable then microBar:Show() end
if MB.db.enable then microBar:SetAlpha(1) end
end
function MB:UNIT_AURA(event, unit)
function MB:UNIT_AURA(_, unit)
if unit ~= "player" then return end
if MB.db.enable and MB.db.hideInOrderHall then
local inOrderHall = C_GarrisonIsPlayerInGarrison(LE_GARRISON_TYPE_7_0)
microBar:SetShown(not inOrderHall)
if inOrderHall then
microBar:SetAlpha(0)
else
microBar:SetAlpha(1)
end
end
end
......@@ -481,12 +487,6 @@ function MB:Initialize()
MB:CreateMicroBar()
MB:Toggle()
function MB:ForUpdateAll()
MB.db = E.db.mui.actionbars.microBar
MB:CreateMicroBar()
MB:Toggle()
end
MB:RegisterEvent("PLAYER_REGEN_DISABLED")
MB:RegisterEvent("PLAYER_REGEN_ENABLED")
MB:RegisterEvent("UNIT_AURA")
......
......@@ -66,14 +66,14 @@ local function abTable()
type = "group",
name = MER:cOption(L["Micro Bar"]),
guiInline = true,
get = function(info) return E.db.mui.actionbars.microBar[ info[#info] ] end,
set = function(info, value) E.db.mui.actionbars.microBar[ info[#info] ] = value; E:StaticPopup_Show("PRIVATE_RL");end,
args = {
enable = {
order = 1,
type = "toggle",
name = L["Enable"],
disabled = function() return not E.private.actionbar.enable end,
get = function(info) return E.db.mui.actionbars.microBar.enable end,
set = function(info, value) E.db.mui.actionbars.microBar.enable = value; E:StaticPopup_Show("PRIVATE_RL"); end,
width = "full",
},
scale = {
......
......@@ -15,6 +15,8 @@ local NONE = NONE
function MER:LoadDataTexts()
local db = E.db.mui.datatexts
if not db.panels then return end
for panelName, panel in pairs(DT.RegisteredPanels) do
for i=1, panel.numPoints do
local pointIndex = DT.PointLocation[i]
......
......@@ -623,18 +623,22 @@ function LP:CHAT_MSG_SKILL()
end
function LP:PLAYER_REGEN_DISABLED()
if LP.db.combathide then loc_panel:Hide() end
if LP.db.combathide then loc_panel:SetAlpha(0) end
end
function LP:PLAYER_REGEN_ENABLED()
if LP.db.enable then loc_panel:Show() end
if LP.db.enable then loc_panel:SetAlpha(1) end
end
function LP:UNIT_AURA(_, unit)
if unit ~= "player" then return end
if LP.db.enable and LP.db.orderhallhide then
local inOrderHall = C_GarrisonIsPlayerInGarrison(LE_GARRISON_TYPE_7_0)
loc_panel:SetShown(not inOrderHall);
if inOrderHall then
loc_panel:SetAlpha(0)
else
loc_panel:SetAlpha(1)
end
end
end
......@@ -650,14 +654,6 @@ function LP:Initialize()
LP:Fonts()
LP:Toggle()
function LP:ForUpdateAll()
LP.db = E.db.mui.locPanel
LP:Resize()
LP:Template()
LP:Fonts()
LP:Toggle()
end
LP:RegisterEvent("PLAYER_REGEN_DISABLED")
LP:RegisterEvent("PLAYER_REGEN_ENABLED")
LP:RegisterEvent("UNIT_AURA")
......
......@@ -137,11 +137,13 @@ function MM:Initialize()
self:ButtonCollectorInit()
self:MiniMapPing()
self:RegisterEvent("CALENDAR_UPDATE_PENDING_INVITES", "CheckMail")
self:RegisterEvent("UPDATE_PENDING_MAIL", "CheckMail")
self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckMail")
self:HookScript(_G["MiniMapMailFrame"], "OnHide", "CheckMail")
self:HookScript(_G["MiniMapMailFrame"], "OnShow", "CheckMail")
if E.db.mui.maps.minimap.flash then
self:RegisterEvent("CALENDAR_UPDATE_PENDING_INVITES", "CheckMail")
self:RegisterEvent("UPDATE_PENDING_MAIL", "CheckMail")
self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckMail")
self:HookScript(_G["MiniMapMailFrame"], "OnHide", "CheckMail")
self:HookScript(_G["MiniMapMailFrame"], "OnShow", "CheckMail")
end
end
local function InitializeCallback()
......
......@@ -27,6 +27,12 @@ local function Minimap()
name = L["Garrison/OrderHall Buttons Style"],
desc = L["Change the look of the Orderhall/Garrison Button"],
},
flash = {
order = 2,
type = "toggle",
name = L["Blinking Minimap"],
desc = L["Enable the blinking animation for new mail or pending invites."],
},
},
},
ping = {
......
......@@ -65,26 +65,95 @@ MER.PEPE = {
}
--[[
4 - walk
5 - run
26 - attack stance
40 - falling loop
52 - casting loop
55 - roar pose (paused)
60 - chat normal
64 - chat exclaimation
65 - chat shrug
69 - dance
74 - roar
111 - attack ready
119 - stealth walk
120 - stealth standing loop
125 - spell2
138 - craft loop
141 - kneel loop
203 - cannibalize
225 - cower loop
0 = idle
1 = death
3 = stop
4 = fast walk
5 = run
8 = take a light hit
9 = take a medium hit
10 = take a heavy hit
11-12 = turning
13 = backing up
14 = stunned
26 = attack stance
43 = swimming
55 - roar (non-loop)
56 - idle
57 - special attack 1H
58 - special attack 2H
60 = chat
61 = eat
62 = mine ore
63 = combine tradeskill
64 - talk_exclamation
65 - shrug
66 = bow
67 = wave
68 = cheer
69 = dance
70 = laugh
71 - sleep, lie
72 - idle
73 = rude
74 = roar
75 = kneel
76 = kiss
77 = cry
78 = chicken
79 - beg, grovel
80 = applaud
81 = shout
82 = flex
83 = flirt
84 = point
87 - shield bash
89 - sheathe/unsheathe from back
90 - sheath/unsheathe from waist
91 - sitting on a mount
92 - idle
93 - idle
94 - idle
95 - kick (non-loop)
96 - sit
97 = sit
98 - stop
99 - sleep, lie
100 - sleep, lie
101 = get up
103 - sitting on mount
104 - sitting on chair
105 - nocking bow with arrow
107 - fishing cast
109 - attack idle with bow
110 - attack idle with gun or crossbow
113 = salute
114 - kneel
115 - kneel
116 - stand from kneeling
117 - shield bash
118 - special attack 1H
119 = crouching run
120 = crouch
121 - knockdown
122 - idle
123 - crafting (loop)
124 = channel spell
125 = channel spell
126 = spin
127 - idle
128 - crafting (non-loop)
129 - stop
130 - idle
131 - drown
132 - drowned
133 - fishing
134 - fishing loop
135 - swimming loop
136 - mining, blacksmith crafting
137 = stunned
]]--
local Sequences = {26, 52, 69, 111, 225}
local function Player_Model(self)
......
......@@ -101,15 +101,6 @@ function MI:LoadMisc()
end
end)
-- Always show the Text on the PlayerPowerBarAlt
_G["PlayerPowerBarAlt"]:HookScript("OnShow", function()
local statusFrame = _G["PlayerPowerBarAlt"].statusFrame
if statusFrame.enabled then
statusFrame:Show()
UnitPowerBarAltStatus_UpdateText(statusFrame)
end
end)
-- Try to fix JoinBattleField taint
CreateFrame("Frame"):SetScript("OnUpdate", function(self, elapsed)
if LFRBrowseFrame.timeToClear then
......
......@@ -42,6 +42,7 @@ RB.ReminderBuffs = {
},
DefiledAugmentRune = {
224001, -- Defiled Augumentation (15 primary stat)
270058, -- Battle Scarred Augmentation (60 primary stat)
},
Food = {
104280, -- Well Fed
......
......@@ -8,6 +8,8 @@ local _G = _G
local pairs, select, unpack = pairs, select, unpack
-- WoW API
local CreateFrame = CreateFrame
local GetItemInfo = GetItemInfo
local GetItemQualityColor = GetItemQualityColor
-- Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS: hooksecurefunc
......@@ -26,7 +28,6 @@ local function styleBMAH()
BlackMarketFrame:Styling()
MERS:CreateBG(BlackMarketFrame.HotDeal.Item)
BlackMarketFrame.HotDeal.Item._mUIIconBorder = MERS:ReskinIcon(BlackMarketFrame.HotDeal.Item.IconTexture)
local headers = {"ColumnName", "ColumnLevel", "ColumnType", "ColumnDuration", "ColumnHighBidder", "ColumnCurrentBid"}
for _, headerName in pairs(headers) do
......@@ -49,6 +50,7 @@ local function styleBMAH()
for i = 1, #buttons do
local bu = buttons[i]
bu.Item.IconTexture:SetTexCoord(unpack(E.TexCoords))
if not bu.reskinned then
bu.Left:Hide()
bu.Right:Hide()
......@@ -56,7 +58,8 @@ local function styleBMAH()
bu.Item:SetNormalTexture("")
bu.Item:SetPushedTexture("")
bu.Item._mUIIconBorder = MERS:ReskinIcon(bu.Item.IconTexture)
bu.Item:GetHighlightTexture():SetColorTexture(1, 1, 1, .25)
bu.Item.IconBorder:SetAlpha(0)
local bg = CreateFrame("Frame", nil, bu)
bg:SetPoint("TOPLEFT")
......@@ -85,7 +88,21 @@ local function styleBMAH()
bu.reskinned = true
end
if bu:IsShown() and bu.itemLink then
local _, _, quality = GetItemInfo(bu.itemLink)
bu.Name:SetTextColor(GetItemQualityColor(quality))
end
end
end)
hooksecurefunc("BlackMarketFrame_UpdateHotItem", function(self)
local hotDeal = self.HotDeal
if hotDeal:IsShown() and hotDeal.itemLink then
local _, _, quality = GetItemInfo(hotDeal.itemLink)
hotDeal.Name:SetTextColor(GetItemQualityColor(quality))
end
hotDeal.Item.IconBorder:Hide()
end)
end
......
local MER, E, L, V, P, G = unpack(select(2, ...))
local MERS = E:GetModule("muiSkins")
local S = E:GetModule("Skins")
-- Cache global variables
-- Lua functions
local _G = _G
local select = select
-- WoW API
-- Global variables that we don't cache, list them here for the mikk's Find Globals script
-- GLOBALS:
local function styleDebugTools()
if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.debug ~= true or E.private.muiSkins.blizzard.debug ~= true then return end
local r, g, b = MER.ClassColor.r, MER.ClassColor.g, MER.ClassColor.b
local EventTraceFrame = _G["EventTraceFrame"]
EventTraceFrame:Styling()
-- Table Attribute Display
local function reskinTableAttribute(frame)
frame:Styling()
end
reskinTableAttribute(TableAttributeDisplay)
hooksecurefunc(TableInspectorMixin, "InspectTable", function(self)
reskinTableAttribute(self)
end)
end
S:AddCallbackForAddon("Blizzard_DebugTools", "mUIDebugTools", styleDebugTools)
\ No newline at end of file
......@@ -16,6 +16,8 @@ local function styleIslands()
local IslandsQueueFrame = _G["IslandsQueueFrame"]
IslandsQueueFrame:Styling()
IslandsQueueFrame.HelpButton:Hide()
end
S:AddCallbackForAddon("Blizzard_IslandsQueueUI", "mUIIslands", styleIslands)
\ No newline at end of file
local MER, E, L, V, P, G = unpack(select(2, ...))
local MERS = E:GetModule("muiSkins")
local S = E:GetModule("Skins")
local B = E:GetModule('Bags')
--Cache global variables
--Lua functions
......@@ -11,11 +12,27 @@ local _G = _G
--Global variables that we don't cache, list them here for mikk's FindGlobals script
-- GLOBALS:
local weShown = false;