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:
Openarl
2017-02-05 18:29:23 +10:00
parent edc6aafa31 ff7a1a3b48
commit b0abaa474a
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Calcs.lua
View File

@@ -353,6 +353,8 @@ local function buildActiveSkillModList(env, activeSkill)
activeSkill.skillModList = skillModList
if skillFlags.disable then
wipeTable(skillFlags)
skillFlags.disable = true
return
end
@@ -1639,7 +1641,7 @@ local function performCalcs(env)
if env.mainSkill.skillFlags.disable then
-- Skill is disabled
wipeTable(env.mainSkill.skillFlags)
output.CombinedDPS = 0
return
end

3
README.md
View File

@@ -48,6 +48,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.38 - 2017/02/05
* Fixed error when hovering over a passive node with a main skill that isn't compatible with the equipped weapons
### 1.2.37 - 2017/02/05
* Attack skills will now only work if your equipped weapons can be used with that skill
* Dual Wield attack skills will now use the off hand weapon if the main hand isn't compatible with the skill

2
changelog.txt
View File

@@ -1,3 +1,5 @@
VERSION[1.2.38][2017/02/05]
* Fixed error when hovering over a passive node with a main skill that isn't compatible with the equipped weapons
VERSION[1.2.37][2017/02/05]
* Attack skills will now only work if your equipped weapons can be used with that skill
* Dual Wield attack skills will now use the off hand weapon if the main hand isn't compatible with the skill

6
manifest.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.2.37"/>
<Version number="1.2.38"/>
<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="5ffc5d4ad59c4a165657132a8a3ddb206a64d99f" name="Launch.lua" part="program"/>
<File sha1="d8e42beeb38baabcc197d658e4c0af33419eeff3" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="3e7bd52e268bbced5128ec04ee03e6d630cc654b" name="changelog.txt" part="program"/>
<File sha1="2914cedd3f105928fa455dc06d0f9f26cd7168ef" name="changelog.txt" part="program"/>
<File sha1="231a4fe264d84294427edacbf3e29ec4b301712e" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="47c28993f5653955c9e76714775d87ac22b077da" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="5a4b4930533a97f4d87231a6024b7f48ff0bad89" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -44,7 +44,7 @@
<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
<File sha1="53965f8a13b8498b35fd4a33f26fa2b9fbdcb033" name="Modules/Build.lua" part="program"/>
<File sha1="8a07fe01c53b785ebb6256236e781fbaabd36c0e" name="Modules/BuildList.lua" part="program"/>
<File sha1="16a8419ed31e085d140158b865540c5e5261e942" name="Modules/Calcs.lua" part="program"/>
<File sha1="89daff2cd9c72b5c38b08a9cc27aacf7b7c143be" name="Modules/Calcs.lua" part="program"/>
<File sha1="1655b03fb16360ab85f817b5ac1c48751cccb113" name="Modules/CalcSections.lua" part="program"/>
<File sha1="761af85f3e1c5601fdb790356a09aefe2f5a64e3" name="Modules/Common.lua" part="program"/>
<File sha1="65bf4efe167b1df2f26443936c654f55f76c1708" name="Modules/Data.lua" part="program"/>