diff --git a/Titan/Titan.toc b/Titan/Titan.toc index e996dd5..cb62455 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 80000 -## Title: Titan Panel |cff00aa005.14.0.80000|r +## Title: Titan Panel |cff00aa005.14.1.80000|r ## Author: Titan Development Team -## Version: 5.14.0.80000 +## Version: 5.14.1.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/TitanPanel.lua b/Titan/TitanPanel.lua index 3264414..22267ba 100644 --- a/Titan/TitanPanel.lua +++ b/Titan/TitanPanel.lua @@ -127,7 +127,7 @@ function TitanPanel_SaveCustomProfile() StaticPopupDialogs["TITAN_RELOADUI"] = { text = TitanUtils_GetNormalText(L["TITAN_PANEL_MENU_TITLE"]).."\n\n" ..L["TITAN_PANEL_MENU_PROFILE_RELOADUI"], - button1 = TEXT(OKAY), + button1 = "OKAY", OnAccept = function(self) ReloadUI(); -- ensure profile is written to disk end, diff --git a/Titan/locale/Localization.RU.lua b/Titan/locale/Localization.RU.lua index 7b96680..193b86a 100644 --- a/Titan/locale/Localization.RU.lua +++ b/Titan/locale/Localization.RU.lua @@ -345,7 +345,7 @@ L["TITAN_LOOTTYPE_ROUND_ROBIN"] = "По очереди"; L["TITAN_LOOTTYPE_MASTER_LOOTER"] = "Ответственный за добычу"; L["TITAN_LOOTTYPE_GROUP_LOOT"] = "Групповая очередь"; L["TITAN_LOOTTYPE_NEED_BEFORE_GREED"] = "Приоритет по нужности"; -L["TITAN_LOOTTYPE_PERSONAL"] = "Personal"; +L["TITAN_LOOTTYPE_PERSONAL"] = "Персонализированная"; L["TITAN_LOOTTYPE_TOOLTIP"] = "Информация о типе добычи"; L["TITAN_LOOTTYPE_MENU_TEXT"] = "Тип добычи"; L["TITAN_LOOTTYPE_RANDOM_ROLL_LABEL"] = "Случайный бросок костей"; diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index ad139c1..a99bc5f 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index 18dffcd..f10f2bb 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.1.80000|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index 3512f05..f7dbd57 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index 1842cef..584fd0c 100644 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -66,9 +66,8 @@ end -- DESC : Display button when plugin is visible -- ************************************************************************** function TitanPanelLocationButton_OnShow() --- SetMapToCurrentZone(); # Deprecated in WoW 8.0.1 - local mapID = C_Map.GetBestMapForUnit("player") - WorldMapFrame:SetMapID(mapID) + local mapID = C_Map.GetBestMapForUnit("player"); + WorldMapFrame:SetMapID(mapID); TitanPanelLocation_HandleUpdater(); end @@ -155,9 +154,9 @@ function TitanPanelLocationButton_GetTooltipText() pvpInfoRichText = TitanUtils_GetGreenText(SANCTUARY_TERRITORY); elseif (TitanPanelLocationButton.pvpType == "arena") then TitanPanelLocationButton.subZoneText = TitanUtils_GetRedText(TitanPanelLocationButton.subZoneText); - pvpInfoRichText = TitanUtils_GetRedText(CONTESTED_TERRITORY); + pvpInfoRichText = TitanUtils_GetRedText(CONTESTED_TERRITORY); elseif (TitanPanelLocationButton.pvpType == "friendly") then - pvpInfoRichText = TitanUtils_GetGreenText(format(FACTION_CONTROLLED_TERRITORY, TitanPanelLocationButton.factionName)); + pvpInfoRichText = TitanUtils_GetGreenText(format(FACTION_CONTROLLED_TERRITORY, TitanPanelLocationButton.factionName)); elseif (TitanPanelLocationButton.pvpType == "hostile") then pvpInfoRichText = TitanUtils_GetRedText(format(FACTION_CONTROLLED_TERRITORY, TitanPanelLocationButton.factionName)); elseif (TitanPanelLocationButton.pvpType == "contested") then @@ -188,7 +187,6 @@ function TitanPanelLocationButton_OnEvent(self, event, ...) end end if TitanGetVar(TITAN_LOCATION_ID, "UpdateWorldmap") then --- SetMapToCurrentZone(); # Deprecated in WoW 8.0.1 local mapID = C_Map.GetBestMapForUnit("player") WorldMapFrame:SetMapID(mapID) end @@ -241,7 +239,7 @@ function TitanPanelLocationButton_OnClick(self, button) else --WorldMap_ToggleSizeUp(); if (not GetCVarBool("miniWorldMap")) then - --WorldMap_ToggleSizeUp(); # Deprecated in WoW 8.0.1 + --/; # Deprecated in WoW 8.0.1 end ToggleFrame(WorldMapFrame); end @@ -446,11 +444,11 @@ end -- ************************************************************************** function TitanMapFrame_OnUpdate(self, elapsed) -- using :Hide / :Show prevents coords from running - -- TitanMapFrame:Hide() -- hide parent + -- TitanMapFrame:Hide() -- hide parent -- Determine the text to show for player coords - -- - if WorldMapFrame_InWindowedMode() then + + if WorldMapFrame:IsVisible() then TitanMapPlayerLocation:SetText(""); else self.px, self.py = C_Map.GetPlayerMapPosition(C_Map.GetBestMapForUnit("player"), "player"):GetXY(); @@ -475,12 +473,12 @@ function TitanMapFrame_OnUpdate(self, elapsed) -- calc cursor position on the map local cursorLocationText, playerLocationText; local x, y = GetCursorPosition(); - x = x / WorldMapDetailFrame:GetEffectiveScale(); - y = y / WorldMapDetailFrame:GetEffectiveScale(); + x = x / WorldMapFrame:GetEffectiveScale(); + y = y / WorldMapFrame:GetEffectiveScale(); - local centerX, centerY = WorldMapDetailFrame:GetCenter(); - local width = WorldMapDetailFrame:GetWidth(); - local height = WorldMapDetailFrame:GetHeight(); + local centerX, centerY = WorldMapFrame:GetCenter(); + local width = WorldMapFrame:GetWidth(); + local height = WorldMapFrame:GetHeight(); local cx = ((x - (centerX - (width/2))) / width) -- OFFSET_X local cy = ((centerY + (height/2) - y ) / height) -- OFFSET_Y -- cut off if the cursor coords are beyond the map, show 0,0 @@ -507,23 +505,12 @@ function TitanMapFrame_OnUpdate(self, elapsed) -- * TitanMapPlayerLocation:ClearAllPoints() - if ( WorldMapFrame_InWindowedMode() ) then + if ( WorldMapFrame:IsVisible() ) then -- ** TitanMapPlayerLocation:SetPoint("TOPLEFT", WorldMapFrame, "TOPLEFT", 75, -12) else - x_offset = (WorldMapDetailFrame:GetWidth() / 1.6) -- left fifth of map + x_offset = (WorldMapFrame:GetWidth() / 1.6) -- left fifth of map - (TitanMapPlayerLocation:GetWidth() / 1.8) -- center of coords TitanMapPlayerLocation:SetPoint("BOTTOMLEFT", WorldMapFrame, "BOTTOMLEFT", x_offset, 10) end end - ---[[ --- ************************************************************************** --- NAME : TitanPanel_GetPlayerMapPosition() --- DESC : Determine location of player --- ************************************************************************** -function TitanPanel_GetPlayerMapPosition() - local MapPosData = C_Map.GetPlayerMapPosition(C_Map.GetBestMapForUnit("player"),("player")); - return MapPosData.x,MapPosData.y -end -]]-- \ No newline at end of file diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index 13d1ff1..42061cf 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 8b3808c..d551c30 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.lua b/TitanPerformance/TitanPerformance.lua index bebd161..5e7ffc8 100644 --- a/TitanPerformance/TitanPerformance.lua +++ b/TitanPerformance/TitanPerformance.lua @@ -108,6 +108,9 @@ function TitanPanelPerformanceButton_OnEvent(self, event, ...) end end +--TitanDebug("NumOfAddons: " .. TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons")); +--TitanDebug("ActiveAddons: " .. ActiveAddons); + if ActiveAddons < TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons") then counter = ActiveAddons; else diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 193400d..13320e9 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index 79e8e02..6e1b6ac 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index e3fad67..880a8ef 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index cf218c5..072f5bd 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.0.80000|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.1.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.0.80000 +## Version: 5.14.1.80000 ## X-Child-Of: Titan TitanXP.xml