Skip to content

Commit

Permalink
Merge pull request #13 from cralor/dev
Browse files Browse the repository at this point in the history
Classic v1.0.0-alpha
  • Loading branch information
cralor authored Sep 28, 2019
2 parents dc44cd3 + a268140 commit d3cba9c
Show file tree
Hide file tree
Showing 9 changed files with 2,213 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Broker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function dataobj.OnClick(self, btn)
else
if IsShiftKeyDown() then TourGuide:SetTurnedIn()
else
local i = GetQuestLogIndexByID(TourGuide:GetObjectiveTag("QID", TourGuide.current))
local i = TourGuide:GetQuestLogIndexByID(TourGuide:GetObjectiveTag("QID", TourGuide.current))
if i then SelectQuestLogEntry(i) end
ShowUIPanel(QuestLogFrame)
end
Expand Down
4 changes: 2 additions & 2 deletions ObjectivesFrame.lua
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ function TourGuide:CreateObjectivePanel()

upbutt:SetScript("OnClick", function(f)
scrollbar:SetValue(offset - NUMROWS + 1)
PlaySound("UChatScrollButton")
PlaySound(SOUNDKIT.U_CHAT_SCROLL_BUTTON)
end)

downbutt:SetScript("OnClick", function(f)
scrollbar:SetValue(offset + NUMROWS - 1)
PlaySound("UChatScrollButton")
PlaySound(SOUNDKIT.U_CHAT_SCROLL_BUTTON)
end)

local bg = {bgFile = "Interface/Tooltips/UI-Tooltip-Background"}
Expand Down
6 changes: 5 additions & 1 deletion TourGuide.lua
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,15 @@ function TourGuide:GetQuestLogIndexByName(name)
end
end

function TourGuide:GetQuestLogIndexByID(qid)
local index = GetQuestLogIndexByID(qid)
if (index > 0) then return index end
end

function TourGuide:GetQuestDetails(name, qid, qo)
if not name then return end

local i = qid and GetQuestLogIndexByID(qid) or self:GetQuestLogIndexByName(name)
local i = qid and self:GetQuestLogIndexByID(qid) or self:GetQuestLogIndexByName(name)
local complete = i and (qo and self:IsQuestObjectiveComplete(i, qo) or select(6, GetQuestLogTitle(i)) == 1)
return i, complete
end
Expand Down
6 changes: 3 additions & 3 deletions libs/OptionHouse.lua
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,13 @@ end
local function scrollButtonUp(self)
local parent = self:GetParent()
parent:SetValue(parent:GetValue() - (parent:GetHeight() / 2))
PlaySound("UChatScrollButton")
PlaySound(SOUNDKIT.U_CHAT_SCROLL_BUTTON)
end

local function scrollButtonDown(self)
local parent = self:GetParent()
parent:SetValue(parent:GetValue() + (parent:GetHeight() / 2))
PlaySound("UChatScrollButton")
PlaySound(SOUNDKIT.U_CHAT_SCROLL_BUTTON)
end

local function createScrollFrame(frame, displayNum, onScroll)
Expand Down Expand Up @@ -1318,7 +1318,7 @@ local function instanceLoaded()
local menubutton = CreateFrame("Button", "GameMenuButtonOptionHouse", GameMenuFrame, "GameMenuButtonTemplate")
menubutton:SetText(L["OPTION_HOUSE"])
menubutton:SetScript("OnClick", function()
PlaySound("igMainMenuOption")
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION)
HideUIPanel(GameMenuFrame)
SlashCmdList["OPTHOUSE"]()
end)
Expand Down
2 changes: 1 addition & 1 deletion libs/tekKonfig/tekKonfigCheckbox.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ local function ShowTooltip(self)
GameTooltip:SetText(self.tiptext, nil, nil, nil, nil, true)
end
end
local function OnClick(self) PlaySound(self:GetChecked() and "igMainMenuOptionCheckBoxOn" or "igMainMenuOptionCheckBoxOff") end
local function OnClick(self) PlaySound(self:GetChecked() and SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON or SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF) end


-- Creates a checkbox.
Expand Down
2 changes: 1 addition & 1 deletion libs/tekKonfig/tekKonfigDropdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ local function ShowTooltip2(self) ShowTooltip(self.container) end

local function OnClick(self)
ToggleDropDownMenu(nil, nil, self:GetParent())
PlaySound("igMainMenuOptionCheckBoxOn")
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON)
end

local function OnHide() CloseDropDownMenus() end
Expand Down
4 changes: 2 additions & 2 deletions libs/tekKonfig/tekKonfigScroll.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function lib.new(parent, offset, step)
up:SetScript("OnClick", function(self)
local parent = self:GetParent()
parent:SetValue(parent:GetValue() - (step or parent:GetHeight()/2))
PlaySound("UChatScrollButton")
PlaySound(SOUNDKIT.U_CHAT_SCROLL_BUTTON)
end)

local down = CreateFrame("Button", nil, f)
Expand All @@ -56,7 +56,7 @@ function lib.new(parent, offset, step)
down:SetScript("OnClick", function(self)
local parent = self:GetParent()
parent:SetValue(parent:GetValue() + (step or parent:GetHeight()/2))
PlaySound("UChatScrollButton")
PlaySound(SOUNDKIT.U_CHAT_SCROLL_BUTTON)
end)

f:SetThumbTexture("Interface\\Buttons\\UI-ScrollBar-Knob")
Expand Down
45 changes: 45 additions & 0 deletions utils/changelog.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/bin/bash

version=$( git describe --tags --always )
tag=$( git describe --tags --always --abbrev=0 )
topdir=

if [ "$version" = "$tag" ]; then # on a tag
current="$tag"
previous=$( git describe --tags --abbrev=0 HEAD~ )
else
current=$( git log -1 --format="%H" )
previous="$tag"
fi

# Set $topdir to top-level directory of the checkout.
if [ -z "$topdir" ]; then
dir=$( pwd )
if [ -d "$dir/.git" -o -d "$dir/.svn" -o -d "$dir/.hg" ]; then
topdir=.
else
dir=${dir%/*}
topdir=..
while [ -n "$dir" ]; do
if [ -d "$topdir/.git" -o -d "$topdir/.svn" -o -d "$topdir/.hg" ]; then
break
fi
dir=${dir%/*}
topdir="$topdir/.."
done
if [ ! -d "$topdir/.git" -a ! -d "$topdir/.svn" -a ! -d "$topdir/.hg" ]; then
echo "No Git, SVN, or Hg checkout found." >&2
exit 1
fi
fi
fi

date=$( git log -1 --date=short --format="%ad" )
url=$( git remote get-url origin | sed -e 's/^git@\(.*\):/https:\/\/\1\//' -e 's/\.git$//' )
#title='# '${url##*/}
title="# TourGuide - Classic"

echo -ne "# [${version}](${url}/tree/${current}) ($date)\n\n[Full Changelog](${url}/compare/${previous}...${current})\n\n" > "$topdir/CHANGELOG.md"
git shortlog --no-merges --reverse "$previous..$current" | sed -e '/^\w/G' -e 's/^ /- /' >> "$topdir/CHANGELOG.md"
#git log --pretty=format:"###%s" "$previous..$current" | sed -e 's/^/ /g' -e 's/^ *$//g' -e 's/^ ###/- /g' -e 's/$/ /' >> "$topdir/CHANGELOG.md"
#echo >> "CHANGELOG.md"
Loading

0 comments on commit d3cba9c

Please sign in to comment.