Permalink
Browse files

Bugfixing

  • Loading branch information...
1 parent 8305b5a commit 956d0fd91fdc2d91621670f3fd358913a213e8ff @Jaliborc Jaliborc committed Jul 25, 2013
Showing with 9 additions and 9 deletions.
  1. +1 −1 OmniCC.toc
  2. +3 −3 core/cooldown.lua
  3. +1 −1 core/timer.lua
  4. +4 −4 settings/settings.lua
View
@@ -3,7 +3,7 @@
## Notes: Cooldown count for everything
## Notes-koKR: 모든 것을 위한 쿨다운 카운트
## Author: Tuller
-## Version: 5.3.1
+## Version: 5.3.2
## SavedVariables: OmniCC4Config
libs\libs.xml
View
@@ -13,13 +13,14 @@ function Cooldown:Start(...)
Cooldown.UpdateOpacity(self)
if Cooldown.CanShow(self, ...) then
- Cooldown.Start(self, ...)
+ Cooldown.Setup(self)
+ self.omnicc:Start(...)
else
Cooldown.Stop(self)
end
end
-function Cooldown:Start(...)
+function Cooldown:Setup()
if not self.omnicc then
self:HookScript('OnShow', Cooldown.OnShow)
self:HookScript('OnHide', Cooldown.OnHide)
@@ -28,7 +29,6 @@ function Cooldown:Start(...)
end
OmniCC:SetupEffect(self)
- self.omnicc:Start(...)
end
function Cooldown:Stop()
View
@@ -258,7 +258,7 @@ function Timer:ForAll(func, ...)
func = self[func]
for cooldown in pairs(OmniCC.Cache) do
- if cooldown.omnicc then
+ if cooldown.omnicc and cooldown.omnicc:IsShown() then
func(cooldown.omnicc, ...)
end
end
View
@@ -11,7 +11,7 @@ local GROUP_DEFAULTS = {
fontFace = STANDARD_TEXT_FONT,
fontSize = 18,
fontOutline = 'OUTLINE',
- minDuration = 3,
+ minDuration = 2,
minSize = 0.5,
effect = 'pulse',
minEffectDuration = 30,
@@ -38,8 +38,8 @@ local GROUP_DEFAULTS = {
scale = .75
},
charging = {
- r = .8, g = .8, b = .8, a = .7,
- scale = .75
+ r = 1, g = .98, b = .4, a = .8,
+ scale = .65
}
}
}
@@ -101,7 +101,7 @@ function OmniCC:UpgradeSettings()
end
end
- if version < 50301 then
+ if version < 50302 then
for _, group in pairs(groups) do
group.styles.charging = GROUP_DEFAULTS.styles.charging
end

0 comments on commit 956d0fd

Please sign in to comment.