Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Mar 3, 2023
2 parents 680b55f + 62c3581 commit 071f97c
Show file tree
Hide file tree
Showing 21 changed files with 381 additions and 146 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# CHANGELOG

## Version 100005.03

### Unit Frames

- Added the "Health" option to fading. It's controlled by the player's health, and if it's below
<100% the frame will fade in.
- Added an option to disable status icons. These are the round role, class, etc icons at the bottom
of a frame.
- Removed fading options from pet, target of focus, and target of target frames. These are now
controlled by the fading options of player, focus, and target frames respectively.

## Version 100005.02

### Tooltips
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2013-2022 Val Voronov <[email protected]>.
Copyright © 2013-2023 Val Voronov <[email protected]>.

The contents of this addon, excluding third-party resources, are copyrighted to its authors with all rights reserved.

Expand Down
11 changes: 7 additions & 4 deletions ls_UI/core/changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ local _G = getfenv(0)

-- Mine
E.CHANGELOG = [[
### Tooltips
### Unit Frames
- Improved compatibility with addons that use old-school tooltip scanning. No more unit names in all
kinds of tooltips!
- Added expansion info to item tooltips. It's tied to the "Spell and Item ID" option.
- Added the "Health" option to fading. It's controlled by the player's health, and if it's below
<100% the frame will fade in.
- Added an option to disable status icons. These are the round role, class, etc icons at the bottom
of a frame.
- Removed fading options from pet, target of focus, and target of target frames. These are now
controlled by the fading options of player, focus, and target frames respectively.
]]
67 changes: 37 additions & 30 deletions ls_UI/core/defaults.lua
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = true,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -691,6 +692,9 @@ D.profile = {
y = 0,
},
},
status = {
enabled = true,
},
threat = {
enabled = true,
},
Expand Down Expand Up @@ -767,16 +771,6 @@ D.profile = {
width = 114,
height = 28,
point = {"BOTTOMRIGHT", "LSPlayerFrame", "BOTTOMLEFT", -12, 0},
fade = {
enabled = false,
combat = false,
target = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
min_alpha = 0.2,
max_alpha = 1,
},
insets = {
t_size = 0.25,
b_size = 0.25,
Expand Down Expand Up @@ -968,6 +962,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -1088,6 +1083,9 @@ D.profile = {
y = -2,
},
},
status = {
enabled = true,
},
threat = {
enabled = true,
feedback_unit = "player",
Expand Down Expand Up @@ -1193,16 +1191,6 @@ D.profile = {
width = 114,
height = 28,
point = {"BOTTOMLEFT", "LSTargetFrame", "BOTTOMRIGHT", 12, 0},
fade = {
enabled = false,
combat = false,
target = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
min_alpha = 0.2,
max_alpha = 1,
},
insets = {
t_size = 0.25,
b_size = 0.25,
Expand Down Expand Up @@ -1283,6 +1271,9 @@ D.profile = {
y = 6,
},
},
status = {
enabled = true,
},
threat = {
enabled = false,
feedback_unit = "target",
Expand All @@ -1304,6 +1295,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -1424,6 +1416,9 @@ D.profile = {
y = -2,
},
},
status = {
enabled = true,
},
threat = {
enabled = true,
feedback_unit = "player",
Expand Down Expand Up @@ -1529,16 +1524,6 @@ D.profile = {
width = 114,
height = 28,
point = {"BOTTOMLEFT", "LSFocusFrame", "BOTTOMRIGHT", 12, 0},
fade = {
enabled = false,
combat = false,
target = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
min_alpha = 0.2,
max_alpha = 1,
},
insets = {
t_size = 0.25,
b_size = 0.25,
Expand Down Expand Up @@ -1619,6 +1604,9 @@ D.profile = {
y = 6,
},
},
status = {
enabled = true,
},
threat = {
enabled = false,
feedback_unit = "focus",
Expand All @@ -1643,6 +1631,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -1884,6 +1873,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -1928,6 +1918,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -1977,6 +1968,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2026,6 +2018,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2075,6 +2068,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2124,6 +2118,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2173,6 +2168,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2222,6 +2218,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2271,6 +2268,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2320,6 +2318,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2355,6 +2354,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2389,6 +2389,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand All @@ -2413,6 +2414,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2444,6 +2446,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand All @@ -2467,6 +2470,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand All @@ -2483,6 +2487,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand All @@ -2504,6 +2509,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down Expand Up @@ -2568,6 +2574,7 @@ D.profile = {
enabled = false,
combat = false,
target = false,
health = false,
out_delay = 0.75,
out_duration = 0.15,
in_duration = 0.15,
Expand Down
Loading

0 comments on commit 071f97c

Please sign in to comment.