Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Oct 17, 2018
2 parents 069a85a + ef66ca8 commit da908ed
Show file tree
Hide file tree
Showing 44 changed files with 3,492 additions and 2,763 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# CHANGELOG

## Version 80000.12

- Added options to adjust text size, outline, and shadow of various unit frame elements, e.g.,
health, power, etc;
- Reworked resource gain/loss animations. Added health loss animations, and options to adjust
health, power, class power, and alternative power gain/loss thresholds;
- Tweaked unit frame border textures;
- Fixed compatibility issues with Masque;
- Updated embeds.

![Imgur](https://i.imgur.com/3qWfxxS.gif)

## Version 80000.11

- Added options to adjust auras' count text and aura type icon. It's also possible to display
Expand Down
Binary file modified assets/border-thick.TGA
Binary file not shown.
Binary file modified assets/console.TGA
Binary file not shown.
Binary file modified assets/unit-frame-sep-horiz.TGA
Binary file not shown.
8 changes: 1 addition & 7 deletions config/auras.lua
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,8 @@ local function getOptionsTable_Aura(order, name, filter)
name = L["FLAG"],
values = FLAGS,
},
h_alignment = {
order = 4,
type = "select",
name = L["TEXT_HORIZ_ALIGNMENT"],
values = H_ALIGNMENTS,
},
v_alignment = {
order = 5,
order = 4,
type = "select",
name = L["TEXT_VERT_ALIGNMENT"],
values = V_ALIGNMENTS,
Expand Down
8 changes: 1 addition & 7 deletions config/auratracker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,8 @@ function CONFIG.CreateAuraTrackerPanel(_, order)
name = L["FLAG"],
values = FLAGS,
},
h_alignment = {
order = 15,
type = "select",
name = L["TEXT_HORIZ_ALIGNMENT"],
values = H_ALIGNMENTS,
},
v_alignment = {
order = 16,
order = 15,
type = "select",
name = L["TEXT_VERT_ALIGNMENT"],
values = V_ALIGNMENTS,
Expand Down
8 changes: 1 addition & 7 deletions config/bars.lua
Original file line number Diff line number Diff line change
Expand Up @@ -502,14 +502,8 @@ local function getOptionsTable_Bar(barID, order, name)
name = L["FLAG"],
values = FLAGS,
},
h_alignment = {
order = 4,
type = "select",
name = L["TEXT_HORIZ_ALIGNMENT"],
values = H_ALIGNMENTS,
},
v_alignment = {
order = 5,
order = 4,
type = "select",
name = L["TEXT_VERT_ALIGNMENT"],
values = V_ALIGNMENTS,
Expand Down
27 changes: 23 additions & 4 deletions config/blizzard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,21 @@ function CONFIG.CreateBlizzardPanel(_, order)
},
},
},
icon = {
order = 20,
type = "select",
name = L["ICON"],
values = CONFIG.CASTBAR_ICON_POSITIONS,
get = function()
return C.db.profile.blizzard.castbar.icon.position
end,
set = function(_, value)
if C.db.profile.blizzard.castbar.icon.position ~= value then
C.db.profile.blizzard.castbar.icon.position = value
BLIZZARD:UpdateCastBars()
end
end,
},
spacer_3 = {
order = 29,
type = "description",
Expand All @@ -368,11 +383,15 @@ function CONFIG.CreateBlizzardPanel(_, order)
name = L["SIZE"],
min = 10, max = 20, step = 2,
},
flag = {
outline = {
order = 2,
type = "select",
name = L["FLAG"],
values = FLAGS,
type = "toggle",
name = L["OUTLINE"],
},
shadow = {
order = 3,
type = "toggle",
name = L["SHADOW"],
},
},
},
Expand Down
84 changes: 84 additions & 0 deletions config/core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,90 @@ local AceConfig = LibStub("AceConfig-3.0")
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
local LibKeyBound = LibStub("LibKeyBound-1.0-ls")

MODULE.H_ALIGNMENTS = {
["CENTER"] = "CENTER",
["LEFT"] = "LEFT",
["RIGHT"] = "RIGHT",
}

MODULE.V_ALIGNMENTS = {
["BOTTOM"] = "BOTTOM",
["MIDDLE"] = "MIDDLE",
["TOP"] = "TOP",
}

MODULE.POINTS = {
["BOTTOM"] = "BOTTOM",
["BOTTOMLEFT"] = "BOTTOMLEFT",
["BOTTOMRIGHT"] = "BOTTOMRIGHT",
["CENTER"] = "CENTER",
["LEFT"] = "LEFT",
["RIGHT"] = "RIGHT",
["TOP"] = "TOP",
["TOPLEFT"] = "TOPLEFT",
["TOPRIGHT"] = "TOPRIGHT",
}

MODULE.POINTS_EXT = {
[""] = "NONE",
["BOTTOM"] = "BOTTOM",
["BOTTOMLEFT"] = "BOTTOMLEFT",
["BOTTOMRIGHT"] = "BOTTOMRIGHT",
["CENTER"] = "CENTER",
["LEFT"] = "LEFT",
["RIGHT"] = "RIGHT",
["TOP"] = "TOP",
["TOPLEFT"] = "TOPLEFT",
["TOPRIGHT"] = "TOPRIGHT",
}

MODULE.CASTBAR_ICON_POSITIONS = {
["NONE"] = L["NONE"],
["LEFT"] = L["LEFT"],
["RIGHT"] = L["RIGHT"],
}

MODULE.FLAGS = {
-- [""] = L["NONE"],
["_Outline"] = L["OUTLINE"],
["_Shadow"] = L["SHADOW"],
}
MODULE.GROWTH_DIRS = {
["LEFT_DOWN"] = L["LEFT_DOWN"],
["LEFT_UP"] = L["LEFT_UP"],
["RIGHT_DOWN"] = L["RIGHT_DOWN"],
["RIGHT_UP"] = L["RIGHT_UP"],
}

MODULE.FCF_MODES = {
["Fountain"] = "Fountain",
["Standard"] = "Straight",
}

function MODULE:GetRegionAnchors(anchorsToRemove, anchorsToAdd)
local temp = {
[""] = L["FRAME"],
["Health"] = L["HEALTH"],
["Health.Text"] = L["HEALTH_TEXT"],
["Power"] = L["POWER"],
["Power.Text"] = L["POWER_TEXT"],
}

if anchorsToRemove then
for anchor in next, anchorsToRemove do
temp[anchor] = nil
end
end

if anchorsToAdd then
for anchor, name in next, anchorsToAdd do
temp[anchor] = name
end
end

return temp
end

-- MODULE.OpenAuraConfig
do
-- Mine
Expand Down
Loading

0 comments on commit da908ed

Please sign in to comment.