Merge tag 'v1.08-Beta' into develop

v1.08-Beta
This commit is contained in:
Sumsebrum 2021-05-22 14:25:00 +02:00
commit a9a1a77dd3
7 changed files with 54 additions and 10 deletions

View File

@ -25,7 +25,7 @@ local MAJOR, MINOR = "Gladdy", 4
local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
local L local L
Gladdy.version_major_num = 1 Gladdy.version_major_num = 1
Gladdy.version_minor_num = 0.07 Gladdy.version_minor_num = 0.08
Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
Gladdy.version_releaseType = RELEASE_TYPES.beta Gladdy.version_releaseType = RELEASE_TYPES.beta
Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType

View File

@ -1,6 +1,6 @@
## Interface: 20501 ## Interface: 20501
## Title: Gladdy - TBC ## Title: Gladdy - TBC
## Version: 1.07-Beta ## Version: 1.08-Beta
## Notes: The most powerful arena AddOn for WoW 2.5.1 ## Notes: The most powerful arena AddOn for WoW 2.5.1
## Author: XiconQoo, DnB_Junkee, Knall ## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751 ## X-Email: contact me on discord Knall#1751

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -34,12 +34,41 @@ function XiconProfiles:ApplyClassic()
Gladdy:ToggleFrame(3) Gladdy:ToggleFrame(3)
end end
function XiconProfiles:ApplyBlizz()
local deserialized = Gladdy.modules["ExportImport"]:Decode(Gladdy:GetBlizzardProfile())
if deserialized then
Gladdy.modules["ExportImport"]:ApplyImport(deserialized, Gladdy.db)
end
Gladdy:Reset()
Gladdy:HideFrame()
Gladdy:ToggleFrame(3)
end
function XiconProfiles:GetOptions() function XiconProfiles:GetOptions()
return { return {
headerProfileBlizzard = {
type = "header",
name = L["Blizzard Profile"],
order = 2,
},
blizzardProfile = {
type = "execute",
func = function()
Gladdy.dbi:ResetProfile(Gladdy.dbi:GetCurrentProfile())
XiconProfiles:ApplyBlizz()
end,
name = " ",
desc = "Blizzard Profile",
image = "Interface\\AddOns\\Gladdy\\Images\\BasicProfiles\\Blizz1.blp",
imageWidth = 350,
imageHeight = 175,
width = "full",
order = 3,
},
headerProfileClassic = { headerProfileClassic = {
type = "header", type = "header",
name = L["Classic Profile"], name = L["Classic Profile"],
order = 2, order = 4,
}, },
classicProfile = { classicProfile = {
type = "execute", type = "execute",
@ -53,12 +82,12 @@ function XiconProfiles:GetOptions()
imageWidth = 350, imageWidth = 350,
imageHeight = 175, imageHeight = 175,
width = "full", width = "full",
order = 3, order = 5,
}, },
headerProfileKnall = { headerProfileKnall = {
type = "header", type = "header",
name = L["Knall's Profile"], name = L["Knall's Profile"],
order = 4, order = 6,
}, },
knallProfile = { knallProfile = {
type = "execute", type = "execute",
@ -72,12 +101,12 @@ function XiconProfiles:GetOptions()
imageWidth = 350, imageWidth = 350,
imageHeight = 175, imageHeight = 175,
width = "full", width = "full",
order = 5, order = 7,
}, },
headerProfileKlimp = { headerProfileKlimp = {
type = "header", type = "header",
name = L["Klimp's Profile"], name = L["Klimp's Profile"],
order = 6, order = 8,
}, },
klimpProfiles = { klimpProfiles = {
type = "execute", type = "execute",
@ -91,7 +120,8 @@ function XiconProfiles:GetOptions()
name = " ", name = " ",
desc = "Klimp's Profile", desc = "Klimp's Profile",
width = "full", width = "full",
order = 7, order = 9,
}, },
} }
end end

View File

@ -502,6 +502,7 @@ function Gladdy:SetupOptions()
local g = Gladdy.db.cooldownBorderColor local g = Gladdy.db.cooldownBorderColor
local h = Gladdy.db.drBorderColor local h = Gladdy.db.drBorderColor
local i = Gladdy.db.trinketBorderColor local i = Gladdy.db.trinketBorderColor
local j = Gladdy.db.racialBorderColor
if (a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a if (a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a
and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a and a.r == c.r and a.g == c.g and a.b == c.b and a.a == c.a
and a.r == d.r and a.g == d.g and a.b == d.b and a.a == d.a and a.r == d.r and a.g == d.g and a.b == d.b and a.a == d.a
@ -509,7 +510,8 @@ function Gladdy:SetupOptions()
and a.r == f.r and a.g == f.g and a.b == f.b and a.a == f.a and a.r == f.r and a.g == f.g and a.b == f.b and a.a == f.a
and a.r == g.r and a.g == g.g and a.b == g.b and a.a == g.a and a.r == g.r and a.g == g.g and a.b == g.b and a.a == g.a
and a.r == h.r and a.g == h.g and a.b == h.b and a.a == h.a and a.r == h.r and a.g == h.g and a.b == h.b and a.a == h.a
and a.r == i.r and a.g == i.g and a.b == i.b and a.a == i.a) then and a.r == i.r and a.g == i.g and a.b == i.b and a.a == i.a
and a.r == j.r and a.g == j.g and a.b == j.b and a.a == j.a) then
return a.r, a.g, a.b, a.a return a.r, a.g, a.b, a.a
else else
return { r = 0, g = 0, b = 0, a = 0 } return { r = 0, g = 0, b = 0, a = 0 }
@ -526,6 +528,7 @@ function Gladdy:SetupOptions()
Gladdy.db.cooldownBorderColor = rgb Gladdy.db.cooldownBorderColor = rgb
Gladdy.db.drBorderColor = rgb Gladdy.db.drBorderColor = rgb
Gladdy.db.trinketBorderColor = rgb Gladdy.db.trinketBorderColor = rgb
Gladdy.db.racialBorderColor = rgb
Gladdy:UpdateFrame() Gladdy:UpdateFrame()
end, end,
}, },

View File

@ -1,7 +1,7 @@
# Gladdy - TBC # Gladdy - TBC
### The most powerful arena addon for WoW TBC 2.5.1 ### The most powerful arena addon for WoW TBC 2.5.1
## [v1.07-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.07-Beta/Gladdy_TBC-Classic_v1.07-Beta.zip) ## [v1.08-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.08-Beta/Gladdy_TBC-Classic_v1.08-Beta.zip)
###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
@ -39,6 +39,13 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
### Changes ### Changes
#### v1.08-Beta
- fix Buffs not showing on class icon
- added option highlight to be inside
- added option to grow frames vertically
- added new profile to XiconProfile (Blizzard raid style)
- minor bugfixes
#### v1.07-Beta #### v1.07-Beta
- CombatIndicator module added - CombatIndicator module added