overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
Dayve
2016-11-06 20:04:07 +10:00
parent ccff578c12 375e40dbd9
commit f34453b5e3
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Classes/CalcsTab.lua
View File

@@ -94,6 +94,7 @@ Effective DPS: Curses and enemy properties (such as resistances and status condi
t_insert(section.controls.mainSkill.list, { val = i, label = activeSkill.activeGem.name })
end
section.controls.mainSkill.enabled = #mainSocketGroup.displaySkillList > 1
section.controls.mainSkill.sel = self.input.skill_activeNumber
if mainSocketGroup.displaySkillList[1] then
local activeGem = mainSocketGroup.displaySkillList[self.input.skill_activeNumber].activeGem
if activeGem and activeGem.data.parts and #activeGem.data.parts > 1 then

1
Classes/ConfigTab.lua
View File

@@ -239,7 +239,6 @@ function ConfigTabClass:BuildModList()
self.enemyModList = enemyModList
local input = self.input
for _, varData in ipairs(varList) do
ConPrintf("%s", varData.var)
if varData.apply then
if varData.type == "check" then
if input[varData.var] then

1
Modules/Build.lua
View File

@@ -396,6 +396,7 @@ function buildMode:OnFrame(inputEvents)
t_insert(self.controls.mainSkill.list, { val = i, label = activeSkill.activeGem.name })
end
self.controls.mainSkill.enabled = #mainSocketGroup.displaySkillList > 1
self.controls.mainSkill.sel = mainSocketGroup.mainActiveSkill
self.controls.mainSkill.shown = true
self.controls.mainSkillPart.shown = false
if mainSocketGroup.displaySkillList[1] then

2
Modules/Main.lua
View File

@@ -209,7 +209,7 @@ end
function main:OnFrame()
self.screenW, self.screenH = GetScreenSize()
if self.newMode then
while self.newMode do
if self.mode then
self:CallMode("Shutdown")
end

3
README.md
View File

@@ -49,6 +49,9 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)
## Changelog
### 1.2.4 - 2016/11/06
* Fixed a few minor bugs
### 1.2.3 - 2016/11/04
* Fixed an error in the Calcs tab

2
changelog.txt
View File

@@ -1,3 +1,5 @@
VERSION[1.2.4][2016/11/06]
* Fixed a few minor bugs
VERSION[1.2.3][2016/11/04]
* Fixed an error in the Calcs tab
VERSION[1.2.2][2016/11/04]

12
manifest.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.2.3"/>
<Version number="1.2.4"/>
<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
<File sha1="6bb074e0d3a4043f0e5dcbd25c33f8e5e1f5cfe0" name="Launch.lua" part="program"/>
<File sha1="93e19c2a160eb49993d50d9e2b47ea79962373d9" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="087b39317149e9b6ac5fa6fb0370cd302816258e" name="changelog.txt" part="program"/>
<File sha1="e19fcd02816adb6286fa57ca209d889cb7d62cd3" name="changelog.txt" part="program"/>
<File sha1="ea886e9e8ce013ed7d8805174d43becdca1f533e" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="e42437dd7e1b5a1032f1be9852ede4399a003826" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="8df790619a3284b8ed78075f59dd34d5b00d28a3" name="Classes/CalcBreakdownControl.lua" part="program"/>
<File sha1="23171916fa590c5344b17e67bd8d378574922388" name="Classes/CalcSectionControl.lua" part="program"/>
<File sha1="229eb69a466db4a850a3a2dbd80c3f9259f7f8d2" name="Classes/CalcsTab.lua" part="program"/>
<File sha1="3aa4a21ff644f67a86b891bf261e18c5ce76c193" name="Classes/CalcsTab.lua" part="program"/>
<File sha1="690f0d9d9ba0cd8092eb660d5d83bb0b9ad9f37d" name="Classes/CheckBoxControl.lua" part="program"/>
<File sha1="cc189c54962246366d8d72ac7e4800553696a91f" name="Classes/ConfigTab.lua" part="program"/>
<File sha1="2160cc78127b8bc88e726edc8c1c13b32de818d6" name="Classes/ConfigTab.lua" part="program"/>
<File sha1="bbb08f183746d6ec023e2bd08fb7a89d365381da" name="Classes/Control.lua" part="program"/>
<File sha1="ae55fe1093e727872bc01cc94fa987395f944313" name="Classes/ControlHost.lua" part="program"/>
<File sha1="8305ea8d306a13160c369c474d19b05024a1f5ef" name="Classes/DropDownControl.lua" part="program"/>
@@ -41,14 +41,14 @@
<File sha1="a4f9cc96ba474d0a75c768a0eabec92837e027cf" name="Classes/TextListControl.lua" part="program"/>
<File sha1="8b8fbea27b00c702ea7bcffa6945cc814cc2fa41" name="Classes/TreeTab.lua" part="program"/>
<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
<File sha1="6cae3251c907e4503802f554fb8840976cd7a69b" name="Modules/Build.lua" part="program"/>
<File sha1="c1d4807d99ea09052db2139631325c308a7bfefd" name="Modules/Build.lua" part="program"/>
<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
<File sha1="207df8e56a0aa610d4d6d8d51937ee1deeb8c96e" name="Modules/Calcs.lua" part="program"/>
<File sha1="99148774ffc1c326f3a50e7d8b3f7a68fe1ede57" name="Modules/CalcSections.lua" part="program"/>
<File sha1="f207df4010cb3c7bc6cce98be2529a3b8a708b8f" name="Modules/Common.lua" part="program"/>
<File sha1="0deb086a2fcf8aa8637d59ef6f2b825354b9b2c3" name="Modules/Data.lua" part="program"/>
<File sha1="5ddfa4a5904cefbf2755c231797175c8ae24ac49" name="Modules/ItemTools.lua" part="program"/>
<File sha1="6c78d33c66ebd76910f983b14c7b6a9e4f354bb1" name="Modules/Main.lua" part="program"/>
<File sha1="b97d6e1c70b75805f4a2d0d0950c170f4b6d7e17" name="Modules/Main.lua" part="program"/>
<File sha1="74d3b0ff16ef82e81899cca9f3bbc6877b320e15" name="Modules/ModParser.lua" part="program"/>
<File sha1="5f93a9d8f58e0d5990a1f84e1ab1d53fbd35fb56" name="Modules/ModTools.lua" part="program"/>
<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>