Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Jul 23, 2024
2 parents ddb6c93 + be7de65 commit 586c034
Show file tree
Hide file tree
Showing 100 changed files with 2,536 additions and 2,340 deletions.
33 changes: 31 additions & 2 deletions .compressor.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,43 @@ if (-Not (Test-Path "$env:ProgramFiles\7-Zip\7z.exe")) {

Set-Alias 7z "$env:ProgramFiles\7-Zip\7z.exe"

function Remove-Kaka([Parameter(Mandatory, ValueFromPipeline)] $file) {
process {
$canWrite = $true
$out = ""

foreach ($line in Get-Content $file) {
if ($line -match "--@do-not-package@") {
$canWrite = $false
}
elseif ($line -match "--@end-do-not-package@") {
$canWrite = $true

if (-not $foreach.MoveNext()) {
break
}

$line = $foreach.Current
}

if ($canWrite) {
$out += "$line`n"
}
}

Set-Content $file -Value $out.TrimEnd()
}
}

$name = (Get-Item .).Name

if (-Not (Test-Path (".\" + $name + "\" + $name + ".toc"))) {
if (-Not (Test-Path (".\$name\$name.toc"))) {
Write-Host ".toc not found"

return Read-Host
}

if (Get-Content (".\" + $name + "\" + $name + ".toc") | Where-Object { $_ -match "Version:\s*([a-zA-Z0-9.-]+)" }) {
if (Get-Content (".\$name\$name.toc") | Where-Object { $_ -match "Version:\s*([a-zA-Z0-9.-]+)" }) {
$version = $matches[1]
} else {
Write-Host "Bad version format"
Expand Down Expand Up @@ -54,5 +82,6 @@ if (Test-Path $temp) {
New-Item -Path $temp -ItemType Directory | Out-Null
Copy-Item $foldersToInclude -Destination $temp -Exclude $filesToExclude -Recurse
Get-ChildItem $temp -Recurse | Where-Object { $_.PSIsContainer -and $_.Name -cin $foldersToRemove } | Remove-Item -Recurse -Force
Get-ChildItem $temp -Recurse | Where-Object { $_.Extension -eq ".lua"} | Remove-Kaka
7z a -tzip -mx9 "..\$name-$version.zip" (Get-ChildItem $temp)
Remove-Item $temp -Recurse -Force
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
[submodule "ls_UI/embeds/LibButtonGlow-1.0"]
path = ls_UI/embeds/LibButtonGlow-1.0
url = https://repos.wowace.com/wow/libbuttonglow-1-0
[submodule "ls_UI/embeds/LibDropDown"]
path = ls_UI/embeds/LibDropDown
url = [email protected]:ls-/LibDropDown.git
[submodule "ls_UI/embeds/LibDualSpec-1.0"]
path = ls_UI/embeds/LibDualSpec-1.0
url = https://repos.wowace.com/wow/libdualspec-1-0
35 changes: 18 additions & 17 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ read_globals = {
"AdiButtonAuras",
"ADVENTURE_JOURNAL",
"ATTACK_BUTTON_FLASH_TIME",
"AutoCastShine_AutoCastStart",
"AutoCastShine_AutoCastStop",
"BACKPACK_TOOLTIP",
"BagsBar",
"BLIZZARD_STORE",
"BreakUpLargeNumbers",
"BuffFrame",
"C_AddOns",
"C_AdventureJournal",
"C_AzeriteItem",
"C_CurrencyInfo",
"C_DelvesUI",
"C_GossipInfo",
"C_Item",
"C_Mail",
Expand All @@ -73,6 +72,7 @@ read_globals = {
"C_PvP",
"C_QuestLog",
"C_Reputation",
"C_Spell",
"C_Timer",
"C_TooltipInfo",
"C_UnitAuras",
Expand All @@ -81,6 +81,10 @@ read_globals = {
"CanInspect",
"CHARACTER_BUTTON",
"CharacterBackSlot",
"CharacterBag0Slot",
"CharacterBag1Slot",
"CharacterBag2Slot",
"CharacterBag3Slot",
"CharacterChestSlot",
"CharacterFeetSlot",
"CharacterFinger0Slot",
Expand All @@ -93,6 +97,7 @@ read_globals = {
"CharacterMicroButton",
"CharacterModelScene",
"CharacterNeckSlot",
"CharacterReagentBag0Slot",
"CharacterSecondaryHandSlot",
"CharacterShirtSlot",
"CharacterShoulderSlot",
Expand All @@ -109,6 +114,7 @@ read_globals = {
"ColorMixin",
"CooldownFrame_Set",
"CreateFrame",
"CreateUnsecuredObjectPool",
"CreateVector2D",
"DeadlyDebuffFrame",
"DebuffFrame",
Expand All @@ -117,6 +123,7 @@ read_globals = {
"DUNGEONS_BUTTON",
"EJMicroButton",
"ENCHANTED_TOOLTIP_LINE",
"EncounterJournalSuggestFrame",
"Enum",
"ExpansionLandingPageMinimapButton",
"ExtraAbilityContainer",
Expand Down Expand Up @@ -189,20 +196,15 @@ read_globals = {
"GetRFDungeonInfo",
"GetSavedInstanceInfo",
"GetSavedWorldBossInfo",
"GetSelectedFaction",
"GetShapeshiftFormCooldown",
"GetShapeshiftFormInfo",
"GetSpecialization",
"GetSpecializationInfo",
"GetSpecializationInfoByID",
"GetSpellInfo",
"GetSpellLink",
"GetSpellSubtext",
"GetText",
"GetTime",
"GetTotemInfo",
"GetValueOrCallFunction",
"GetWatchedFactionInfo",
"GetWeaponEnchantInfo",
"GetXPExhaustion",
"GUILD_AND_COMMUNITIES",
Expand Down Expand Up @@ -230,7 +232,6 @@ read_globals = {
"ITEM_QUALITY_COLORS",
"ItemRefTooltip",
"KeybindFrames_InQuickKeybindMode",
"Kiosk",
"LE_REALM_RELATION_VIRTUAL",
"LE_TOKEN_RESULT_ERROR_DISABLED",
"LFDMicroButton",
Expand All @@ -242,6 +243,7 @@ read_globals = {
"MainMenuBarBackpackButton",
"MainMenuBarVehicleLeaveButton",
"MainMenuMicroButton",
"MainStatusTrackingBarContainer",
"MAX_REPUTATION_REACTION",
"MAX_TOTEMS",
"MaxDps",
Expand All @@ -262,7 +264,6 @@ read_globals = {
"MultiBarLeft",
"MultiBarRight",
"MultiCastActionBarFrame",
"NEWBIE_TOOLTIP_LFGPARENT",
"NewPlayerExperience",
"NineSliceUtil",
"NotifyInspect",
Expand Down Expand Up @@ -290,22 +291,27 @@ read_globals = {
"PetCastingBarFrame",
"PetHasActionBar",
"PlayerCastingBarFrame",
"PLAYERSPELLS_BUTTON",
"PlayerSpellsMicroButton",
"PlaySound",
"PossessActionBar",
"ProfessionMicroButton",
"PROFESSIONS_BUTTON",
"PVPQueueFrame",
"QUESTION_MARK_ICON",
"QUESTLOG_BUTTON",
"QuestLogMicroButton",
"QueueStatusButton",
"RANGE_INDICATOR",
"RegisterAttributeDriver",
"RegisterStateDriver",
"ReloadUI",
"RENOWN_LEVEL_LABEL",
"ReputationDetailMainScreenCheckBox",
"ReputationFrame",
"RequestLFDPartyLockInfo",
"RequestLFDPlayerLockInfo",
"RequestRaidInfo",
"SaveBindings",
"SecondaryStatusTrackingBarContainer",
"SecondsToTime",
"SecureHandlerSetFrameRef",
"SetBinding",
Expand All @@ -314,16 +320,11 @@ read_globals = {
"SetOverrideBindingClick",
"Settings",
"SettingsPanel",
"SetWatchedFactionIndex",
"SetWatchingHonorAsXP",
"SPELLBOOK_ABILITIES_BUTTON",
"SpellbookMicroButton",
"SpellFlyout",
"StanceBar",
"StatusTrackingBarManager",
"StoreMicroButton",
"TalentMicroButton",
"TALENTS_BUTTON",
"TalkingHeadFrame",
"TaxiRequestEarlyLanding",
"TicketStatusFrame",
Expand Down
45 changes: 45 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,50 @@
# CHANGELOG

## Version 110000.01

- Added 11.0.0 support.
- Added a set of options to adjust status bar textures. Can be found /LSUI > General > Textures.
- Updated a bunch of art assets.

### Config

- Removed outdated and confusing "character-specific" wording. Clarified what global and private profiles are for.
To reiterate, the global profile is for settings of various modules and submodules, these don't need a UI reload to
work, whereas the private profile includes the aura tracker settings and which modules and submodules are enabled or
disabled, these typically require a UI reload.
- Marked all private profile setting that require a UI reload to take effect with a light blue colour.
- Reworked the reload UI popup. Instead of appearing right away, it'll appear after you close the config panel.

### Action Bars

- Added an option to increase the number of main action bar's button slots up to 24 when the artwork is enabled.
The main action bar will take up the first 12 slots, the extra slots are empty, and they're there to create room for
additional action bars that can be moved there manually. All animations were adjusted accordingly to support this.
Can be found at /LSUI > Action Bars > Action Bar 1 > Number of Buttons.
- Split the spacing option into vertical and horizontal spacings. This will allow to create more space between the row
without affecting the gap between the buttons.
- Reduced the minimum button size to 8. Fun fact, at the height set to 14 and the number of buttons per row set to 6
a single 12 button action bar to be as big as just 6 button slots.
- Fixed an issue where the XP bar would occasionally blink/flash. It generally should perform a lot better now.

### Blizzard

- Added compact variant for the Suggested Content tab of the Adventure Guide. Can be found at /LSUI > Blizzard >
Adventure Guide, enabled by default.

### Unit Frames

- Added adjustable gradient. Can be found at /LSUI > Unit Frames, next to the gloss slider.
- Added temporary max health reduction bar. It's a new feature in TWW, most likely will be used in raid and dungeon
encounters. Can be found at /LSUI > Unit Frames > Unit Frame > Health > Health Reduction, next to the heal prediction
toggle.
- Reworked the damage absorb shield into a widget that's displayed on top of the health bar.
- Added an option to adjust the zoom of 3D portraits. /LSUI > Unit Frames > Unit Frame > Portrait > Scale, only visible
when using 3D portraits.
- Cropped 2D portraits. They're less round now, and there's less wasted space. There's no way to completely remove the
round mask.
- Added options to enable word wrapping for health and power texts.

## Version 100207.01

- Added 10.2.7 support.
Expand Down
Binary file added ls_UI/assets/border-statusbar.TGA
Binary file not shown.
Binary file modified ls_UI/assets/border-thin.TGA
Binary file not shown.
Binary file modified ls_UI/assets/console.TGA
Binary file not shown.
Binary file modified ls_UI/assets/minimap-flags-100.TGA
Binary file not shown.
Binary file modified ls_UI/assets/minimap-flags-125.TGA
Binary file not shown.
Binary file modified ls_UI/assets/minimap-flags-150.TGA
Binary file not shown.
Binary file added ls_UI/assets/reduction.TGA
Binary file not shown.
Binary file removed ls_UI/assets/statusbar-azerite-fill.TGA
Binary file not shown.
Binary file added ls_UI/assets/statusbar-edge.TGA
Binary file not shown.
Binary file removed ls_UI/assets/statusbar-glass.TGA
Binary file not shown.
Binary file removed ls_UI/assets/statusbar-texture.TGA
Binary file not shown.
Binary file removed ls_UI/assets/statusbar.TGA
Binary file not shown.
11 changes: 7 additions & 4 deletions ls_UI/core/button.lua
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ end

local function updateHotKey(self, text)
if text ~= RANGE_INDICATOR then
self:SetFormattedText("%s", self:GetParent():GetHotkey() or "")
self:SetFormattedText("%s", self.__parent:GetHotkey() or "")
end
end

Expand All @@ -106,6 +106,8 @@ local function setIcon(button, texture, l, r, t, b)
icon:SetDrawLayer("BACKGROUND", 0)
end

icon:SetSnapToPixelGrid(false)
icon:SetTexelSnappingBias(0)
icon:SetAllPoints()
icon:SetTexCoord(l or 0.0625, r or 0.9375, t or 0.0625, b or 0.9375)

Expand Down Expand Up @@ -180,7 +182,7 @@ local function skinButton(button)

local icon = button.icon or button.Icon
if icon then
setIcon(button.icon or button.Icon)
setIcon(icon)

local iconMask = button.IconMask
if iconMask then
Expand Down Expand Up @@ -214,6 +216,7 @@ local function skinButton(button)
hotKey:SetSize(0, 0)
hotKey:SetVertexColor(1, 1, 1, 1)
hotKey:Show()
hotKey.__parent = button

if not button.GetHotkey then
button.GetHotkey = button_GetHotkey
Expand Down Expand Up @@ -313,7 +316,7 @@ local function skinButton(button)
border = E:CreateBorder(button)
border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin")
border:SetSize(16)
border:SetOffset(-8)
border:SetOffset(-4)
button.Border_ = border

local pushedTexture = button.GetPushedTexture and button:GetPushedTexture()
Expand Down Expand Up @@ -509,7 +512,7 @@ function E:CreateButton(parent, name, hasCount, hasCooldown, isSandwich, isSecur
local border = E:CreateBorder(button)
border:SetTexture("Interface\\AddOns\\ls_UI\\assets\\border-thin")
border:SetSize(16)
border:SetOffset(-8)
border:SetOffset(-4)
button.Border = border

setHighlightTexture(button)
Expand Down
31 changes: 21 additions & 10 deletions ls_UI/core/changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,33 @@ local _G = getfenv(0)

-- Mine
E.CHANGELOG = [[
- Added 10.2.7 support.
- Fixed an issue where the addon would fail to create a mover if the parent object it's supposed to be attached to was
no longer available. Now such a mover will be reset to its default state.
- Added 11.0.0 support.
- Added a set of options to adjust status bar textures. Can be found /LSUI > General > Textures.
- Updated a bunch of art assets.
### Config
- Removed outdated and confusing "character-specific" wording. Clarified what global and private profiles are for. To reiterate, the global profile is for settings of various modules and submodules, these don't need a UI reload to work, whereas the private profile includes the aura tracker settings and which modules and submodules are enabled or disabled, these typically require a UI reload.
- Marked all private profile setting that require a UI reload to take effect with a light blue colour.
- Reworked the reload UI popup. Instead of appearing right away, it'll appear after you close the config panel.
### Action Bars
- Added an option to wipe the list of tracked currencies to remove retired inaccessible currencies from previous
seasons. Can be found at /LSUI > Action Bars > Backpack > Restore Defaults button in the Currency panel.
- Fixed micro menu help tip hiding. Blizz keep changing how this stuff works, so it'll get broken again eventually.
- Fixed an issue where the reputation bar wouldn't display reputation gains past the renown cap.
- Added an option to increase the number of main action bar's button slots up to 24 when the artwork is enabled. The main action bar will take up the first 12 slots, the extra slots are empty, and they're there to create room for additional action bars that can be moved there manually. All animations were adjusted accordingly to support this. Can be found at /LSUI > Action Bars > Action Bar 1 > Number of Buttons.
- Split the spacing option into vertical and horizontal spacings. This will allow to create more space between the row without affecting the gap between the buttons.
- Reduced the minimum button size to 8. Fun fact, at the height set to 14 and the number of buttons per row set to 6 a single 12 button action bar to be as big as just 6 button slots.
- Fixed an issue where the XP bar would occasionally blink/flash. It generally should perform a lot better now.
### Tooltips
### Blizzard
- Fixed an issue where names would appear as blank for players in another zone.
- Added compact variant for the Suggested Content tab of the Adventure Guide. Can be found at /LSUI > Blizzard > Adventure Guide, enabled by default.
### Unit Frames
- Added proper empowered cast support. Better late than never T_T
- Added adjustable gradient. Can be found at /LSUI > Unit Frames, next to the gloss slider.
- Added temporary max health reduction bar. It's a new feature in TWW, most likely will be used in raid and dungeon encounters. Can be found at /LSUI > Unit Frames > Unit Frame > Health > Health Reduction, next to the heal prediction toggle.
- Reworked the damage absorb shield into a widget that's displayed on top of the health bar.
- Added an option to adjust the zoom of 3D portraits. /LSUI > Unit Frames > Unit Frame > Portrait > Scale, only visible when using 3D portraits.
- Cropped 2D portraits. They're less round now, and there's less wasted space. There's no way to completely remove the round mask.
- Added options to enable word wrapping for health and power texts.
]]
Loading

0 comments on commit 586c034

Please sign in to comment.