blitzman
e30040c9fd
Bump pre-release
2016-11-22 20:53:57 -05:00
blitzman
6bbfb8e837
Update database to final version for pre-release
2016-11-22 20:50:39 -05:00
blitzman
2ec203a3a2
Update renders
2016-11-22 20:47:28 -05:00
blitzman
4df22d2063
Add new icons
2016-11-22 20:44:56 -05:00
blitzman
bf16246825
Disable booster fit icon (for now)
2016-11-22 20:44:19 -05:00
blitzman
0eed01811c
Conversion mappings
2016-11-22 20:36:52 -05:00
blitzman
96b3d5637a
Fix industrial core effect
2016-11-22 20:04:57 -05:00
blitzman
4a09cbcec9
Merge branch 'Acendency-IndustrialCoreEffect' of https://github.com/Ebag333/Pyfa into Ebag333-Acendency-IndustrialCoreEffect
2016-11-22 20:00:00 -05:00
Ebag333
964493d701
add logi falloff
2016-11-22 16:52:53 -08:00
Ebag333
f1b9c788f3
Added falloffeffectiveness
2016-11-22 16:38:55 -08:00
Ebag333
a50f89db67
Added stacking penalties, fixed range buff
2016-11-22 16:36:19 -08:00
blitzman
0d94ffe27a
Merge branch 'singularity' of https://github.com/pyfa-org/Pyfa into singularity
2016-11-22 18:45:27 -05:00
Ebag333
dc4c4c7353
Change to skill req
2016-11-22 15:03:21 -08:00
Ryan Holmes
8d4e0a259e
Fix for #833
2016-11-22 15:35:04 -05:00
Ryan Holmes
91f87b02cc
Merge branch 'EffectTest' of https://github.com/Ebag333/Pyfa into Ebag333-EffectTest
...
Conflicts:
eos/saveddata/fit.py
eos/saveddata/module.py
2016-11-22 12:34:10 -05:00
Ebag333
870e333605
Rebase from pyfa.org/master
...
# Conflicts:
# eos/effects/boosterarmorhppenalty.py
# eos/effects/boosterarmorrepairamountpenalty.py
# eos/effects/boostercapacitorcapacitypenalty.py
# eos/effects/boostermaxvelocitypenalty.py
# eos/effects/boostermissileexplosioncloudpenaltyfixed.py
# eos/effects/boostermissileexplosionvelocitypenalty.py
# eos/effects/boostermissilevelocitypenalty.py
# eos/effects/boostershieldcapacitypenalty.py
# eos/effects/boosterturretfalloffpenalty.py
# eos/effects/boosterturretoptimalrangepenalty.py
# eos/effects/boosterturrettrackingpenalty.py
# eos/saveddata/character.py
# eos/saveddata/drone.py
# eos/saveddata/fighter.py
# eos/saveddata/mode.py
# eos/saveddata/module.py
2016-11-21 22:21:25 -08:00
Ebag333
7ea3103c25
Updated docstring with more information
2016-11-21 22:02:16 -08:00
Ebag333
3aa60ac669
Make Effects Togglable
2016-11-21 22:02:16 -08:00
blitzman
81612cc32a
Remove border from note box text area
2016-11-21 23:51:18 -05:00
Ryan Holmes
d3caee328f
Merge pull request #799 from IndictionEve/ActiveFighterAbilities
...
Activate fighter standard attack and limit active fighters
2016-11-21 23:18:40 -05:00
blitzman
d5af6127e5
Tweaks
2016-11-21 23:02:29 -05:00
blitzman
5eb5fb3310
Merge branch 'drop-null-sec-com' of git://github.com/resinneublem/Pyfa into resinneublem-drop-null-sec-com
2016-11-21 22:56:01 -05:00
blitzman
8605bab4d4
Fix effects running when they shouldn't
2016-11-21 21:59:44 -05:00
Ebag333
1540c9463a
Added unused attributes
2016-11-21 13:10:59 -08:00
Ebag333
130105ca9f
Fixed attribute, removed duplicate
2016-11-21 12:53:57 -08:00
tgraviou
7eb3ad98fa
beginnings of price system choice
2016-11-21 17:38:28 +01:00
blitzman
cb225eabb3
Get a working migration for command fits.
2016-11-20 22:06:26 -05:00
blitzman
72245d8ebe
Fix bad merge
2016-11-20 21:53:49 -05:00
Ebag333
96505e4421
Industrial core for Rorq
2016-11-20 18:37:12 -08:00
blitzman
fbb1750528
Merge branch 'master' into singularity
...
Conflicts:
eos/db/saveddata/fit.py
gui/additionsPane.py
2016-11-20 20:52:23 -05:00
Ryan Holmes
dad63b6d77
Merge pull request #821 from resinneublem/notes-field
...
Adds a new notes pane for each fit
2016-11-20 20:48:02 -05:00
blitzman
14e69b1e59
Add "Command Fit" context menu
2016-11-20 19:19:03 -05:00
blitzman
883917d5d6
Add missing effects
2016-11-20 19:17:40 -05:00
blitzman
deeccc85a3
Fix command boosts (attributes renamed)
2016-11-20 19:08:23 -05:00
Resin Neublem
cfa57a70dc
Remembers user's meta filtering choices
...
There is a lot of logic that overwrites the user's choices of meta filtering on every search.
That's a little too clever. Especially if the user is looking for different variations of a certain meta.
If a user wants to include the other meta buttons they can re-add them after filtering.
closes: https://github.com/pyfa-org/Pyfa/issues/818
2016-11-20 16:28:18 -05:00
blitzman
e6dfb1e90a
Update some effects and headers
2016-11-20 16:04:32 -05:00
blitzman
e03d3278a0
Update effect headers
2016-11-20 15:37:55 -05:00
blitzman
eae4bb75e5
more fixes
2016-11-20 15:37:12 -05:00
Resin Neublem
e6dead2e27
Groups drones before generating DNA
...
Drones can and often are in different stacks due to bandwidth and skills. The DNA would mess up in these cases because they would include duplicate ids with different numbers.
This commit groups the drones by the itemID before generating the DNA.
closes: https://github.com/pyfa-org/Pyfa/issues/367
2016-11-20 15:25:30 -05:00
blitzman
59b854b00d
Fix some effects
2016-11-20 15:25:27 -05:00
Resin Neublem
675533a732
Drops null-sec.com as an option
...
It seems like it would be a good idea to make this user configurable so they could enter whatever domain they want.
However with this entire HTML export feature being questionable, I didn't go that far. https://github.com/pyfa-org/Pyfa/issues/825
closes: https://github.com/pyfa-org/Pyfa/issues/826
2016-11-20 14:46:18 -05:00
blitzman
7751a2e072
Merge branch 'AscendencyPatch' of https://github.com/Ebag333/Pyfa into Ebag333-AscendencyPatch
2016-11-20 14:44:53 -05:00
blitzman
b4bbc82ba1
Merge branch 'master' into singularity
...
Conflicts:
eos/db/saveddata/fit.py
eos/effects/armoredwarfaremindlink.py
eos/effects/elitebonuscommanddestroyerarmored1.py
eos/effects/elitebonuscommanddestroyerinfo1.py
eos/effects/elitebonuscommanddestroyerinfohidden1.py
eos/effects/elitebonuscommanddestroyersiege1.py
eos/effects/elitebonuscommanddestroyerskirmish1.py
eos/effects/elitebonuscommandshiparmoredcs3.py
eos/effects/elitebonuscommandshipinformationcs3.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuscommandshipsiegecs3.py
eos/effects/elitebonuscommandshipskirmishcs3.py
eos/effects/miningforemanmindlink.py
eos/effects/shipbonuscarriera4warfarelinksbonus.py
eos/effects/shipbonuscarrierc4warfarelinksbonus.py
eos/effects/shipbonuscarrierg4warfarelinksbonus.py
eos/effects/shipbonuscarrierm4warfarelinksbonus.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
eos/effects/shipbonussupercarriera5warfarelinksbonus.py
eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
eos/effects/subsystembonusminmatardefensivesiegewarfare.py
eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
eos/saveddata/fit.py
eos/saveddata/module.py
gui/shipBrowser.py
scripts/prep_data.py
service/fit.py
2016-11-20 14:42:19 -05:00
blitzman
a0a0ec9b1f
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2016-11-20 14:29:18 -05:00
blitzman
26285cfc95
Tweaks
2016-11-20 14:28:51 -05:00
blitzman
6799e71f1a
Merge branch 'projectedRightClickMenu' of git://github.com/IndictionEve/Pyfa into IndictionEve-projectedRightClickMenu
2016-11-20 14:19:45 -05:00
Ryan Holmes
8806c941a8
Merge pull request #816 from Ebag333/LimitLanaguage
...
Limit lanaguage from multi to en-us
2016-11-20 14:16:47 -05:00
Resin Neublem
78cbed516a
Adds a new notes pane for each fit
...
This allows users to save text notes for each fit. They may do this for history, or usage, etc.
2016-11-20 14:11:42 -05:00
blitzman
2281fae615
Merge branch 'EosCodeCleanup-V2' of https://github.com/Ebag333/Pyfa into Ebag333-EosCodeCleanup-V2
...
Conflicts:
eos/effects/mininginfomultiplier.py
2016-11-20 13:59:14 -05:00
Ryan Holmes
1192a0658a
Merge pull request #806 from Ebag333/GitIgnore
...
Ignore temp files
2016-11-20 13:55:18 -05:00
