Verified Commit 71669c8e authored by Merathilis's avatar Merathilis

Merge branch 'development' into beta

parents 0ea9f2a4 d3b0f5fc
[b][color=orange]v4.62 for Shadowland PrePatch[/color], 03.11.2020[/b][list]
[*]Fixed an install whoopsi
[*]Small code updates
[*]Added Deezyl to the Patreon list <3[/list]
[b][color=orange]v4.61 for Shadowland PrePatch[/color], 02.11.2020[/b][list]
[*]Changed the option layout a bit
[*]Style the LocationPanel again
......@@ -8,7 +14,7 @@
[*]MicroBar: Added 2 new Buttons: Professions & Volume
[*]MicroBar: Fixed an issue on initial load with Heartstones
[*]Prevent errors on AFK Mode (hopefully)
[*]Added: Patrons & Donator List to: Information
[*]Added: Patrons & Donator List to: Information[/list]
[b][color=orange]v4.60 for Shadowland PrePatch[/color], 24.10.2020[/b][list]
......
** v4.62 for Shadowland Pre-Patch, 03.11.2020**
* Fixed an install whoopsi
* Small code updates
* Added Deezyl to the Patreon list <3
** v4.61 for Shadowland Pre-Patch, 02.11.2020**
* Changed the option layout a bit
* Style the LocationPanel again
......
......@@ -16,16 +16,9 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
local ChangeLogData = {
"Changes:",
"• Changed the option layout a bit",
"• Style the LocationPanel again",
"• Fixed Paragon Reputation Notification",
"• Updated deDE locales from Dlarge & Rav",
"• Updated the Rectangle Minimap Code -- Credits: Windtools",
"• Updated/Fixed some skins",
"• MicroBar: Added 2 new Buttons: Professions & Volume",
"• MicroBar: Fixed an issue on initial load with Heartstones",
"• Prevent errors on AFK Mode (hopefully)",
"• Added: Patrons & Donator List to: Information",
"• Fixed an install whoopsi",
"• Small code updates",
"• Added Deezyl to the Patreon list <3",
-- "• ''",
" ",
......
......@@ -28,6 +28,7 @@ local DONATOR_STRING = tconcat(DONATORS, ", ")
local PATRONS = {
'Graldur',
'Deezyl',
}
tsort(PATRONS, function(a, b) return E:StripString(a) < E:StripString(b) end)
local PATRONS_STRING = tconcat(PATRONS, ", ")
......
......@@ -698,11 +698,11 @@ function MER:SetupLayout(layout)
E.db["mui"]["pvp"]["duels"]["regular"] = true
E.db["mui"]["pvp"]["duels"]["pet"] = true
E.db["mui"]["pvp"]["duels"]["announce"] = true
E.db["mui"]["maps"]["minimap"]["rectangle"]["enable"] = true
E.db["mui"]["maps"]["minimap"]["rectangleMinimap"]["enable"] = true
E.db["general"]["cropIcon"] = 0
else
E.db["general"]["cropIcon"] = 2
E.db["mui"]["maps"]["minimap"]["rectangle"]["enable"] = false
E.db["mui"]["maps"]["minimap"]["rectangleMinimap"]["enable"] = false
end
E.db["movers"]["MER_SpecializationBarMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-2,14"
......
## Interface: 90001
## Author: Merathilis
## Version: 4.61
## Version: 4.62
## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|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 @@
## OptionalDeps: SharedMedia, BigWigs, ls_Toasts
## X-Credits: Benik, Blazeflack, Azilroka, Simpy, NihilisticPandemonium, Darth Predator, fgprodigal, siweia, Solor, Elv, fang2hou & all AddOn Authors who inspired me.
## X-ElvVersion: 12.08
## X-Curse-Packaged-Version: 4.61
## X-Curse-Packaged-Version: 4.62
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
......@@ -415,7 +415,7 @@ local ButtonTypes = {
local vol = C_CVar_GetCVar("Sound_MasterVolume")
vol = vol and tonumber(vol) or 0
DT.tooltip:ClearLines()
DT.tooltip:SetText(L["Volume"] .. format(": %d%%", vol))
DT.tooltip:SetText(L["Volume"] .. format(": %d%%", vol * 100))
DT.tooltip:AddLine("\n")
DT.tooltip:AddLine(LeftButtonIcon .. " " .. L["Increase the volume"] .. " (+10%)", 1, 1, 1)
DT.tooltip:AddLine(RightButtonIcon .. " " .. L["Decrease the volume"] .. " (-10%)", 1, 1, 1)
......
......@@ -221,8 +221,8 @@ function module:GameMenu()
GameMenuFrame.MUIbottomPanel = CreateFrame("Frame", nil, GameMenuFrame, 'BackdropTemplate')
local bottomPanel = GameMenuFrame.MUIbottomPanel
bottomPanel:SetFrameLevel(0)
bottomPanel:SetPoint("BOTTOM", E.UIParent, "BOTTOM", 0, -E.Border)
bottomPanel:SetWidth(GetScreenWidth() + (E.Border*2))
bottomPanel:Point("BOTTOM", E.UIParent, "BOTTOM", 0, -E.Border)
bottomPanel:Width(GetScreenWidth() + (E.Border*2))
MERS:CreateBD(bottomPanel, .5)
bottomPanel:Styling()
......@@ -236,12 +236,12 @@ function module:GameMenu()
bottomPanel.anim.height:SetDuration(0.6)
bottomPanel:SetScript("OnShow", function(self)
self:SetHeight(0)
self:Height(0)
self.anim.height:Play()
end)
bottomPanel.Logo = bottomPanel:CreateTexture(nil, "ARTWORK")
bottomPanel.Logo:SetSize(150, 150)
bottomPanel.Logo:Size(150)
bottomPanel.Logo:SetPoint("CENTER", bottomPanel, "CENTER", 0, 0)
bottomPanel.Logo:SetTexture(logo)
end
......@@ -250,8 +250,8 @@ function module:GameMenu()
GameMenuFrame.MUItopPanel = CreateFrame("Frame", nil, GameMenuFrame, 'BackdropTemplate')
local topPanel = GameMenuFrame.MUItopPanel
topPanel:SetFrameLevel(0)
topPanel:SetPoint("TOP", E.UIParent, "TOP", 0, 0)
topPanel:SetWidth(GetScreenWidth() + (E.Border*2))
topPanel:Point("TOP", E.UIParent, "TOP", 0, 0)
topPanel:Width(GetScreenWidth() + (E.Border*2))
MERS:CreateBD(topPanel, .5)
topPanel:Styling()
......@@ -265,50 +265,50 @@ function module:GameMenu()
topPanel.anim.height:SetDuration(0.6)
topPanel:SetScript("OnShow", function(self)
self:SetHeight(0)
self:Height(0)
self.anim.height:Play()
end)
topPanel.factionLogo = topPanel:CreateTexture(nil, "ARTWORK")
topPanel.factionLogo:SetPoint("CENTER", topPanel, "CENTER", 0, 0)
topPanel.factionLogo:SetSize(256, 250)
topPanel.factionLogo:Point("CENTER", topPanel, "CENTER", 0, 0)
topPanel.factionLogo:Size(256, 250)
topPanel.factionLogo:SetTexture("Interface\\AddOns\\ElvUI_MerathilisUI\\media\\textures\\classIcons\\CLASS-"..E.myclass)
end
-- Use this frame to control the position of the model - taken from ElvUI
if not modelHolder then
local modelHolder = CreateFrame("Frame", nil, GameMenuFrame)
modelHolder:SetSize(150, 150)
modelHolder:SetPoint("RIGHT", GameMenuFrame, "LEFT", -300, 0)
if not GameMenuFrame.modelHolder then
GameMenuFrame.modelHolder = CreateFrame("Frame", nil, GameMenuFrame)
GameMenuFrame.modelHolder:Size(150)
GameMenuFrame.modelHolder:SetPoint("RIGHT", GameMenuFrame, "LEFT", -300, 0)
playerModel = CreateFrame("PlayerModel", nil, modelHolder)
playerModel:SetPoint("CENTER", modelHolder, "CENTER")
local playerModel = CreateFrame("PlayerModel", nil, GameMenuFrame.modelHolder)
playerModel:Point("CENTER", GameMenuFrame.modelHolder, "CENTER")
playerModel:SetScript("OnShow", Player_Model)
playerModel.isIdle = nil
playerModel:SetSize(GetScreenWidth() * 2, GetScreenHeight() * 2) --YES, double screen size. This prevents clipping of models.
playerModel:Size(GetScreenWidth() * 2, GetScreenHeight() * 2) --YES, double screen size. This prevents clipping of models.
playerModel:Show()
end
if not npcHolder then
local npcHolder = CreateFrame("Frame", nil, GameMenuFrame)
npcHolder:SetSize(150, 150)
npcHolder:SetPoint("LEFT", GameMenuFrame, "RIGHT", 300, 0)
if not GameMenuFrame.npcHolder then
GameMenuFrame.npcHolder = CreateFrame("Frame", nil, GameMenuFrame)
GameMenuFrame.npcHolder:SetSize(150, 150)
GameMenuFrame.npcHolder:SetPoint("LEFT", GameMenuFrame, "RIGHT", 300, 0)
npcModel = CreateFrame("PlayerModel", nil, npcHolder)
npcModel:SetPoint("CENTER", npcHolder, "CENTER")
local npcModel = CreateFrame("PlayerModel", nil, GameMenuFrame.npcHolder)
npcModel:Point("CENTER", GameMenuFrame.npcHolder, "CENTER")
npcModel:SetScript("OnShow", NPC_Model)
npcModel.isIdle = nil
npcModel:SetSize(256, 256)
npcModel:Size(256)
npcModel:Show()
end
if not pepeHolder then
local pepeHolder = CreateFrame("Frame", nil, GameMenuFrame)
pepeHolder:SetSize(150, 150)
pepeHolder:SetPoint("BOTTOM", GameMenuFrame, "TOP", 0, -50)
if not GameMenuFrame.pepeHolder then
GameMenuFrame.pepeHolder = CreateFrame("Frame", nil, GameMenuFrame)
GameMenuFrame.pepeHolder:Size(150)
GameMenuFrame.pepeHolder:SetPoint("BOTTOM", GameMenuFrame, "TOP", 0, -50)
pepeModel = CreateFrame("PlayerModel", nil, pepeHolder)
pepeModel:SetPoint("CENTER", pepeHolder, "CENTER")
local pepeModel = CreateFrame("PlayerModel", nil, GameMenuFrame.pepeHolder)
pepeModel:Point("CENTER", GameMenuFrame.pepeHolder, "CENTER")
pepeModel:SetScript("OnShow", Pepe_Model)
pepeModel.isIdle = nil
pepeModel:Show()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment