Merge branch 'dev'

ls- · Jan 14, 2021 · 7927538 · 7927538
2 parents 19ec7e2 + bb03af3
commit 7927538
Show file tree

Hide file tree

Showing 51 changed files with 989 additions and 951 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # CHANGELOG
 
+## Version 90002.04
+
+- Finished migrating fonts to LSM. Can be found at /LSUI > General > Fonts. Now there's 4
+  categories: cooldowns, unit frames, buttons, and progress bars. `"Cooldowns"` is self-explanatory,
+  `"Unit Frames"` controls fonts of all UF elements, but aura buttons and castbars, `"Buttons"`
+  controls fonts of all aura buttons, action buttons, item buttons on the character panel, and
+  `"Progress Bars"` controls fonts of castbars, the digsite bar, mirror timers, and the tooltip
+  healthbar. I haven't added support for Blizzard fonts yet, I'm still not sure how to do it better;
+- Added optional coloured ilvl text to the character frame. Can be found at /LSUI > Blizzard >
+  Character Frame > iLvl;
+- Added an option to disable enchant and gem text on equipped items. Can be found at /LSUI >
+  Blizzard > Character Frame > Item Enhancements;
+- Added an option to adjust the tooltip health bar and its text size. Can be found at /LSUI >
+  Tooltips > Health;
+- Improved compatibility with various addons that add text to the main tooltip;
+- Fixed an issue where class power separators wouldn't render properly;
+- Fixed an issue where the config tried to updated disabled unit frames;
+- Updated French translation. Translated by Brainc3ll@Curse;
+- Updated Simplified Chinese translation. Translated by aenerv7@Curse;
+- Misc bug fixes and tweaks;
+- Updated embeds.
+
 ## Version 90002.03
 
 - Fixed an issue that prevented square minimap from working in Torghast.

diff --git a/config/_config.xml b/config/_config.xml
@@ -4,6 +4,7 @@
 	<Script file="auratracker.lua"/>
 	<Script file="bars.lua"/>
 	<Script file="blizzard.lua"/>
+	<Include file="general\_general.xml"/>
 	<Script file="general.lua"/>
 	<Script file="loot.lua"/>
 	<Script file="minimap.lua"/>

diff --git a/config/auras.lua b/config/auras.lua
@@ -209,21 +209,15 @@ local function getOptionsTable_Aura(order, name, filter)
 					if C.db.profile.auras[filter].count[info[#info]] ~= value then
 						C.db.profile.auras[filter].count[info[#info]] = value
 						AURAS:ForHeader(filter, "UpdateConfig")
-						AURAS:ForHeader(filter, "ForEachButton", "UpdateCountText")
+						AURAS:ForHeader(filter, "ForEachButton", "UpdateCountFont")
 					end
 				end,
 				args = {
 					size = {
 						order = 1,
 						type = "range",
 						name = L["SIZE"],
-						min = 10, max = 20, step = 2,
-					},
-					flag = {
-						order = 2,
-						type = "select",
-						name = L["FLAG"],
-						values = FLAGS,
+						min = 8, max = 48, step = 1,
 					},
 					h_alignment = {
 						order = 3,
@@ -269,13 +263,7 @@ local function getOptionsTable_Aura(order, name, filter)
 						order = 2,
 						type = "range",
 						name = L["SIZE"],
-						min = 10, max = 20, step = 2,
-					},
-					flag = {
-						order = 3,
-						type = "select",
-						name = L["FLAG"],
-						values = FLAGS,
+						min = 8, max = 48, step = 1,
 					},
 					v_alignment = {
 						order = 4,

diff --git a/config/auratracker.lua b/config/auratracker.lua
@@ -221,7 +221,7 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 						order = 2,
 						type = "range",
 						name = L["SIZE"],
-						min = 10, max = 32, step = 2,
+						min = 8, max = 48, step = 1,
 					},
 					position = {
 						order = 3,
@@ -248,26 +248,17 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 				set = function(info, value)
 					if C.db.char.auratracker.count[info[#info]] ~= value then
 						C.db.char.auratracker.count[info[#info]] = value
+
 						AURATRACKER:GetTracker():UpdateConfig()
-						AURATRACKER:GetTracker():UpdateFontObjects()
+						AURATRACKER:GetTracker():UpdateCountFont()
 					end
 				end,
 				args = {
 					size = {
 						order = 1,
 						type = "range",
 						name = L["SIZE"],
-						min = 10, max = 20, step = 2,
-					},
-					outline = {
-						order = 2,
-						type = "toggle",
-						name = L["OUTLINE"],
-					},
-					shadow = {
-						order = 3,
-						type = "toggle",
-						name = L["SHADOW"],
+						min = 8, max = 48, step = 1,
 					},
 					h_alignment = {
 						order = 4,
@@ -369,13 +360,7 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
 						order = 13,
 						type = "range",
 						name = L["SIZE"],
-						min = 10, max = 20, step = 2,
-					},
-					flag = {
-						order = 14,
-						type = "select",
-						name = L["FLAG"],
-						values = FLAGS,
+						min = 8, max = 48, step = 1,
 					},
 					v_alignment = {
 						order = 15,