from retail

WeakAurasOptions/AuthorOptions.lua

@@ -1190,15 +1190,6 @@ typeControlAdders = {
         return not option.useName
       end
     }
-    args[prefix .. "noMerge"] = {
-      type = "toggle",
-      name = name(option, "noMerge", L["Prevent Merging"]),
-      desc = desc(option, "noMerge", L["If checked, then this separator will not merge with other separators when selecting multiple auras."]),
-      order = order(),
-      width = WeakAuras.doubleWidth,
-      get = get(option, "noMerge"),
-      set = set(data, option, "noMerge"),
-    }
   end,
   group = function(options, args, data, order, prefix, i)
     local option = options[i]

WeakAurasOptions/Changelog.lua

@@ -0,0 +1,89 @@
+if not WeakAuras.IsLibsOK() then return end
+---@type string
+local AddonName = ...
+---@class OptionsPrivate
+local OptionsPrivate = select(2, ...)
+
+if not WeakAuras.IsLibsOK() then return end
+---@type string
+local AddonName = ...
+---@class OptionsPrivate
+local OptionsPrivate = select(2, ...)
+OptionsPrivate.changelog = {
+  versionString = '5.19.0',
+  dateString = '2025-01-20',
+  fullChangeLogUrl = 'https://github.com/WeakAuras/WeakAuras2/compare/5.18.1...5.19.0',
+  highlightText = [==[
+- Some Important changes:
+  - 🚨🚨 WeakAuras no longer dispatches COMBAT_LOG_EVENT_UNFILTERED to custom triggers, unless the event list specifies at least one subevent. 🚨🚨 You will need to make changes to these auras to get them to function properly.
+  - Actions: For performance reasons, "On Init" custom code for auras with an encounter ID load option is not as eager to load as previous. We don't anticipate this should cause any problems, but if it does please get in touch!
+- Many new features:
+  - This changelog is now viewable in game, via the changelog button (if you're reading this from the in game changelog, hi!)
+  - New Region Type: Empty region is now available, for "displays" which either don't need a visual component (e.g. 'play a sound when i get 5 buffs from roll the bones'), and for wacky custom designs.
+  - New Trigger: Player Money can now be tracked in the builtins, & a coin string formatting option is avaialable for text patterns. (thanks Boneshock!)
+  - New sub element: Stop Motion is now available as a subregion to add to texture, progress texture, icon, progress bar, text, & empty retion types.
+  - Linear/Circular Progress elements now support min/max progress properties.
+  - Classic (Cataclysm): Spell Power is now tracked in the Character Stats trigger.
+  - Chat Message Events: sourceGUID is now exposed in Other Events - Chat Message triggers. Note that some message types don't have a source & thuse don't provide sourceGUID either.
+  - New Media: "Heartbeat Single" (try playing it on a loop) is now provided in the builtin media. (thanks Jake!)
+  - Aura Trigger: new match selectors based on spell ID are now avaialble.]==],  commitText = [==[Boneshock (1):
+
+- Add Money Formatting Option and Add Player Money to Currency Trigger (#5586)
+
+InfusOnWoW (23):
+
+- Update Atlas File List from wago.tools
+- Update Discord List
+- Templates Classic: Fix Paladin templates
+- Classic: Enable UnitGroupRoleAssigned options
+- Bufftrigger 2: Add match selectors that work on spell ids
+- Make StopMotion sub elements's color work
+- Update Discord List
+- Texture Sub Element: Fix ordering of input and browse button
+- Stop Motion: Properly fix GetColor function
+- Fix description of Stop Motion sub element
+- Add Thank you Role to allowed roles
+- Add a Changelog button
+- Add an Empty RegionType
+- Fix lua error for color animation on Stop Motion
+- Add min/max progress for Linear/CircularProgress and StopMotion sub elements
+- Remove left over TODOs that are actually done
+- Fix regressions in Textures refactor
+- Cata: Add Spell Power to Character Stats
+- Introduce sub elements for circular/linear Textures
+- Texture Sub Element
+- StopMotion: Introduce a StopMotion sub element
+- Update Atlas File List from wago.tools
+- Update Discord List
+
+Jake G (1):
+
+- Add Sound Heartbeat Single (#5600)
+
+Stanzilla (4):
+
+- Update WeakAurasModelPaths from wago.tools
+- Update bug_report.yml
+- Update WeakAurasModelPaths from wago.tools
+- Update WeakAurasModelPaths from wago.tools
+
+emptyrivers (2):
+
+- drop nomerge headers
+- add sourceGUID to chat msg trigger state
+
+github-actions[bot] (1):
+
+- Update Atlas File List from wago.tools (#5618)
+
+mrbuds (2):
+
+- Don't pre-load in raid init scripts for auras with an encounterId load option
+- Disable CLEU triggers without filters
+
+nullKomplex (1):
+
+- Default discord-update to not run on forks
+
+]==]
+}

WeakAurasOptions/CommonOptions.lua

@@ -1566,9 +1566,191 @@ local function PositionOptionsForSubElement(data, options, startOrder, areaAncho
     softMax = 200,
     step = 1,
   }
-
 end
 
+local function ProgressOptionsForSubElement(parentData, data, options, startOrder, progressSourceHidden)
+  options.progress_source = {
+    type = "select",
+    width = WeakAuras.doubleWidth,
+    name = L["Progress Source"],
+    order = startOrder,
+    control = "WeakAurasTwoColumnDropdown",
+    values = OptionsPrivate.Private.GetProgressSourcesForUi(parentData, true),
+    get = function(info)
+      return OptionsPrivate.Private.GetProgressValueConstant(data.progressSource or {-2, ""})
+    end,
+    set = function(info, value)
+      if value then
+        data.progressSource = data.progressSource or {}
+        -- Copy only trigger + property
+        data.progressSource[1] = value[1]
+        data.progressSource[2] = value[2]
+      else
+        data.progressSource = nil
+      end
+      WeakAuras.Add(parentData)
+    end,
+    hidden = progressSourceHidden
+  }
+
+  options.progressSourceWarning = {
+    type = "description",
+    width = WeakAuras.doubleWidth,
+    name = L["Note: This progress source does not provide a total value/duration. A total value/duration must be set via \"Set Maximum Progress\""],
+    order = startOrder + 0.1,
+    hidden = function()
+      if type(progressSourceHidden) == "function" and progressSourceHidden() then
+        return true
+      end
+      local progressSource = OptionsPrivate.Private.AddProgressSourceMetaData(parentData, data.progressSource)
+      -- Auto progress, Manual Progress or the progress source has a total property
+      if not progressSource or progressSource[2] == "auto" or progressSource[1] == 0 or progressSource[4] ~= nil then
+        return true
+      end
+      return false
+    end,
+  }
+
+  local function hiddenManual()
+    if type(progressSourceHidden) == "function" and progressSourceHidden() then
+      return true
+    end
+    if data.progressSource and data.progressSource[1] == 0 then
+      return false
+    end
+    return true
+  end
+
+  options.progressSourceManualValue = {
+    type = "range",
+    control = "WeakAurasSpinBox",
+    width = WeakAuras.normalWidth,
+    name = L["Value"],
+    order = startOrder + 0.2,
+    min = 0,
+    softMax = 100,
+    bigStep = 1,
+    hidden = hiddenManual,
+    get = function(info)
+      return data.progressSource and data.progressSource[3] or 0
+    end,
+    set = function(info, value)
+      data.progressSource = data.progressSource or {}
+      data.progressSource[3] = value
+      WeakAuras.Add(parentData)
+    end
+  }
+
+  options.progressSourceManualTotal = {
+    type = "range",
+    control = "WeakAurasSpinBox",
+    width = WeakAuras.normalWidth,
+    name = L["Total"],
+    order = startOrder + 0.3,
+    min = 0,
+    softMax = 100,
+    bigStep = 1,
+    hidden = hiddenManual,
+    get = function(info)
+      return data.progressSource and data.progressSource[4] or 100
+    end,
+    set = function(info, value)
+      data.progressSource = data.progressSource or {}
+      data.progressSource[4] = value
+      WeakAuras.Add(parentData)
+    end
+  }
+
+  options.useAdjustededMin = {
+    type = "toggle",
+    width = WeakAuras.normalWidth,
+    name = L["Set Minimum Progress"],
+    desc = L["Values/Remaining Time below this value are displayed as zero progress."],
+    order = startOrder + 0.4,
+    set = function(info, value)
+      data.useAdjustededMin = value
+      if not value then
+        data.adjustedMin = ""
+      end
+      WeakAuras.Add(parentData)
+    end,
+    hidden = progressSourceHidden
+  };
+
+  options.adjustedMin = {
+    type = "input",
+    validate = WeakAuras.ValidateNumericOrPercent,
+    width = WeakAuras.normalWidth,
+    order = startOrder + 0.5,
+    name = L["Minimum"],
+    hidden = function()
+      if type(progressSourceHidden) == "function" and progressSourceHidden() then
+        return true
+      end
+      return not data.useAdjustededMin
+    end,
+    desc = L["Enter static or relative values with %"]
+  };
+
+  options.useAdjustedMinSpacer = {
+    type = "description",
+    width = WeakAuras.normalWidth,
+    name = "",
+    order = startOrder + 0.6,
+    hidden = function()
+      if type(progressSourceHidden) == "function" and progressSourceHidden() then
+        return true
+      end
+      return not (not data.useAdjustededMin and data.useAdjustededMax)
+    end,
+  }
+
+  options.useAdjustededMax = {
+    type = "toggle",
+    width = WeakAuras.normalWidth,
+    name = L["Set Maximum Progress"],
+    desc = L["Values/Remaining Time above this value are displayed as full progress."],
+    order = startOrder + 0.7,
+    set = function(info, value)
+      data.useAdjustededMax = value
+      if not value then
+        data.adjustedMax = ""
+      end
+      WeakAuras.Add(parentData)
+    end,
+    hidden = progressSourceHidden
+  }
+
+  options.adjustedMax = {
+    type = "input",
+    width = WeakAuras.normalWidth,
+    validate = WeakAuras.ValidateNumericOrPercent,
+    order = startOrder + 0.8,
+    name = L["Maximum"],
+    hidden = function()
+      if type(progressSourceHidden) == "function" and progressSourceHidden() then
+        return true
+      end
+      return not data.useAdjustededMax
+    end,
+    desc = L["Enter static or relative values with %"]
+  }
+
+  options.useAdjustedMaxSpacer = {
+    type = "description",
+    width = WeakAuras.normalWidth,
+    name = "",
+    order = startOrder + 0.9,
+    hidden = function()
+      if type(progressSourceHidden) == "function" and progressSourceHidden() then
+        return true
+      end
+      return not (data.useAdjustededMin and not data.useAdjustededMax)
+    end,
+  }
+end
+
+
 local function BorderOptions(id, data, showBackDropOptions, hiddenFunc, order)
   local borderOptions = {
     borderHeader = {
@@ -1902,6 +2084,7 @@ OptionsPrivate.commonOptions.CreateExecuteAll = CreateExecuteAll
 OptionsPrivate.commonOptions.PositionOptions = PositionOptions
 OptionsPrivate.commonOptions.PositionOptionsForSubElement = PositionOptionsForSubElement
 OptionsPrivate.commonOptions.ProgressOptions = ProgressOptions
+OptionsPrivate.commonOptions.ProgressOptionsForSubElement = ProgressOptionsForSubElement
 OptionsPrivate.commonOptions.BorderOptions = BorderOptions
 OptionsPrivate.commonOptions.AddCodeOption = AddCodeOption
 

WeakAurasOptions/OptionsFrames/OptionsFrame.lua

@@ -483,12 +483,28 @@ function OptionsPrivate.CreateFrame()
   thanksButton:SetParent(tipFrame)
   thanksButton:SetPoint("LEFT", documentationButton, "RIGHT", 10, 0)
 
+  local changelogButton
+  if OptionsPrivate.changelog then
+    local changelog
+    if OptionsPrivate.changelog.highlightText then
+      changelog = L["Highlights"] .. "\n" .. OptionsPrivate.changelog.highlightText .. "\n"
+      .. L["Commits"] .. "\n" ..OptionsPrivate.changelog.commitText
+    else
+      changelog = OptionsPrivate.changelog.commitText
+    end
+
+    changelogButton = addFooter(L["Changelog"], "", OptionsPrivate.changelog.fullChangeLogUrl,
+                                      changelog, nil, nil, false, 800)
+    changelogButton:SetParent(tipFrame)
+    changelogButton:SetPoint("LEFT", thanksButton, "RIGHT", 10, 0)
+  end
+
   local awesomeWotlkButton
   if not WeakAuras.isAwesomeEnabled() then
     awesomeWotlkButton = addFooter("Awesome WotLK", [[Interface\AddOns\WeakAuras\Media\Textures\GitHub.tga]], "https://github.com/FrostAtom/awesome_wotlk/releases",
                                     L["Unlock nameplate anchoring & units in WeakAuras with the awesome_wotlk client patch"])
     awesomeWotlkButton:SetParent(tipFrame)
-    awesomeWotlkButton:SetPoint("LEFT", thanksButton, "RIGHT", 10, 0)
+    awesomeWotlkButton:SetPoint("LEFT", changelogButton or thanksButton, "RIGHT", 10, 0)
   end
 
   local reportbugButton = addFooter(L["Found a Bug?"], [[Interface\AddOns\WeakAuras\Media\Textures\bug_report.tga]], "https://github.com/NoM0Re/WeakAuras-WotLK/issues",

WeakAurasOptions/RegionOptions/Empty.lua

@@ -0,0 +1,54 @@
+if not WeakAuras.IsLibsOK() then return end
+
+local AddonName, OptionsPrivate = ...
+
+local L = WeakAuras.L
+
+local function createOptions(id, data)
+  local options = {
+    __title = L["Settings"],
+    __order = 1,
+    alpha = {
+      type = "range",
+      control = "WeakAurasSpinBox",
+      width = WeakAuras.normalWidth,
+      name = L["Alpha"],
+      order = 1,
+      min = 0,
+      max = 1,
+      bigStep = 0.01,
+      isPercent = true
+    },
+  }
+
+  return {
+    empty = options,
+    position = OptionsPrivate.commonOptions.PositionOptions(id, data),
+  }
+
+end
+
+local function createThumbnail()
+  local frame = CreateFrame("Frame", nil, UIParent)
+  frame:SetWidth(32)
+  frame:SetHeight(32)
+
+  local border = frame:CreateTexture(nil, "OVERLAY")
+  border:SetAllPoints(frame)
+  border:SetTexture("Interface\\BUTTONS\\UI-Quickslot2.blp")
+  border:SetTexCoord(0.2, 0.8, 0.2, 0.8)
+
+  return frame
+end
+
+local function modifyThumbnail(parent, frame, data)
+
+end
+
+-- Register new region type options with WeakAuras
+OptionsPrivate.registerRegions = OptionsPrivate.registerRegions or {}
+table.insert(OptionsPrivate.registerRegions, function()
+  OptionsPrivate.Private.RegisterRegionOptions("empty", createOptions, createThumbnail, L["Empty Base Region"],
+                                               createThumbnail, modifyThumbnail,
+                                               L["Shows nothing, except sub elements"]);
+end)

WeakAurasOptions/SubRegionOptions/StopMotion.lua

@@ -226,41 +226,7 @@ local function createOptions(parentData, data, index, subIndex)
       values = animation_types
     },
 
-    progress_source = {
-      type = "select",
-      width = WeakAuras.normalWidth,
-      name = L["Progress Source"],
-      order = 15,
-      control = "WeakAurasTwoColumnDropdown",
-      values = OptionsPrivate.Private.GetProgressSourcesForUi(parentData, true),
-      get = function(info)
-        return OptionsPrivate.Private.GetProgressValueConstant(data.progressSources or {-2, ""})
-      end,
-      set = function(info, value)
-        if value then
-          data.progressSources = data.progressSources or {}
-          -- Copy only trigger + property
-          data.progressSources[1] = value[1]
-          data.progressSources[2] = value[2]
-        else
-          data.progressSources = nil
-        end
-        WeakAuras.Add(parentData)
-      end,
-      hidden = function()
-        return not(data.animationType == "progress")
-      end
-    },
-
-    progress_source_space = {
-      type = "description",
-      name = "",
-      order = 16,
-      width = WeakAuras.normalWidth,
-      hidden = function()
-        return not(data.animationType == "progress")
-      end
-    },
+    -- progress source added below
 
     startPercent = {
       type = "range",
@@ -341,10 +307,16 @@ local function createOptions(parentData, data, index, subIndex)
     },
   }
 
+  local progressSourceHiden = function()
+    return not(data.animationType == "progress")
+  end
+
+  OptionsPrivate.commonOptions.ProgressOptionsForSubElement(parentData, data, options, 15, progressSourceHiden)
   OptionsPrivate.commonOptions.PositionOptionsForSubElement(data, options, 21, areaAnchors, pointAnchors)
   OptionsPrivate.AddUpDownDeleteDuplicate(options, parentData, index, "substopmotion")
 
   return options
 end
 
-  WeakAuras.RegisterSubRegionOptions("substopmotion", createOptions, L["Shows a Stop Moption"]);
+WeakAuras.RegisterSubRegionOptions("substopmotion", createOptions, L["Shows a Stop Motion"]);
+

WeakAurasOptions/SubRegionOptions/Texture.lua

@@ -12,7 +12,6 @@ local function createOptions(parentData, data, index, subIndex)
     WeakAuras.Mixin(areaAnchors, OptionsPrivate.Private.GetAnchorsForData(child, "area"))
   end
 
-  -- TODO verfiy order being ordered
   local options = {
     __title = L["Texture %s"]:format(subIndex),
     __order = 1,

WeakAurasOptions/WeakAurasOptions.toc

@@ -1,7 +1,7 @@
 ## Interface: 30300
 ## Title: WeakAuras Options
 ## Author: The WeakAuras Team
-## Version: 5.13.2
+## Version: 5.19.0
 ## Notes: Options for WeakAuras
 ## Notes-esES: Opciones para WeakAuras
 ## Notes-deDE: Optionen für WeakAuras
@@ -20,6 +20,7 @@ locales.xml
 VersionCheck.lua
 ForAllIndentsAndPurposes.lua
 
+RegionOptions\Empty.lua
 RegionOptions\AuraBar.lua
 RegionOptions\Texture.lua
 RegionOptions\Icon.lua
@@ -58,6 +59,8 @@ WeakAurasOptions.lua
 ConditionOptions.lua
 AuthorOptions.lua
 
+Changelog.lua
+
 OptionsFrames\OptionsFrame.lua
 
 # Groups