Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Klix
ElvUI
Commits
32a63aa7
Commit
32a63aa7
authored
Dec 26, 2017
by
Blazeflack
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development'
# Conflicts: # CHANGELOG.md
parents
27ead846
6f343df3
Changes
245
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
245 changed files
with
1817 additions
and
776 deletions
+1817
-776
ElvUI/ElvUI.toc
ElvUI/ElvUI.toc
+1
-1
ElvUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua
ElvUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua
+8
-3
ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua
ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua
+48
-48
ElvUI/Libraries/oUF/elements/castbar.lua
ElvUI/Libraries/oUF/elements/castbar.lua
+19
-2
ElvUI/Libraries/oUF/ouf.lua
ElvUI/Libraries/oUF/ouf.lua
+70
-4
ElvUI/Modules/DataBars/Artifact.lua
ElvUI/Modules/DataBars/Artifact.lua
+1
-1
ElvUI/Modules/DataBars/DataBars.lua
ElvUI/Modules/DataBars/DataBars.lua
+1
-1
ElvUI/Modules/DataBars/Experience.lua
ElvUI/Modules/DataBars/Experience.lua
+1
-1
ElvUI/Modules/DataBars/Honor.lua
ElvUI/Modules/DataBars/Honor.lua
+1
-1
ElvUI/Modules/DataBars/Reputation.lua
ElvUI/Modules/DataBars/Reputation.lua
+20
-17
ElvUI/Modules/actionbars/Bind.lua
ElvUI/Modules/actionbars/Bind.lua
+1
-1
ElvUI/Modules/actionbars/actionbars.lua
ElvUI/Modules/actionbars/actionbars.lua
+75
-4
ElvUI/Modules/actionbars/extra.lua
ElvUI/Modules/actionbars/extra.lua
+1
-1
ElvUI/Modules/actionbars/microbar.lua
ElvUI/Modules/actionbars/microbar.lua
+24
-9
ElvUI/Modules/actionbars/petBar.lua
ElvUI/Modules/actionbars/petBar.lua
+1
-1
ElvUI/Modules/actionbars/stanceBar.lua
ElvUI/Modules/actionbars/stanceBar.lua
+8
-17
ElvUI/Modules/auras/auras.lua
ElvUI/Modules/auras/auras.lua
+1
-1
ElvUI/Modules/bags/bagbar.lua
ElvUI/Modules/bags/bagbar.lua
+10
-1
ElvUI/Modules/bags/bags.lua
ElvUI/Modules/bags/bags.lua
+13
-2
ElvUI/Modules/bags/sort.lua
ElvUI/Modules/bags/sort.lua
+20
-3
ElvUI/Modules/blizzard/blizzard.lua
ElvUI/Modules/blizzard/blizzard.lua
+1
-1
ElvUI/Modules/blizzard/colorpicker.lua
ElvUI/Modules/blizzard/colorpicker.lua
+17
-1
ElvUI/Modules/blizzard/kill.lua
ElvUI/Modules/blizzard/kill.lua
+0
-1
ElvUI/Modules/chat/chat.lua
ElvUI/Modules/chat/chat.lua
+121
-70
ElvUI/Modules/datatexts/Currencies.lua
ElvUI/Modules/datatexts/Currencies.lua
+9
-2
ElvUI/Modules/datatexts/CustomCurrency.lua
ElvUI/Modules/datatexts/CustomCurrency.lua
+1
-1
ElvUI/Modules/datatexts/armor.lua
ElvUI/Modules/datatexts/armor.lua
+1
-1
ElvUI/Modules/datatexts/attackpower.lua
ElvUI/Modules/datatexts/attackpower.lua
+1
-1
ElvUI/Modules/datatexts/avoidance.lua
ElvUI/Modules/datatexts/avoidance.lua
+1
-1
ElvUI/Modules/datatexts/bags.lua
ElvUI/Modules/datatexts/bags.lua
+1
-1
ElvUI/Modules/datatexts/battleground.lua
ElvUI/Modules/datatexts/battleground.lua
+1
-1
ElvUI/Modules/datatexts/calltoarms.lua
ElvUI/Modules/datatexts/calltoarms.lua
+1
-1
ElvUI/Modules/datatexts/combattime.lua
ElvUI/Modules/datatexts/combattime.lua
+1
-1
ElvUI/Modules/datatexts/coordinates.lua
ElvUI/Modules/datatexts/coordinates.lua
+1
-1
ElvUI/Modules/datatexts/crit.lua
ElvUI/Modules/datatexts/crit.lua
+1
-1
ElvUI/Modules/datatexts/datatexts.lua
ElvUI/Modules/datatexts/datatexts.lua
+1
-1
ElvUI/Modules/datatexts/dps.lua
ElvUI/Modules/datatexts/dps.lua
+1
-1
ElvUI/Modules/datatexts/durability.lua
ElvUI/Modules/datatexts/durability.lua
+1
-1
ElvUI/Modules/datatexts/elvuiconfig.lua
ElvUI/Modules/datatexts/elvuiconfig.lua
+1
-1
ElvUI/Modules/datatexts/friends.lua
ElvUI/Modules/datatexts/friends.lua
+183
-108
ElvUI/Modules/datatexts/garrison.lua
ElvUI/Modules/datatexts/garrison.lua
+1
-1
ElvUI/Modules/datatexts/gold.lua
ElvUI/Modules/datatexts/gold.lua
+12
-4
ElvUI/Modules/datatexts/guild.lua
ElvUI/Modules/datatexts/guild.lua
+1
-1
ElvUI/Modules/datatexts/haste.lua
ElvUI/Modules/datatexts/haste.lua
+1
-1
ElvUI/Modules/datatexts/hps.lua
ElvUI/Modules/datatexts/hps.lua
+1
-1
ElvUI/Modules/datatexts/leech.lua
ElvUI/Modules/datatexts/leech.lua
+1
-1
ElvUI/Modules/datatexts/mastery.lua
ElvUI/Modules/datatexts/mastery.lua
+1
-1
ElvUI/Modules/datatexts/movementspeed.lua
ElvUI/Modules/datatexts/movementspeed.lua
+3
-3
ElvUI/Modules/datatexts/orderhall.lua
ElvUI/Modules/datatexts/orderhall.lua
+1
-1
ElvUI/Modules/datatexts/regen.lua
ElvUI/Modules/datatexts/regen.lua
+1
-1
ElvUI/Modules/datatexts/specswitch.lua
ElvUI/Modules/datatexts/specswitch.lua
+1
-1
ElvUI/Modules/datatexts/speed.lua
ElvUI/Modules/datatexts/speed.lua
+1
-1
ElvUI/Modules/datatexts/spellpower.lua
ElvUI/Modules/datatexts/spellpower.lua
+1
-1
ElvUI/Modules/datatexts/system.lua
ElvUI/Modules/datatexts/system.lua
+1
-1
ElvUI/Modules/datatexts/template.lua
ElvUI/Modules/datatexts/template.lua
+1
-1
ElvUI/Modules/datatexts/time.lua
ElvUI/Modules/datatexts/time.lua
+1
-1
ElvUI/Modules/datatexts/versatility.lua
ElvUI/Modules/datatexts/versatility.lua
+1
-1
ElvUI/Modules/maps/minimap.lua
ElvUI/Modules/maps/minimap.lua
+1
-1
ElvUI/Modules/maps/worldmap.lua
ElvUI/Modules/maps/worldmap.lua
+1
-1
ElvUI/Modules/misc/afk.lua
ElvUI/Modules/misc/afk.lua
+1
-1
ElvUI/Modules/misc/character_ilvl.lua
ElvUI/Modules/misc/character_ilvl.lua
+1
-1
ElvUI/Modules/misc/chatBubbles.lua
ElvUI/Modules/misc/chatBubbles.lua
+1
-1
ElvUI/Modules/misc/debugTools.lua
ElvUI/Modules/misc/debugTools.lua
+1
-1
ElvUI/Modules/misc/loot.lua
ElvUI/Modules/misc/loot.lua
+1
-1
ElvUI/Modules/misc/loot_roll.lua
ElvUI/Modules/misc/loot_roll.lua
+1
-1
ElvUI/Modules/misc/misc.lua
ElvUI/Modules/misc/misc.lua
+35
-11
ElvUI/Modules/misc/raidmarker.lua
ElvUI/Modules/misc/raidmarker.lua
+1
-1
ElvUI/Modules/misc/threat.lua
ElvUI/Modules/misc/threat.lua
+1
-1
ElvUI/Modules/misc/totemBar.lua
ElvUI/Modules/misc/totemBar.lua
+1
-1
ElvUI/Modules/nameplates/StyleFilter.lua
ElvUI/Modules/nameplates/StyleFilter.lua
+72
-17
ElvUI/Modules/nameplates/elements/Detection.lua
ElvUI/Modules/nameplates/elements/Detection.lua
+1
-1
ElvUI/Modules/nameplates/elements/NPCTitle.lua
ElvUI/Modules/nameplates/elements/NPCTitle.lua
+1
-1
ElvUI/Modules/nameplates/elements/auras.lua
ElvUI/Modules/nameplates/elements/auras.lua
+1
-1
ElvUI/Modules/nameplates/elements/castBar.lua
ElvUI/Modules/nameplates/elements/castBar.lua
+1
-1
ElvUI/Modules/nameplates/elements/elite.lua
ElvUI/Modules/nameplates/elements/elite.lua
+1
-1
ElvUI/Modules/nameplates/elements/glow.lua
ElvUI/Modules/nameplates/elements/glow.lua
+1
-1
ElvUI/Modules/nameplates/elements/healerIcon.lua
ElvUI/Modules/nameplates/elements/healerIcon.lua
+6
-3
ElvUI/Modules/nameplates/elements/healthBar.lua
ElvUI/Modules/nameplates/elements/healthBar.lua
+4
-2
ElvUI/Modules/nameplates/elements/highlight.lua
ElvUI/Modules/nameplates/elements/highlight.lua
+1
-1
ElvUI/Modules/nameplates/elements/level.lua
ElvUI/Modules/nameplates/elements/level.lua
+1
-1
ElvUI/Modules/nameplates/elements/name.lua
ElvUI/Modules/nameplates/elements/name.lua
+1
-1
ElvUI/Modules/nameplates/elements/portrait.lua
ElvUI/Modules/nameplates/elements/portrait.lua
+1
-1
ElvUI/Modules/nameplates/elements/powerBar.lua
ElvUI/Modules/nameplates/elements/powerBar.lua
+1
-1
ElvUI/Modules/nameplates/elements/raidIcon.lua
ElvUI/Modules/nameplates/elements/raidIcon.lua
+1
-1
ElvUI/Modules/nameplates/elements/threat.lua
ElvUI/Modules/nameplates/elements/threat.lua
+1
-1
ElvUI/Modules/nameplates/nameplates.lua
ElvUI/Modules/nameplates/nameplates.lua
+137
-51
ElvUI/Modules/skins/addons/ace3.lua
ElvUI/Modules/skins/addons/ace3.lua
+1
-1
ElvUI/Modules/skins/blizzard/AdventureMap.lua
ElvUI/Modules/skins/blizzard/AdventureMap.lua
+1
-1
ElvUI/Modules/skins/blizzard/BNet.lua
ElvUI/Modules/skins/blizzard/BNet.lua
+1
-1
ElvUI/Modules/skins/blizzard/BlizzardOptions.lua
ElvUI/Modules/skins/blizzard/BlizzardOptions.lua
+1
-1
ElvUI/Modules/skins/blizzard/Contribution.lua
ElvUI/Modules/skins/blizzard/Contribution.lua
+1
-1
ElvUI/Modules/skins/blizzard/Obliterum.lua
ElvUI/Modules/skins/blizzard/Obliterum.lua
+1
-1
ElvUI/Modules/skins/blizzard/achievement.lua
ElvUI/Modules/skins/blizzard/achievement.lua
+1
-1
ElvUI/Modules/skins/blizzard/addonmanager.lua
ElvUI/Modules/skins/blizzard/addonmanager.lua
+1
-1
ElvUI/Modules/skins/blizzard/alerts.lua
ElvUI/Modules/skins/blizzard/alerts.lua
+1
-1
ElvUI/Modules/skins/blizzard/archaeology.lua
ElvUI/Modules/skins/blizzard/archaeology.lua
+1
-1
ElvUI/Modules/skins/blizzard/artifact.lua
ElvUI/Modules/skins/blizzard/artifact.lua
+13
-1
ElvUI/Modules/skins/blizzard/auctionhouse.lua
ElvUI/Modules/skins/blizzard/auctionhouse.lua
+1
-1
ElvUI/Modules/skins/blizzard/bags.lua
ElvUI/Modules/skins/blizzard/bags.lua
+1
-1
ElvUI/Modules/skins/blizzard/barber.lua
ElvUI/Modules/skins/blizzard/barber.lua
+1
-1
ElvUI/Modules/skins/blizzard/bgmap.lua
ElvUI/Modules/skins/blizzard/bgmap.lua
+1
-1
ElvUI/Modules/skins/blizzard/bgscore.lua
ElvUI/Modules/skins/blizzard/bgscore.lua
+1
-1
ElvUI/Modules/skins/blizzard/binding.lua
ElvUI/Modules/skins/blizzard/binding.lua
+1
-1
ElvUI/Modules/skins/blizzard/blackmarket.lua
ElvUI/Modules/skins/blizzard/blackmarket.lua
+1
-1
ElvUI/Modules/skins/blizzard/calendar.lua
ElvUI/Modules/skins/blizzard/calendar.lua
+1
-1
ElvUI/Modules/skins/blizzard/character.lua
ElvUI/Modules/skins/blizzard/character.lua
+1
-1
ElvUI/Modules/skins/blizzard/collectables.lua
ElvUI/Modules/skins/blizzard/collectables.lua
+2
-1
ElvUI/Modules/skins/blizzard/deathRecap.lua
ElvUI/Modules/skins/blizzard/deathRecap.lua
+1
-1
ElvUI/Modules/skins/blizzard/debug.lua
ElvUI/Modules/skins/blizzard/debug.lua
+98
-11
ElvUI/Modules/skins/blizzard/dressingroom.lua
ElvUI/Modules/skins/blizzard/dressingroom.lua
+1
-1
ElvUI/Modules/skins/blizzard/encounterjournal.lua
ElvUI/Modules/skins/blizzard/encounterjournal.lua
+1
-1
ElvUI/Modules/skins/blizzard/flightmap.lua
ElvUI/Modules/skins/blizzard/flightmap.lua
+1
-1
ElvUI/Modules/skins/blizzard/friends.lua
ElvUI/Modules/skins/blizzard/friends.lua
+1
-1
ElvUI/Modules/skins/blizzard/garrison.lua
ElvUI/Modules/skins/blizzard/garrison.lua
+1
-1
ElvUI/Modules/skins/blizzard/gbank.lua
ElvUI/Modules/skins/blizzard/gbank.lua
+1
-1
ElvUI/Modules/skins/blizzard/gossip.lua
ElvUI/Modules/skins/blizzard/gossip.lua
+1
-1
ElvUI/Modules/skins/blizzard/guild.lua
ElvUI/Modules/skins/blizzard/guild.lua
+1
-1
ElvUI/Modules/skins/blizzard/guildcontrol.lua
ElvUI/Modules/skins/blizzard/guildcontrol.lua
+1
-1
ElvUI/Modules/skins/blizzard/guildregistrar.lua
ElvUI/Modules/skins/blizzard/guildregistrar.lua
+1
-1
ElvUI/Modules/skins/blizzard/help.lua
ElvUI/Modules/skins/blizzard/help.lua
+1
-1
ElvUI/Modules/skins/blizzard/inspect.lua
ElvUI/Modules/skins/blizzard/inspect.lua
+1
-1
ElvUI/Modules/skins/blizzard/itemupgrade.lua
ElvUI/Modules/skins/blizzard/itemupgrade.lua
+1
-1
ElvUI/Modules/skins/blizzard/lfg.lua
ElvUI/Modules/skins/blizzard/lfg.lua
+1
-1
ElvUI/Modules/skins/blizzard/lfguild.lua
ElvUI/Modules/skins/blizzard/lfguild.lua
+1
-1
ElvUI/Modules/skins/blizzard/loot.lua
ElvUI/Modules/skins/blizzard/loot.lua
+40
-11
ElvUI/Modules/skins/blizzard/losscontrol.lua
ElvUI/Modules/skins/blizzard/losscontrol.lua
+1
-1
ElvUI/Modules/skins/blizzard/macro.lua
ElvUI/Modules/skins/blizzard/macro.lua
+1
-1
ElvUI/Modules/skins/blizzard/mail.lua
ElvUI/Modules/skins/blizzard/mail.lua
+1
-1
ElvUI/Modules/skins/blizzard/merchant.lua
ElvUI/Modules/skins/blizzard/merchant.lua
+1
-1
ElvUI/Modules/skins/blizzard/mirrortimers.lua
ElvUI/Modules/skins/blizzard/mirrortimers.lua
+1
-1
ElvUI/Modules/skins/blizzard/misc.lua
ElvUI/Modules/skins/blizzard/misc.lua
+15
-87
ElvUI/Modules/skins/blizzard/nonraid.lua
ElvUI/Modules/skins/blizzard/nonraid.lua
+1
-1
ElvUI/Modules/skins/blizzard/objectivetracker.lua
ElvUI/Modules/skins/blizzard/objectivetracker.lua
+1
-1
ElvUI/Modules/skins/blizzard/orderhall.lua
ElvUI/Modules/skins/blizzard/orderhall.lua
+1
-1
ElvUI/Modules/skins/blizzard/petbattle.lua
ElvUI/Modules/skins/blizzard/petbattle.lua
+1
-1
ElvUI/Modules/skins/blizzard/petition.lua
ElvUI/Modules/skins/blizzard/petition.lua
+1
-1
ElvUI/Modules/skins/blizzard/pvp.lua
ElvUI/Modules/skins/blizzard/pvp.lua
+1
-1
ElvUI/Modules/skins/blizzard/quest.lua
ElvUI/Modules/skins/blizzard/quest.lua
+1
-1
ElvUI/Modules/skins/blizzard/questchoice.lua
ElvUI/Modules/skins/blizzard/questchoice.lua
+1
-1
ElvUI/Modules/skins/blizzard/raid.lua
ElvUI/Modules/skins/blizzard/raid.lua
+1
-1
ElvUI/Modules/skins/blizzard/socket.lua
ElvUI/Modules/skins/blizzard/socket.lua
+1
-1
ElvUI/Modules/skins/blizzard/spellbook.lua
ElvUI/Modules/skins/blizzard/spellbook.lua
+1
-1
ElvUI/Modules/skins/blizzard/tabard.lua
ElvUI/Modules/skins/blizzard/tabard.lua
+1
-1
ElvUI/Modules/skins/blizzard/talent.lua
ElvUI/Modules/skins/blizzard/talent.lua
+1
-1
ElvUI/Modules/skins/blizzard/talkinghead.lua
ElvUI/Modules/skins/blizzard/talkinghead.lua
+1
-1
ElvUI/Modules/skins/blizzard/taxi.lua
ElvUI/Modules/skins/blizzard/taxi.lua
+1
-1
ElvUI/Modules/skins/blizzard/timemanager.lua
ElvUI/Modules/skins/blizzard/timemanager.lua
+1
-1
ElvUI/Modules/skins/blizzard/tooltip.lua
ElvUI/Modules/skins/blizzard/tooltip.lua
+1
-1
ElvUI/Modules/skins/blizzard/trade.lua
ElvUI/Modules/skins/blizzard/trade.lua
+1
-1
ElvUI/Modules/skins/blizzard/tradeskill.lua
ElvUI/Modules/skins/blizzard/tradeskill.lua
+1
-3
ElvUI/Modules/skins/blizzard/trainer.lua
ElvUI/Modules/skins/blizzard/trainer.lua
+1
-1
ElvUI/Modules/skins/blizzard/voidstorage.lua
ElvUI/Modules/skins/blizzard/voidstorage.lua
+1
-1
ElvUI/Modules/skins/blizzard/worldmap.lua
ElvUI/Modules/skins/blizzard/worldmap.lua
+1
-1
ElvUI/Modules/skins/skins.lua
ElvUI/Modules/skins/skins.lua
+1
-1
ElvUI/Modules/tooltip/tooltip.lua
ElvUI/Modules/tooltip/tooltip.lua
+1
-1
ElvUI/Modules/unitframes/config_enviroment.lua
ElvUI/Modules/unitframes/config_enviroment.lua
+1
-1
ElvUI/Modules/unitframes/config_units.lua
ElvUI/Modules/unitframes/config_units.lua
+1
-1
ElvUI/Modules/unitframes/elements/aurabars.lua
ElvUI/Modules/unitframes/elements/aurabars.lua
+1
-1
ElvUI/Modules/unitframes/elements/auras.lua
ElvUI/Modules/unitframes/elements/auras.lua
+1
-1
ElvUI/Modules/unitframes/elements/castbar.lua
ElvUI/Modules/unitframes/elements/castbar.lua
+1
-1
ElvUI/Modules/unitframes/elements/classbars.lua
ElvUI/Modules/unitframes/elements/classbars.lua
+1
-1
ElvUI/Modules/unitframes/elements/healprediction.lua
ElvUI/Modules/unitframes/elements/healprediction.lua
+1
-1
ElvUI/Modules/unitframes/elements/health.lua
ElvUI/Modules/unitframes/elements/health.lua
+1
-1
ElvUI/Modules/unitframes/elements/infopanel.lua
ElvUI/Modules/unitframes/elements/infopanel.lua
+1
-1
ElvUI/Modules/unitframes/elements/name.lua
ElvUI/Modules/unitframes/elements/name.lua
+1
-1
ElvUI/Modules/unitframes/elements/portrait.lua
ElvUI/Modules/unitframes/elements/portrait.lua
+1
-1
ElvUI/Modules/unitframes/elements/power.lua
ElvUI/Modules/unitframes/elements/power.lua
+1
-1
ElvUI/Modules/unitframes/elements/raidicon.lua
ElvUI/Modules/unitframes/elements/raidicon.lua
+1
-1
ElvUI/Modules/unitframes/elements/roleicons.lua
ElvUI/Modules/unitframes/elements/roleicons.lua
+19
-2
ElvUI/Modules/unitframes/elements/threat.lua
ElvUI/Modules/unitframes/elements/threat.lua
+1
-1
ElvUI/Modules/unitframes/groups/arena.lua
ElvUI/Modules/unitframes/groups/arena.lua
+1
-1
ElvUI/Modules/unitframes/groups/assist.lua
ElvUI/Modules/unitframes/groups/assist.lua
+1
-1
ElvUI/Modules/unitframes/groups/boss.lua
ElvUI/Modules/unitframes/groups/boss.lua
+1
-1
ElvUI/Modules/unitframes/groups/party.lua
ElvUI/Modules/unitframes/groups/party.lua
+1
-1
ElvUI/Modules/unitframes/groups/raid.lua
ElvUI/Modules/unitframes/groups/raid.lua
+1
-1
ElvUI/Modules/unitframes/groups/raid40.lua
ElvUI/Modules/unitframes/groups/raid40.lua
+1
-1
ElvUI/Modules/unitframes/groups/raidPets.lua
ElvUI/Modules/unitframes/groups/raidPets.lua
+1
-1
ElvUI/Modules/unitframes/groups/tank.lua
ElvUI/Modules/unitframes/groups/tank.lua
+1
-1
ElvUI/Modules/unitframes/tags.lua
ElvUI/Modules/unitframes/tags.lua
+1
-1
ElvUI/Modules/unitframes/unitframes.lua
ElvUI/Modules/unitframes/unitframes.lua
+5
-3
ElvUI/Modules/unitframes/units/focus.lua
ElvUI/Modules/unitframes/units/focus.lua
+1
-1
ElvUI/Modules/unitframes/units/focustarget.lua
ElvUI/Modules/unitframes/units/focustarget.lua
+1
-1
ElvUI/Modules/unitframes/units/pet.lua
ElvUI/Modules/unitframes/units/pet.lua
+1
-1
ElvUI/Modules/unitframes/units/pettarget.lua
ElvUI/Modules/unitframes/units/pettarget.lua
+1
-1
ElvUI/Modules/unitframes/units/player.lua
ElvUI/Modules/unitframes/units/player.lua
+1
-1
ElvUI/Modules/unitframes/units/target.lua
ElvUI/Modules/unitframes/units/target.lua
+1
-1
ElvUI/Modules/unitframes/units/targettarget.lua
ElvUI/Modules/unitframes/units/targettarget.lua
+1
-1
ElvUI/Modules/unitframes/units/targettargettarget.lua
ElvUI/Modules/unitframes/units/targettargettarget.lua
+1
-1
ElvUI/Settings/Filters/NamePlate.lua
ElvUI/Settings/Filters/NamePlate.lua
+2
-0
ElvUI/Settings/Filters/UnitFrame.lua
ElvUI/Settings/Filters/UnitFrame.lua
+62
-4
ElvUI/Settings/Global.lua
ElvUI/Settings/Global.lua
+1
-1
ElvUI/Settings/Private.lua
ElvUI/Settings/Private.lua
+1
-1
ElvUI/Settings/Profile.lua
ElvUI/Settings/Profile.lua
+9
-2
ElvUI/core/animation.lua
ElvUI/core/animation.lua
+1
-1
ElvUI/core/commands.lua
ElvUI/core/commands.lua
+1
-1
ElvUI/core/config.lua
ElvUI/core/config.lua
+1
-1
ElvUI/core/cooldowns.lua
ElvUI/core/cooldowns.lua
+1
-1
ElvUI/core/core.lua
ElvUI/core/core.lua
+86
-4
ElvUI/core/distributor.lua
ElvUI/core/distributor.lua
+1
-1
ElvUI/core/dropdown.lua
ElvUI/core/dropdown.lua
+1
-1
ElvUI/core/fonts.lua
ElvUI/core/fonts.lua
+1
-1
ElvUI/core/install.lua
ElvUI/core/install.lua
+2
-2
ElvUI/core/math.lua
ElvUI/core/math.lua
+15
-15
ElvUI/core/movers.lua
ElvUI/core/movers.lua
+1
-1
ElvUI/core/pixelperfect.lua
ElvUI/core/pixelperfect.lua
+1
-1
ElvUI/core/pluginInstaller.lua
ElvUI/core/pluginInstaller.lua
+1
-1
ElvUI/core/staticpopups.lua
ElvUI/core/staticpopups.lua
+2
-1
ElvUI/core/toolkit.lua
ElvUI/core/toolkit.lua
+1
-1
ElvUI/core/tutorials.lua
ElvUI/core/tutorials.lua
+1
-1
ElvUI/layout/layout.lua
ElvUI/layout/layout.lua
+1
-1
ElvUI/locales/chinese_ui.lua
ElvUI/locales/chinese_ui.lua
+5
-3
ElvUI/locales/english_ui.lua
ElvUI/locales/english_ui.lua
+2
-0
ElvUI/locales/french_ui.lua
ElvUI/locales/french_ui.lua
+2
-0
ElvUI/locales/german_ui.lua
ElvUI/locales/german_ui.lua
+2
-0
ElvUI/locales/korean_ui.lua
ElvUI/locales/korean_ui.lua
+2
-0
ElvUI/locales/portuguese_ui.lua
ElvUI/locales/portuguese_ui.lua
+2
-0
ElvUI/locales/russian_ui.lua
ElvUI/locales/russian_ui.lua
+2
-0
ElvUI/locales/spanish_ui.lua
ElvUI/locales/spanish_ui.lua
+2
-0
ElvUI/locales/taiwanese_ui.lua
ElvUI/locales/taiwanese_ui.lua
+4
-2
ElvUI/media/textures/chatLogos/elvui_blue.tga
ElvUI/media/textures/chatLogos/elvui_blue.tga
+0
-0
ElvUI/media/textures/chatLogos/elvui_orange.tga
ElvUI/media/textures/chatLogos/elvui_orange.tga
+0
-0
ElvUI/media/textures/chatLogos/elvui_pink.tga
ElvUI/media/textures/chatLogos/elvui_pink.tga
+0
-0
ElvUI/media/textures/chatLogos/elvui_purple.tga
ElvUI/media/textures/chatLogos/elvui_purple.tga
+0
-0
ElvUI/media/textures/chatLogos/elvui_red.tga
ElvUI/media/textures/chatLogos/elvui_red.tga
+0
-0
ElvUI_Config/DataBars.lua
ElvUI_Config/DataBars.lua
+1
-1
ElvUI_Config/actionbars.lua
ElvUI_Config/actionbars.lua
+56
-11
ElvUI_Config/bags.lua
ElvUI_Config/bags.lua
+15
-0
ElvUI_Config/chat.lua
ElvUI_Config/chat.lua
+1
-1
ElvUI_Config/core.lua
ElvUI_Config/core.lua
+1
-1
ElvUI_Config/datatexts.lua
ElvUI_Config/datatexts.lua
+1
-1
ElvUI_Config/filters.lua
ElvUI_Config/filters.lua
+1
-1
ElvUI_Config/locales/chinese_config.lua
ElvUI_Config/locales/chinese_config.lua
+18
-4
ElvUI_Config/locales/english_config.lua
ElvUI_Config/locales/english_config.lua
+14
-0
ElvUI_Config/locales/french_config.lua
ElvUI_Config/locales/french_config.lua
+14
-0
ElvUI_Config/locales/german_config.lua
ElvUI_Config/locales/german_config.lua
+15
-0
ElvUI_Config/locales/korean_config.lua
ElvUI_Config/locales/korean_config.lua
+14
-0
ElvUI_Config/locales/portuguese_config.lua
ElvUI_Config/locales/portuguese_config.lua
+14
-0
ElvUI_Config/locales/russian_config.lua
ElvUI_Config/locales/russian_config.lua
+14
-0
ElvUI_Config/locales/spanish_config.lua
ElvUI_Config/locales/spanish_config.lua
+14
-0
ElvUI_Config/locales/taiwanese_config.lua
ElvUI_Config/locales/taiwanese_config.lua
+14
-0
ElvUI_Config/nameplates.lua
ElvUI_Config/nameplates.lua
+111
-45
ElvUI_Config/skins.lua
ElvUI_Config/skins.lua
+1
-1
ElvUI_Config/tag_info.lua
ElvUI_Config/tag_info.lua
+1
-1
ElvUI_Config/tooltip.lua
ElvUI_Config/tooltip.lua
+1
-1
ElvUI_Config/unitframes.lua
ElvUI_Config/unitframes.lua
+16
-1
No files found.
ElvUI/ElvUI.toc
View file @
32a63aa7
## Interface: 70300
## Author: Elv
## Version: 10.
69
## Version: 10.
70
## Title: |cfffe7b2cElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
...
...
ElvUI/Libraries/LibActionButton-1.0/LibActionButton-1.0.lua
View file @
32a63aa7
...
...
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
]]
local
MAJOR_VERSION
=
"LibActionButton-1.0-ElvUI"
local
MINOR_VERSION
=
1
1
local
MINOR_VERSION
=
1
3
if
not
LibStub
then
error
(
MAJOR_VERSION
..
" requires LibStub."
)
end
local
lib
,
oldversion
=
LibStub
:
NewLibrary
(
MAJOR_VERSION
,
MINOR_VERSION
)
...
...
@@ -1133,7 +1133,9 @@ function Update(self)
-- Zone ability button handling
self
.
zoneAbilityDisabled
=
false
self
.
icon
:
SetDesaturated
(
false
)
if
not
self
.
saturationLocked
then
self
.
icon
:
SetDesaturated
(
false
)
end
if
self
.
_state_type
==
"action"
then
local
action_type
,
id
=
GetActionInfo
(
self
.
_state_action
)
if
((
action_type
==
"spell"
or
action_type
==
"companion"
)
and
ZoneAbilityFrame
and
ZoneAbilityFrame
.
baseName
and
not
HasZoneAbility
())
then
...
...
@@ -1142,7 +1144,9 @@ function Update(self)
if
name
==
abilityName
then
texture
=
GetLastZoneAbilitySpellTexture
()
self
.
zoneAbilityDisabled
=
true
self
.
icon
:
SetDesaturated
(
true
)
if
not
self
.
saturationLocked
then
self
.
icon
:
SetDesaturated
(
true
)
end
end
end
end
...
...
@@ -1333,6 +1337,7 @@ function UpdateCooldown(self)
end
CooldownFrame_Set
(
self
.
cooldown
,
start
,
duration
,
enable
,
false
,
modRate
)
end
lib
.
callbacks
:
Fire
(
"OnCooldownUpdate"
,
self
,
start
,
duration
,
enable
,
modRate
)
end
function
StartFlash
(
self
)
...
...
ElvUI/Libraries/LibElvUIPlugin-1.0/LibElvUIPlugin-1.0.lua
View file @
32a63aa7
local
MAJOR
,
MINOR
=
"LibElvUIPlugin-1.0"
,
1
5
local
MAJOR
,
MINOR
=
"LibElvUIPlugin-1.0"
,
1
8
local
lib
,
oldminor
=
LibStub
:
NewLibrary
(
MAJOR
,
MINOR
)
if
not
lib
then
return
end
--Cache global variables
--Lua functions
local
pairs
,
tonumber
=
pairs
,
tonumber
local
format
,
strsplit
,
gsub
=
format
,
strsplit
,
gsub
local
pairs
,
tonumber
,
strmatch
,
strsub
=
pairs
,
tonumber
,
strmatch
,
strsub
local
format
,
strsplit
,
strlen
,
gsub
,
ceil
=
format
,
strsplit
,
strlen
,
gsub
,
ceil
--WoW
API
/
Variables
local
CreateFrame
=
CreateFrame
local
IsInInstance
,
IsInGroup
,
IsInRaid
=
IsInInstance
,
IsInGroup
,
IsInRaid
local
IsInGroup
,
IsInRaid
=
IsInGroup
,
IsInRaid
local
GetAddOnMetadata
=
GetAddOnMetadata
local
IsAddOnLoaded
=
IsAddOnLoaded
local
RegisterAddonMessagePrefix
=
RegisterAddonMessagePrefix
local
SendAddonMessage
=
SendAddonMessage
local
GetNumGroupMembers
=
GetNumGroupMembers
local
LE_PARTY_CATEGORY_HOME
=
LE_PARTY_CATEGORY_HOME
local
LE_PARTY_CATEGORY_INSTANCE
=
LE_PARTY_CATEGORY_INSTANCE
...
...
@@ -87,11 +88,11 @@ function lib:RegisterPlugin(name,callback, isLib)
if
not
lib
.
ConfigFrame
then
local
configFrame
=
CreateFrame
(
"Frame"
)
configFrame
:
RegisterEvent
(
"ADDON_LOADED"
)
configFrame
:
SetScript
(
"OnEvent"
,
function
(
self
,
event
,
addon
)
configFrame
:
SetScript
(
"OnEvent"
,
function
(
self
,
event
,
addon
)
if
addon
==
"ElvUI_Config"
then
for
_
,
p
lug
i
n
in
pairs
(
lib
.
plugins
)
do
if
(
p
lug
i
n
.
callback
)
then
p
lug
i
n
.
callback
()
for
_
,
P
lug
I
n
in
pairs
(
lib
.
plugins
)
do
if
P
lug
I
n
.
callback
then
P
lug
I
n
.
callback
()
end
end
end
...
...
@@ -151,20 +152,20 @@ end
function
lib
:
VersionCheck
(
event
,
prefix
,
message
,
channel
,
sender
)
local
E
=
ElvUI
[
1
]
if
(
event
==
"CHAT_MSG_ADDON"
)
and
sender
and
message
and
(
message
~=
""
)
and
(
prefix
==
lib
.
prefix
)
then
local
myRealm
=
gsub
(
E.myrealm
,
'[%s%-]'
,
''
)
local
myName
=
E
.
myname
..
'-'
..
myRealm
if
sender
==
myName
then
return
end
if
(
event
==
"CHAT_MSG_ADDON"
)
and
sender
and
message
and
(
not
strmatch
(
message
,
"^%s-$"
))
and
(
prefix
==
lib
.
prefix
)
then
if
not
lib
.
myName
then
lib
.
myName
=
E
.
myname
..
'-'
..
gsub
(
E.myrealm
,
'[%s%-]'
,
''
)
end
if
sender
==
lib
.
myName
then
return
end
if
not
E
[
"pluginRecievedOutOfDateMessage"
]
then
local
name
,
version
,
plugin
,
Pname
for
_
,
p
in
pairs
({
strsplit
(
";"
,
message
)})
do
if
not
p
:
match
(
"^%s-$"
)
then
local
name
,
version
=
p
:
match
(
"([%w_]+)=([%d%p]+)"
)
if
not
str
match
(
p
,
"^%s-$"
)
then
name
,
version
=
str
match
(
p
,
"([%w_]+)=([%d%p]+)"
)
if
lib
.
plugins
[
name
]
then
local
plugin
=
lib
.
plugins
[
name
]
plugin
=
lib
.
plugins
[
name
]
if
plugin
.
version
~=
'BETA'
and
version
~=
nil
and
tonumber
(
version
)
~=
nil
and
plugin
.
version
~=
nil
and
tonumber
(
plugin
.
version
)
~=
nil
and
tonumber
(
version
)
>
tonumber
(
plugin
.
version
)
then
plugin
.
old
=
true
plugin
.
newversion
=
tonumber
(
version
)
local
Pname
=
GetAddOnMetadata
(
plugin
.
name
,
"Title"
)
Pname
=
GetAddOnMetadata
(
plugin
.
name
,
"Title"
)
E
:
Print
(
format
(
MSG_OUTDATED
,
Pname
,
plugin
.
version
,
plugin
.
newversion
))
E
[
"pluginRecievedOutOfDateMessage"
]
=
true
end
...
...
@@ -173,19 +174,28 @@ function lib:VersionCheck(event, prefix, message, channel, sender)
end
end
else
E
.
SendPluginVersionCheck
=
E
.
SendPluginVersionCheck
or
SendPluginVersionCheck
E
[
"ElvUIPluginSendMSGTimer"
]
=
E
:
ScheduleTimer
(
"SendPluginVersionCheck"
,
2
)
if
not
E
.
SendPluginVersionCheck
then
E
.
SendPluginVersionCheck
=
SendPluginVersionCheck
end
local
num
=
GetNumGroupMembers
()
if
num
~=
lib
.
groupSize
then
if
num
>
1
and
lib
.
groupSize
and
num
>
lib
.
groupSize
then
E
[
"ElvUIPluginSendMSGTimer"
]
=
E
:
ScheduleTimer
(
"SendPluginVersionCheck"
,
12
)
end
lib
.
groupSize
=
num
end
end
end
function
lib
:
GeneratePluginList
()
local
list
=
""
local
E
=
ElvUI
[
1
]
local
list
,
E
=
""
,
ElvUI
[
1
]
local
author
,
Pname
,
color
for
_
,
plugin
in
pairs
(
lib
.
plugins
)
do
if
plugin
.
name
~=
MAJOR
then
local
author
=
GetAddOnMetadata
(
plugin
.
name
,
"Author"
)
local
Pname
=
GetAddOnMetadata
(
plugin
.
name
,
"Title"
)
or
plugin
.
name
local
color
=
plugin
.
old
and
E
:
RGBToHex
(
1
,
0
,
0
)
or
E
:
RGBToHex
(
0
,
1
,
0
)
author
=
GetAddOnMetadata
(
plugin
.
name
,
"Author"
)
Pname
=
GetAddOnMetadata
(
plugin
.
name
,
"Title"
)
or
plugin
.
name
color
=
plugin
.
old
and
E
:
RGBToHex
(
1
,
0
,
0
)
or
E
:
RGBToHex
(
0
,
1
,
0
)
list
=
list
..
Pname
if
author
then
list
=
list
..
" "
..
INFO_BY
..
" "
..
author
...
...
@@ -201,34 +211,24 @@ function lib:GeneratePluginList()
end
function
lib
:
SendPluginVersionCheck
(
message
)
if
not
message
or
(
message
==
""
)
then
return
end
local
plist
=
{
strsplit
(
";"
,
message
)}
local
m
=
""
local
delay
=
1
local
E
=
ElvUI
[
1
]
for
_
,
p
in
pairs
(
plist
)
do
if
not
p
:
match
(
"^%s-$"
)
then
if
(
#
(
m
..
p
..
";"
)
<
230
)
then
m
=
m
..
p
..
";"
else
local
_
,
instanceType
=
IsInInstance
()
if
IsInRaid
()
then
E
:
Delay
(
delay
,
SendAddonMessage
(
lib
.
prefix
,
m
,
(
not
IsInRaid
(
LE_PARTY_CATEGORY_HOME
)
and
IsInRaid
(
LE_PARTY_CATEGORY_INSTANCE
))
and
"INSTANCE_CHAT"
or
"RAID"
))
elseif
IsInGroup
()
then
E
:
Delay
(
delay
,
SendAddonMessage
(
lib
.
prefix
,
m
,
(
not
IsInGroup
(
LE_PARTY_CATEGORY_HOME
)
and
IsInGroup
(
LE_PARTY_CATEGORY_INSTANCE
))
and
"INSTANCE_CHAT"
or
"PARTY"
))
end
m
=
p
..
";"
if
(
not
message
)
or
strmatch
(
message
,
"^%s-$"
)
then
return
end
local
ChatType
=
((
not
IsInRaid
(
LE_PARTY_CATEGORY_HOME
)
and
IsInRaid
(
LE_PARTY_CATEGORY_INSTANCE
))
or
(
not
IsInGroup
(
LE_PARTY_CATEGORY_HOME
)
and
IsInGroup
(
LE_PARTY_CATEGORY_INSTANCE
)))
and
"INSTANCE_CHAT"
or
(
IsInRaid
()
and
"RAID"
)
or
(
IsInGroup
()
and
"PARTY"
)
or
nil
if
not
ChatType
then
return
end
local
delay
,
maxChar
,
msgLength
=
0
,
250
,
strlen
(
message
)
if
msgLength
>
maxChar
then
local
splitMessage
for
_
=
1
,
ceil
(
msgLength
/
maxChar
)
do
splitMessage
=
strmatch
(
strsub
(
message
,
1
,
maxChar
),
'.+;'
)
if
splitMessage
then
-- incase the string is over 250 but doesnt contain `;`
message
=
gsub
(
message
,
"^"
..gsub
(
splitMessage
,
'
(
[%
(
%
)
%
.
%%%+%-%*%
?
%
[
%^%
$
])
','
%%%
1
'), "")
ElvUI[1]:Delay(delay, SendAddonMessage, lib.prefix, splitMessage, ChatType)
delay = delay + 1
end
end
end
if
m
==
""
then
return
end
-- Send the last message
local
_
,
instanceType
=
IsInInstance
()
if
IsInRaid
()
then
E
:
Delay
(
delay
+
1
,
SendAddonMessage
(
lib
.
prefix
,
m
,
(
not
IsInRaid
(
LE_PARTY_CATEGORY_HOME
)
and
IsInRaid
(
LE_PARTY_CATEGORY_INSTANCE
))
and
"INSTANCE_CHAT"
or
"RAID"
))
elseif
IsInGroup
()
then
E
:
Delay
(
delay
+
1
,
SendAddonMessage
(
lib
.
prefix
,
m
,
(
not
IsInGroup
(
LE_PARTY_CATEGORY_HOME
)
and
IsInGroup
(
LE_PARTY_CATEGORY_INSTANCE
))
and
"INSTANCE_CHAT"
or
"PARTY"
))
else
SendAddonMessage(lib.prefix, message, ChatType)
end
end
...
...
ElvUI/Libraries/oUF/elements/castbar.lua
View file @
32a63aa7
...
...
@@ -521,7 +521,15 @@ local function onUpdate(self, elapsed)
self
:
SetValue
(
duration
)
if
(
self
.
Spark
)
then
self
.
Spark
:
SetPoint
(
'CENTER'
,
self
,
'LEFT'
,
(
duration
/
self
.
max
)
*
self
:
GetWidth
(),
0
)
local
horiz
=
self
.
horizontal
local
size
=
self
[
horiz
and
'GetWidth'
or
'GetHeight'
](
self
)
local
offset
=
(
duration
/
self
.
max
)
*
size
if
(
self
:
GetReverseFill
())
then
offset
=
size
-
offset
end
self
.
Spark
:
SetPoint
(
'CENTER'
,
self
,
horiz
and
'LEFT'
or
'BOTTOM'
,
horiz
and
offset
or
0
,
horiz
and
0
or
offset
)
end
elseif
(
self
.
channeling
)
then
local
duration
=
self
.
duration
-
elapsed
...
...
@@ -553,7 +561,15 @@ local function onUpdate(self, elapsed)
self
.
duration
=
duration
self
:
SetValue
(
duration
)
if
(
self
.
Spark
)
then
self
.
Spark
:
SetPoint
(
'CENTER'
,
self
,
'LEFT'
,
(
duration
/
self
.
max
)
*
self
:
GetWidth
(),
0
)
local
horiz
=
self
.
horizontal
local
size
=
self
[
horiz
and
'GetWidth'
or
'GetHeight'
](
self
)
local
offset
=
(
duration
/
self
.
max
)
*
size
if
(
self
:
GetReverseFill
())
then
offset
=
size
-
offset
end
self
.
Spark
:
SetPoint
(
'CENTER'
,
self
,
horiz
and
'LEFT'
or
'BOTTOM'
,
horiz
and
offset
or
0
,
horiz
and
0
or
offset
)
end
elseif
(
self
.
holdTime
>
0
)
then
self
.
holdTime
=
self
.
holdTime
-
elapsed
...
...
@@ -596,6 +612,7 @@ local function Enable(self, unit)
self
:
RegisterEvent
(
"UNIT_SPELLCAST_FAILED_QUIET"
,
UNIT_SPELLCAST_FAILED_QUIET
)
end
element
.
horizontal
=
element
:
GetOrientation
()
==
'HORIZONTAL'
element
.
holdTime
=
0
element
:
SetScript
(
'OnUpdate'
,
element
.
OnUpdate
or
onUpdate
)
...
...
ElvUI/Libraries/oUF/ouf.lua
View file @
32a63aa7
...
...
@@ -285,7 +285,12 @@ local function initObject(unit, style, styleFunc, header, ...)
-- No need to enable this for *target frames.
if
(
not
(
unit
:
match
(
'target'
)
or
suffix
==
'target'
))
then
object
:
SetAttribute
(
'toggleForVehicle'
,
true
)
if
(
unit
:
match
(
'raid'
)
or
unit
:
match
(
'party'
))
then
-- See issue #404
object
:
SetAttribute
(
'toggleForVehicle'
,
false
)
else
object
:
SetAttribute
(
'toggleForVehicle'
,
true
)
end
end
-- Other boss and target units are handled by :HandleUnit().
...
...
@@ -519,7 +524,7 @@ do
end
-- There has to be an easier way to do this.
local initialConfigFunction = [[
local initialConfigFunction
Temp
= [[
local header = self:GetParent()
local frames = table.new()
table.insert(frames, self)
...
...
@@ -561,8 +566,7 @@ do
frame
:
SetAttribute
(
'*type1'
,
'target'
)
frame
:
SetAttribute
(
'*type2'
,
'togglemenu'
)
-- BUG: Blizzard has changed the way vehicles work for Antoran High Command
frame
:
SetAttribute
(
'toggleForVehicle'
,
false
)
frame
:
SetAttribute
(
'toggleForVehicle'
,
%
d
==
1
)
-- See issue #404
frame
:
SetAttribute
(
'oUF-guessUnit'
,
unit
)
end
...
...
@@ -581,6 +585,9 @@ do
end
]]
-- Necessary for a vehicle support hack (see issue #404)
local
initialConfigFunction
=
initialConfigFunctionTemp
:
format
(
1
)
--[[ oUF:SpawnHeader(overrideName, template, visibility, ...)
Used to create a group header and apply the currently active style to it.
...
...
@@ -649,6 +656,65 @@ do
return
header
end
-- The remainder of this scope is a temporary fix for issue #404,
-- regarding vehicle support on headers for the Antorus raid instance.
local
isHacked
=
false
local
shouldHack
local
function
toggleHeaders
(
flag
)
for
_
,
header
in
next
,
headers
do
header
:
SetAttribute
(
'initialConfigFunction'
,
initialConfigFunction
)
for
_
,
child
in
next
,
{
header
:
GetChildren
()}
do
child
:
SetAttribute
(
'toggleForVehicle'
,
flag
)
end
end
isHacked
=
not
flag
shouldHack
=
nil
end
local
eventHandler
=
CreateFrame
(
'Frame'
)
eventHandler
:
RegisterEvent
(
'PLAYER_LOGIN'
)
eventHandler
:
RegisterEvent
(
'ZONE_CHANGED_NEW_AREA'
)
eventHandler
:
RegisterEvent
(
'PLAYER_REGEN_ENABLED'
)
eventHandler
:
SetScript
(
'OnEvent'
,
function
(
_
,
event
)
if
(
event
==
'PLAYER_LOGIN'
)
then
local
_
,
_
,
_
,
_
,
_
,
_
,
_
,
id
=
GetInstanceInfo
()
if
(
id
==
1712
)
then
initialConfigFunction
=
initialConfigFunctionTemp
:
format
(
0
)
-- This is here for layouts that don't use oUF:Factory
toggleHeaders
(
false
)
end
elseif
(
event
==
'ZONE_CHANGED_NEW_AREA'
)
then
local
_
,
_
,
_
,
_
,
_
,
_
,
_
,
id
=
GetInstanceInfo
()
if
(
id
==
1712
and
not
isHacked
)
then
initialConfigFunction
=
initialConfigFunctionTemp
:
format
(
0
)
if
(
not
InCombatLockdown
())
then
toggleHeaders
(
false
)
else
shouldHack
=
true
end
elseif
(
isHacked
)
then
initialConfigFunction
=
initialConfigFunctionTemp
:
format
(
1
)
if
(
not
InCombatLockdown
())
then
toggleHeaders
(
true
)
else
shouldHack
=
false
end
end
elseif
(
event
==
'PLAYER_REGEN_ENABLED'
)
then
if
(
isHacked
and
shouldHack
==
false
)
then
toggleHeaders
(
true
)
elseif
(
not
isHacked
and
shouldHack
)
then
toggleHeaders
(
false
)
end
end
end
)
end
--[[ oUF:Spawn(unit, overrideName)
...
...
ElvUI/Modules/DataBars/Artifact.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
mod
=
E
:
GetModule
(
'DataBars'
);
local
LSM
=
LibStub
(
"LibSharedMedia-3.0"
)
local
LAP
=
LibStub
(
"LibArtifactPower-1.0-ElvUI"
)
...
...
ElvUI/Modules/DataBars/DataBars.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
mod
=
E
:
NewModule
(
"DataBars"
,
'AceEvent-3.0'
)
E
.
DataBars
=
mod
...
...
ElvUI/Modules/DataBars/Experience.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
mod
=
E
:
GetModule
(
'DataBars'
);
local
LSM
=
LibStub
(
"LibSharedMedia-3.0"
)
...
...
ElvUI/Modules/DataBars/Honor.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
mod
=
E
:
GetModule
(
'DataBars'
);
local
LSM
=
LibStub
(
"LibSharedMedia-3.0"
)
...
...
ElvUI/Modules/DataBars/Reputation.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
mod
=
E
:
GetModule
(
'DataBars'
);
local
LSM
=
LibStub
(
"LibSharedMedia-3.0"
)
...
...
@@ -25,17 +25,17 @@ function mod:UpdateReputation(event)
if
not
mod
.
db
.
reputation
.
enable
then
return
end
local
bar
=
self
.
repBar
local
ID
local
isFriend
,
friendText
,
standingLabel
local
ID
,
isFriend
,
friendText
,
standingLabel
local
name
,
reaction
,
min
,
max
,
value
,
factionID
=
GetWatchedFactionInfo
()
if
(
C_Reputation_IsFactionParagon
(
factionID
)
)
then
if
factionID
and
C_Reputation_IsFactionParagon
(
factionID
)
then
local
currentValue
,
threshold
,
_
,
hasRewardPending
=
C_Reputation_GetFactionParagonInfo
(
factionID
)
min
,
max
=
0
,
threshold
value
=
currentValue
%
threshold
if
hasRewardPending
then
value
=
value
+
threshold
if
currentValue
and
threshold
then
min
,
max
=
0
,
threshold
value
=
currentValue
%
threshold
if
hasRewardPending
then
value
=
value
+
threshold
end
end
end
...
...
@@ -113,22 +113,25 @@ function mod:ReputationBar_OnEnter()
GameTooltip
:
SetOwner
(
self
,
'ANCHOR_CURSOR'
,
0
,
-
4
)
local
name
,
reaction
,
min
,
max
,
value
,
factionID
=
GetWatchedFactionInfo
()
if
(
C_Reputation_IsFactionParagon
(
factionID
))
then
if
factionID
and
C_Reputation_IsFactionParagon
(
factionID
)
then
local
currentValue
,
threshold
,
_
,
hasRewardPending
=
C_Reputation_GetFactionParagonInfo
(
factionID
)
min
,
max
=
0
,
threshold
value
=
currentValue
%
threshold
if
hasRewardPending
then
value
=
value
+
threshold
if
currentValue
and
threshold
then
min
,
max
=
0
,
threshold
value
=
currentValue
%
threshold
if
hasRewardPending
then
value
=
value
+
threshold
end
end
end
local
friendID
,
_
,
_
,
_
,
_
,
_
,
friendTextLevel
=
GetFriendshipReputation
(
factionID
);
if
name
then
GameTooltip
:
AddLine
(
name
)
GameTooltip
:
AddLine
(
' '
)
GameTooltip
:
AddDoubleLine
(
STANDING
..
':'
,
friendID
and
friendTextLevel
or
_G
[
'FACTION_STANDING_LABEL'
..
reaction
],
1
,
1
,
1
)
local
friendID
,
friendTextLevel
,
_
if
factionID
then
friendID
,
_
,
_
,
_
,
_
,
_
,
friendTextLevel
=
GetFriendshipReputation
(
factionID
)
end
GameTooltip
:
AddDoubleLine
(
STANDING
..
':'
,
(
friendID
and
friendTextLevel
)
or
_G
[
'FACTION_STANDING_LABEL'
..
reaction
],
1
,
1
,
1
)
GameTooltip
:
AddDoubleLine
(
REPUTATION
..
':'
,
format
(
'%d / %d (%d%%)'
,
value
-
min
,
max
-
min
,
(
value
-
min
)
/
((
max
-
min
==
0
)
and
max
or
(
max
-
min
))
*
100
),
1
,
1
,
1
)
end
GameTooltip
:
Show
()
...
...
ElvUI/Modules/actionbars/Bind.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
AB
=
E
:
GetModule
(
'ActionBars'
);
--Cache global variables
...
...
ElvUI/Modules/actionbars/actionbars.lua
View file @
32a63aa7
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
n
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
));
--I
m
port: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local
AB
=
E
:
NewModule
(
'ActionBars'
,
'AceHook-3.0'
,
'AceEvent-3.0'
);
--Cache global variables
...
...
@@ -411,7 +411,18 @@ function AB:CreateBar(id)
end
function
AB
:
PLAYER_REGEN_ENABLED
()
self
:
UpdateButtonSettings
()
if
AB
.
NeedsUpdateButtonSettings
then
self
:
UpdateButtonSettings
()
AB
.
NeedsUpdateButtonSettings
=
nil
end
if
AB
.
NeedsUpdateMicroPositionDimensions
then
self
:
UpdateMicroPositionDimensions
()
AB
.
NeedsUpdateMicroPositionDimensions
=
nil
end
if
AB
.
NeedsAdjustMaxStanceButtons
then
AB
:
AdjustMaxStanceButtons
(
AB
.
NeedsAdjustMaxStanceButtons
)
--sometimes it holds the event, otherwise true. pass it before we nil it.
AB
.
NeedsAdjustMaxStanceButtons
=
nil
end
self
:
UnregisterEvent
(
'PLAYER_REGEN_ENABLED'
)
end
...
...
@@ -561,7 +572,12 @@ end
function
AB
:
UpdateButtonSettings
()
if
E
.
private
.
actionbar
.
enable
~=
true
then
return
end
if
InCombatLockdown
()
then
self
:
RegisterEvent
(
'PLAYER_REGEN_ENABLED'
);
return
;
end
if
InCombatLockdown
()
then
AB
.
NeedsUpdateButtonSettings
=
true
self
:
RegisterEvent
(
'PLAYER_REGEN_ENABLED'
)
return
end
for
button
,
_
in
pairs
(
self
[
"handledbuttons"
])
do
if
button
then
...
...
@@ -881,7 +897,12 @@ function AB:DisableBlizzard()
end