WoWInterface SVN SliceCommander

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 231 to Rev 232
    ↔ Reverse comparison
  •

Rev 231 → Rev 232

trunk/SliceCommander.lua
15,7 → 15,7
end
 
function SliceCommander:PlaySound(name)
if SliceCommander:isCombat() and name ~= 'None'--[[and SC.SET.SpellSound]] then
if SliceCommander:isCombat() and name ~= 'None' and name ~= nil then
SliceCommander:PlaySoundReal(name)
end
end
trunk/Core/Settings.lua
883,11 → 883,11
name = SC_SPELL['BF'],
type = "group",
args = {
BFShow = SliceCommander:getShowSetting('AR'),
BFPos = SliceCommander:getPosSetting('AR'),
BFColor = SliceCommander:getColorSetting('AR'),
BFCDShow = SliceCommander:getShowSetting('ARCD'),
BFCDColor = SliceCommander:getColorSetting('ARCD'),
BFShow = SliceCommander:getShowSetting('BF'),
BFPos = SliceCommander:getPosSetting('BF'),
BFColor = SliceCommander:getColorSetting('BF'),
BFCDShow = SliceCommander:getShowSetting('BFCD'),
BFCDColor = SliceCommander:getColorSetting('BFCD'),
BFIcon = {
order = SliceCommander:getOrder(),
name = string.format(L["Show %s icon"], SC_SPELL['BF']),
917,6 → 917,7
desc = L["Enable mario star music during Adrenaline rush buff"],
type = "toggle",
set = function(info,val)
if SC.BARS['AR']['sound'] == nil then SC.BARS['AR']['sound'] = {} end
if val then
SliceCommander:PlaySoundReal('Mario')
SC.BARS['AR']['sound']['applied'] = 'Mario'
trunk/Core/Config.lua
478,7 → 478,7
_G['SC'].BARS['SOD']['pandemictimer'] = nil
_G['SC'].BARS['SOD']['pandemicobj'] = nil
end
--if _G['SC'].version < '8.00' then
if _G['SC'].version < '8.00' then
_G['SC'].SET.Pos['CB'] = nil--REMOVE CANONBALL BARAGE
_G['SC'].BARS['CB'] = nil
_G['SC'].SET.Pos['HEM'] = nil--REMOVE Hemorrhage
492,7 → 492,7
_G['SC'].SET.RB['RP'] = 'Crit'
_G['SC'].SET.Pos['STHCD'] = nil--REMOVE CANONBALL BARAGE
_G['SC'].BARS['STHCD'] = nil
--end
end
_G['SC'].version = GetAddOnMetadata("SliceCommander", "Version")
end
end
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
1,7 → 1,7
--[[-----------------------------------------------------------------------------
Checkbox Widget
-------------------------------------------------------------------------------]]
local Type, Version = "CheckBox", 24
local Type, Version = "CheckBox", 25
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
26,7 → 26,7
self.text:SetPoint("LEFT", self.checkbg, "RIGHT")
self.text:SetPoint("RIGHT")
else
self.text:SetPoint("LEFT", self.checkbg, "RIGHT", self.image:GetWidth() + 2, 0)
self.text:SetPoint("LEFT", self.image, "RIGHT", 1, 0)
self.text:SetPoint("RIGHT")
end
end
trunk/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
2,7 → 2,7
ScrollFrame Container
Plain container that scrolls its content and doesn't grow in height.
-------------------------------------------------------------------------------]]
local Type, Version = "ScrollFrame", 24
local Type, Version = "ScrollFrame", 25
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
128,6 → 128,11
 
["LayoutFinished"] = function(self, width, height)
self.content:SetHeight(height or 0 + 20)
 
-- update the scrollframe
self:FixScroll()
 
-- schedule another update when everything has "settled"
self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate)
end,
 
trunk/SliceCommander.toc
1,6 → 1,6
## Interface: 80000
## Author: Tomate
## Version: 8.00
## Version: 8.01
## Title: |cffc14f2cSlice|r|cff40a740Commander|r
## Notes: Energy bar, Combo point bar and rogue timer bar.
## SavedVariables: SC