Merge remote-tracking branch 'origin' into develop

Author: TannerShmoog

AnnounceReset.lua

@@ -21,7 +21,7 @@ local function AnnounceInstanceReset(_, msg, ...)
                 end
             end
         elseif strmatch(msg, failedreset) then
-            local playersStillInside = " Anyone still inside can exit and re-enter"
+            local playersStillInside = " Any players still inside will need to exit and then re-enter."
             if (UnitIsGroupLeader("player")) then
                 if (IsInRaid()) then
                     SendChatMessage(addon.instanceResetString .. playersStillInside, "RAID")

Core.lua

@@ -1875,6 +1875,7 @@ function addon:OnInitialize()
             LFGMsgGearType = 3,
             defaultLFGModeOn = false,
             showedv160InfoPopup = false,
+
             --Auto Response Types:
             -- 1 : Respond to Global Friends, but only when You are in Town
             -- 2 : Respond to Local Friends & Guildies, but only when You are in Town
@@ -1948,6 +1949,7 @@ function addon:OnInitialize()
             gearSummaryTooltips = true,
             charSheetGear = true,
             announceInstanceReset = true,
+            showedv161InfoPopup = false,
         }
     }
 
@@ -2832,11 +2834,11 @@ function addon.SetupConfig()
     addon.db.global.lastServer = currentServer
 
 
-    if not addon.db.char.showedv160InfoPopup then
-        addon.db.char.showedv160InfoPopup = true
+    if not addon.db.global.showedv161InfoPopup then
+        addon.db.global.showedv161InfoPopup = true
         local PopupFrame = nil
         local POPUP_WINDOW_WIDTH = 400
-        local POPUP_WINDOW_HEIGHT = 400
+        local POPUP_WINDOW_HEIGHT = 450
         PopupFrame = CreateFrame("Frame", "GroupiePopUp", UIParent, "PortraitFrameTemplate")
         PopupFrame:Hide()
         PopupFrame:SetFrameStrata("DIALOG")
@@ -2870,12 +2872,12 @@ function addon.SetupConfig()
         local PopupGroupieTitle = PopupFrame:CreateFontString("FontString", "OVERLAY", "GameFontNormalMed1")
         PopupGroupieTitle:SetPoint("TOP", PopupFrame, "TOP", 0, -36)
         PopupGroupieTitle:SetWidth(POPUP_WINDOW_WIDTH - 32)
-        PopupGroupieTitle:SetText("Groupie 1.60")
+        PopupGroupieTitle:SetText("Groupie 1.61")
         --Info Text
         local PopupMsg = PopupFrame:CreateFontString("FontString", "OVERLAY", "GameFontHighlight")
         PopupMsg:SetPoint("TOPLEFT", PopupFrame, "TOPLEFT", 16, -64)
         PopupMsg:SetWidth(POPUP_WINDOW_WIDTH - 32)
-        PopupMsg:SetText("Hola Amigo, we've got some changes for you.\n\n1) LFG Auto-Response is a new feature that responds to your Friends and Guildies when they create 5-man groups. It's enabled by default. To turn it off, or change what sort of groups it responds to, check out the Options Interface. You can also toggle LFG Auto Response by Right Clicking on the Groupie Mini-map Icon.\n\n2) We've re-worked the \"challenge\" messages when you're being invited to a group, or someone requests to join your group. By default, we've disabled these messages when someone invites you, and kept on the \"What role are you?...\" messages when someone requests to join your group. These messages don't fire at all when someone messages you before inviting or requesting to join, and you can tweak the behavior in the Options Interface.\n\nCheers!")
+        PopupMsg:SetText("LFG Auto-Response has been Disabled by default on Start-up; to Enable it just Right click the Groupie Mini-map Icon.\n\nFixed a few other bugs.\n---\nGroupie 1.60\n\nHola Amigo, we've got some changes for you.\n\n1) LFG Auto-Response is a new feature that responds to your Friends and Guildies when they create 5-man groups. It's enabled by default. To turn it off, or change what sort of groups it responds to, check out the Options Interface. You can also toggle LFG Auto Response by Right Clicking on the Groupie Mini-map Icon.\n\n2) We've re-worked the \"challenge\" messages when you're being invited to a group, or someone requests to join your group. By default, we've disabled these messages when someone invites you, and kept on the \"What role are you?...\" messages when someone requests to join your group. These messages don't fire at all when someone messages you before inviting or requesting to join, and you can tweak the behavior in the Options Interface.\n\nCheers!")
         PopupMsg:SetJustifyH("LEFT")
         --Edit Box for Discord Link
         local PopupEditBox = CreateFrame("EditBox", "GroupieEditBoxPopup", PopupFrame, "InputBoxTemplate")

Groupie.toc

@@ -20,4 +20,4 @@ GroupBrowser.lua
 RightClick.lua
 Listener.lua
 AutoResponse.lua
-AnnounceReset.lua
+AnnounceReset.lua