diff --git a/Titan/Titan.toc b/Titan/Titan.toc index a11f6d8..33859fe 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 80000 -## Title: Titan Panel |cff00aa005.14.2.80000|r +## Title: Titan Panel |cff00aa005.14.3.80000|r ## Author: Titan Development Team -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/Titan/TitanMovable.lua b/Titan/TitanMovable.lua index 6cce7b1..88a4779 100755 --- a/Titan/TitanMovable.lua +++ b/Titan/TitanMovable.lua @@ -598,6 +598,7 @@ function Titan_ManageFramesTest1() if Titan__InitializedPEW then -- We know the desired bars are now drawn so we can adjust if InCombatLockdown() then + -- nothing else --TitanDebug ("Titan_ManageFramesTest1 ") left = floor(OverrideActionBar:GetLeft() + 0.5) diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index abcc726..0168c7a 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.3.80000|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index c5725e1..d7f3ea6 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.3.80000|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index dc26bb0..728fc6b 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.3.80000|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index b55df87..79dd1e2 100644 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -67,13 +67,9 @@ end -- ************************************************************************** function TitanPanelLocationButton_OnShow() local mapID = C_Map.GetBestMapForUnit("player"); -<<<<<<< HEAD if mapID ~= nil then WorldMapFrame:SetMapID(mapID); end -======= - WorldMapFrame:SetMapID(mapID); ->>>>>>> parent of b7802a1... Throw away... TitanPanelLocation_HandleUpdater(); end @@ -194,13 +190,9 @@ function TitanPanelLocationButton_OnEvent(self, event, ...) end if TitanGetVar(TITAN_LOCATION_ID, "UpdateWorldmap") then local mapID = C_Map.GetBestMapForUnit("player") -<<<<<<< HEAD if mapID ~= nil then WorldMapFrame:SetMapID(mapID); end -======= - WorldMapFrame:SetMapID(mapID) ->>>>>>> parent of b7802a1... Throw away... end TitanPanelLocationButton_UpdateZoneInfo(self); TitanPanelPluginHandle_OnUpdate(updateTable); diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index 96f1dfe..f5f241e 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.3.80000|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index c9b22f3..0364a3c 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.3.80000|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.lua b/TitanPerformance/TitanPerformance.lua index 1754d8e..b0589ac 100644 --- a/TitanPerformance/TitanPerformance.lua +++ b/TitanPerformance/TitanPerformance.lua @@ -102,35 +102,21 @@ function TitanPanelPerformanceButton_OnEvent(self, event, ...) -- scan how many addons are active local count = GetNumAddOns(); local ActiveAddons = 0; -<<<<<<< HEAD local NumOfAddons = TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons"); if NumOfAddons == nil then NumOfAddons = 5; TitanSetVar(TITAN_PERFORMANCE_ID, "NumOfAddons", 5); end -======= ->>>>>>> parent of b7802a1... Throw away... for i=1, count do if IsAddOnLoaded(i) then ActiveAddons = ActiveAddons + 1; end end -<<<<<<< HEAD --TitanDebug("NumOfAddons: " .. TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons")); if ActiveAddons < NumOfAddons then counter = ActiveAddons; else counter = NumOfAddons; -======= - ---TitanDebug("NumOfAddons: " .. TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons")); ---TitanDebug("ActiveAddons: " .. ActiveAddons); - - if ActiveAddons < TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons") then - counter = ActiveAddons; - else - counter = TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons"); ->>>>>>> parent of b7802a1... Throw away... end --set the counter to the proper number of active addons that are being monitored for i=1, counter do diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 0947974..4652c87 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.3.80000|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index 4e1ec7e..860c312 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.3.80000|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index ffa2356..7e7c1f4 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.3.80000|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index 3eeb742..fc51584 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.2.80000|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.3.80000|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.2.80000 +## Version: 5.14.3.80000 ## X-Child-Of: Titan TitanXP.xml