Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ElvUI
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Hekili
ElvUI
Commits
002a426c
Commit
002a426c
authored
Apr 09, 2019
by
Simpy
🐹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development'
parents
fe53220b
6c4c6afe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
10 deletions
+14
-10
ElvUI/ElvUI.toc
ElvUI/ElvUI.toc
+1
-1
ElvUI/Libraries/oUF/units.lua
ElvUI/Libraries/oUF/units.lua
+5
-3
ElvUI/Modules/ActionBars/ActionBars.lua
ElvUI/Modules/ActionBars/ActionBars.lua
+5
-5
ElvUI/Modules/Misc/TotemBar.lua
ElvUI/Modules/Misc/TotemBar.lua
+2
-0
ElvUI/Settings/Global.lua
ElvUI/Settings/Global.lua
+1
-1
No files found.
ElvUI/ElvUI.toc
View file @
002a426c
## Interface: 80100
## Author: Elv
## Version: 11.0
8
## Version: 11.0
9
## Title: |cfffe7b2cElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
...
...
ElvUI/Libraries/oUF/units.lua
View file @
002a426c
...
...
@@ -131,9 +131,11 @@ local function updateArenaPreparation(self, event)
local
specID
=
GetArenaOpponentSpec
(
id
)
if
(
specID
)
then
-- disable the unit watch so we can forcefully show the object ourselves
self
:
Disable
()
self
:
RegisterEvent
(
'ARENA_OPPONENT_UPDATE'
,
updateArenaPreparation
)
if
(
self
:
IsEnabled
())
then
-- disable the unit watch so we can forcefully show the object ourselves
self
:
Disable
()
self
:
RegisterEvent
(
'ARENA_OPPONENT_UPDATE'
,
updateArenaPreparation
)
end
-- update Health and Power (if available) with "fake" data
updateArenaPreparationElements
(
self
,
event
,
'Health'
,
specID
)
...
...
ElvUI/Modules/ActionBars/ActionBars.lua
View file @
002a426c
...
...
@@ -1076,13 +1076,13 @@ end
function
AB
:
LAB_MouseUp
()
if
self
.
config
.
clickOnDown
then
self
.
pushed
:
SetAlpha
(
0
)
self
:
GetPushedTexture
()
:
SetAlpha
(
0
)
end
end
function
AB
:
LAB_MouseDown
()
if
self
.
config
.
clickOnDown
then
self
.
pushed
:
SetAlpha
(
1
)
self
:
GetPushedTexture
()
:
SetAlpha
(
1
)
end
end
...
...
@@ -1106,14 +1106,14 @@ end
function
AB
:
LAB_CooldownUpdate
(
button
,
_
,
duration
)
if
button
.
_state_type
~=
"action"
then
return
end
button
.
cooldown
.
hideText
=
(
button
.
cooldown
.
isChargeCooldown
and
not
AB
.
db
.
chargeCooldown
)
or
nil
button
.
cooldown
.
hideText
=
(
button
.
cooldown
.
isChargeCooldown
and
(
AB
.
db
.
chargeCooldown
==
false
)
)
or
nil
SetButtonDesaturation
(
button
,
AB
.
db
.
desaturateOnCooldown
,
duration
)
end
function
AB
:
ToggleCooldownOptions
()
for
button
in
pairs
(
LAB
.
actionButtons
)
do
local
oldstate
=
button
.
cooldown
.
hideText
button
.
cooldown
.
hideText
=
(
button
.
cooldown
.
isChargeCooldown
and
not
AB
.
db
.
chargeCooldown
)
or
nil
button
.
cooldown
.
hideText
=
(
button
.
cooldown
.
isChargeCooldown
and
(
AB
.
db
.
chargeCooldown
==
false
)
)
or
nil
if
button
.
cooldown
.
timer
and
(
oldstate
~=
button
.
cooldown
.
hideText
)
then
E
:
Cooldown_ForceUpdate
(
button
.
cooldown
.
timer
)
end
...
...
@@ -1121,7 +1121,7 @@ function AB:ToggleCooldownOptions()
SetButtonDesaturation
(
button
,
AB
.
db
.
desaturateOnCooldown
)
end
if
AB
.
db
.
desaturateOnCooldown
or
AB
.
db
.
chargeCooldown
then
if
AB
.
db
.
desaturateOnCooldown
or
(
AB
.
db
.
chargeCooldown
==
false
)
then
LAB
.
RegisterCallback
(
AB
,
"OnCooldownUpdate"
,
AB
.
LAB_CooldownUpdate
)
LAB
.
RegisterCallback
(
AB
,
"OnCooldownDone"
,
AB
.
LAB_CooldownDone
)
else
...
...
ElvUI/Modules/Misc/TotemBar.lua
View file @
002a426c
...
...
@@ -110,6 +110,8 @@ function TOTEMS:Initialize()
frame
.
iconTexture
=
frame
:
CreateTexture
(
nil
,
'ARTWORK'
)
frame
.
iconTexture
:
SetInside
()
frame
.
iconTexture
:
SetTexCoord
(
unpack
(
E
.
TexCoords
))
frame
.
iconTexture
:
SetSnapToPixelGrid
(
false
)
frame
.
iconTexture
:
SetTexelSnappingBias
(
0
)
frame
.
cooldown
=
CreateFrame
(
'Cooldown'
,
frame
:
GetName
()
..
'Cooldown'
,
frame
,
'CooldownFrameTemplate'
)
frame
.
cooldown
:
SetReverse
(
true
)
...
...
ElvUI/Settings/Global.lua
View file @
002a426c
...
...
@@ -3,7 +3,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
--Global Settings
G
.
general
=
{
UIScale
=
0
.
64
,
version
=
11
.
0
8
,
version
=
11
.
0
9
,
eyefinity
=
false
,
ignoreScalePopup
=
false
,
smallerWorldMap
=
true
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment