Merge remote-tracking branch 'origin/dev'

This commit is contained in:
Dayve
2016-08-30 20:24:17 +10:00
2 changed files with 5 additions and 7 deletions

View File

@@ -111,10 +111,8 @@ function launch:OnFrame()
end
function launch:OnKeyDown(key, doubleClick)
if key == "F5" then
if self.devMode then
self.doRestart = "Restarting..."
end
if key == "F5" and self.devMode then
self.doRestart = "Restarting..."
elseif key == "u" and IsKeyDown("CTRL") then
if not self.devMode then
self:CheckForUpdate()

View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.0.0"/>
<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
<File sha1="3b829b912c1a86e71a473e977c70785ed3661ccf" name="Launch.lua" part="program"/>
<Source part="program" url="file://localhost/E:/Lua/PathOfBuilding/dev/"/>
<Source url="file://localhost/E:/Lua/PathOfBuilding/dev/runtime-win32.zip" part="runtime" platform="win32"/>
<File sha1="61015c55ce37b065d24a70cf3f35ed3f66f5cb7b" name="Launch.lua" part="program"/>
<File sha1="769b039de92cbad79837d7522991afd8801f4d2a" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="e224aa616614ec9c1e82bf1de31cf03332237fba" name="Classes/BuildListControl.lua" part="program"/>