blitzman
1d69ed7584
Merge branch 'test_import' into development
...
Conflicts:
gui/builtinContextMenus/amount.py
gui/characterEditor.py
gui/itemStats.py
2017-01-27 20:39:54 -05:00
blitzmann
96c3363edc
Merge branch 'master' into feature/alphaclones
...
Conflicts:
eve.db
2017-01-26 19:39:13 -05:00
blitzman
85131e6166
oh god this isn't gonna work
...
Merge branch 'ebag_importchanges' into test_import
Conflicts:
config.py
eos/db/saveddata/queries.py
eos/effects/chargebonuswarfarecharge.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
eos/effects/energydestabilizationnew.py
eos/effects/iceharvestingdroneoperationdurationbonus.py
eos/effects/miningforemanstrengthbonus.py
eos/effects/modulebonuswarfarelinkarmor.py
eos/effects/modulebonuswarfarelinkinfo.py
eos/effects/modulebonuswarfarelinkmining.py
eos/effects/modulebonuswarfarelinkshield.py
eos/effects/modulebonuswarfarelinkskirmish.py
eos/effects/moduletitaneffectgenerator.py
eos/effects/remotehullrepair.py
eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipmodesmallmissiledamagepostdiv.py
eos/effects/structureenergyneutralizerfalloff.py
eos/effects/structuremoduleeffectstasiswebifier.py
eos/effects/structurerigmaxtargets.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/techtwocommandburstbonus.py
eos/saveddata/fighter.py
eos/saveddata/fit.py
eos/saveddata/module.py
eve.db
gui/bitmapLoader.py
gui/builtinContextMenus/itemStats.py
gui/builtinStatsViews/miningyieldViewFull.py
gui/builtinViewColumns/misc.py
gui/builtinViews/__init__.py
gui/builtinViews/fittingView.py
gui/contextMenu.py
gui/graphFrame.py
gui/itemStats.py
gui/mainFrame.py
gui/marketBrowser.py
service/__init__.py
service/character.py
service/fit.py
service/port.py
service/prefetch.py
service/pycrest/eve.py
service/settings.py
2017-01-23 21:06:12 -05:00
blitzman
372495a83a
Remove vestigial appendage
2017-01-10 22:45:41 -05:00
blitzman
468a4644d6
Merge branch 'development'
...
Conflicts:
eos/db/saveddata/queries.py
2017-01-10 22:42:01 -05:00
blitzman
ebc7173c50
Fix issues with unexpected module positions (see #932 )
2017-01-04 23:48:37 -05:00
blitzman
c91723516e
Do not calculate projected fits for command fits (see #931 )
2017-01-02 23:54:06 -05:00
blitzman
a24e247f1b
Merge branch 'master' into development
...
Conflicts:
eos/effects/usemissiles.py
eos/saveddata/fit.py
2016-12-18 09:24:39 -05:00
blitzman
0f05b60c20
Fix for #901
2016-12-18 05:47:56 -05:00
blitzman
ef14bfac58
Merge branch 'Patch_1105543' of https://github.com/Ebag333/Pyfa into Ebag333-Patch_1105543
2016-12-16 21:16:07 -05:00
blitzman
ee0c852ddb
Fix titan effects and issue in which all warefarebuffs may not get run (range too short). This should also shore up ( #897 )
2016-12-16 20:17:20 -05:00
blitzman
d63627a37b
More cleanup
2016-12-16 19:26:54 -05:00
blitzman
3ac2fd870f
clean up
2016-12-16 19:20:30 -05:00
Ebag333
658a87cbc0
Single line change to fix most (all??) of the problems
2016-12-15 12:10:03 -08:00
Ebag333
956fa7a8b7
Fixing some issues due to import cleanup
2016-12-14 13:06:13 -08:00
blitzman
0ebb992354
more clean up
...
(cherry picked from commit f198ff1
2016-12-14 12:44:42 -08:00
blitzman
200ff5a1a4
Fix titan command effects
...
(cherry picked from commit 7875c2a
2016-12-14 12:26:08 -08:00
Stefan Dresselhaus
bb216aa6ed
wrong index in tuple.
...
Array looks normally so:
(RunTime, Value, etc., etc.)
("normal", -10, ..., ...)
I guess "RunTime" got added and this is an artifact as it is rarely
called.
Fixes Orca-Mining-Boost onto itself and other ships.
(cherry picked from commit 0ba88d0
2016-12-14 12:22:41 -08:00
blitzman
57edc32a4b
Clean up new tactical mode stats stuff
...
(cherry picked from commit c9bc234
2016-12-14 12:21:00 -08:00
blitzman
96ddb0bbff
Fixed a few issues with command bursts
...
(cherry picked from commit 9071960
2016-12-14 12:18:41 -08:00
Ebag333
1a127bb1a6
Add ability to look at tactical mode item info.
...
(cherry picked from commit f5776a0
2016-12-14 12:16:51 -08:00
Indiction
38bf143704
Fighters for export and import functions
...
(cherry picked from commit 04c30e7
2016-12-14 10:24:45 -08:00
Ebag333
28404cd8bb
bajillion pep8 fixes to pass tox
2016-12-13 23:31:39 -08:00
blitzman
8ab6e26def
Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit)
2016-12-13 23:55:56 -05:00
Ebag333
1e5e9122ae
Change gate to handle missiles with 0 values
2016-12-13 14:09:56 -08:00
blitzman
f198ff1773
more clean up
2016-12-12 00:49:47 -05:00
blitzman
55c13d1ad0
Merge branch 'master' into Ebag333-Remove-Command-Boosts
2016-12-12 00:43:52 -05:00
blitzman
16505b30bf
working commit
2016-12-12 00:43:42 -05:00
blitzman
7875c2acaa
Fix titan command effects
2016-12-12 00:24:50 -05:00
blitzman
a954759012
GUI implementation of alpha clone switching
2016-12-11 22:51:48 -05:00
blitzman
90c1033437
add clone grades to the client extraction list
2016-12-11 20:27:27 -05:00
blitzman
191a065de1
Get skill limits working
2016-12-11 20:26:30 -05:00
Stefan Dresselhaus
0ba88d081a
wrong index in tuple.
...
Array looks normally so:
(RunTime, Value, etc., etc.)
("normal", -10, ..., ...)
I guess "RunTime" got added and this is an artifact as it is rarely
called.
Fixes Orca-Mining-Boost onto itself and other ships.
2016-12-11 21:56:17 +01:00
Ryan Holmes
828d722be8
Merge pull request #807 from IndictionEve/ImportExportFighters
...
Fighters for export and import functions
2016-12-10 02:09:45 -05:00
blitzman
907196018b
Fixed a few issues with command bursts
2016-12-09 00:07:35 -05:00
Ebag333
510492e5e9
More refactoring, elimited another recursive import
2016-12-03 17:12:16 -08:00
blitzman
0e4e7525e1
Add runtimes to command effects (defaulting to normal)
2016-11-29 23:18:35 -05:00
blitzman
5259df2828
Quick hack to run command boosts inside the runtime. See #839
2016-11-29 22:58:33 -05: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
3aa60ac669
Make Effects Togglable
2016-11-21 22:02:16 -08:00
blitzman
8605bab4d4
Fix effects running when they shouldn't
2016-11-21 21:59:44 -05: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
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
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
62a696cc4b
Only apply command boosts when command module is active, and add t2 command burst effect
2016-11-20 13:21:59 -05:00
blitzman
380d74b333
Fix issue with gangboost not recalculating. We really should ensure that a command fit that has been calcuated does not need ot recalculate unless it's changed / is needed. But that's for a different time.
2016-11-20 01:14:40 -05:00
blitzman
08be50caf2
More work on command boosts
2016-11-19 23:53:49 -05:00
Ryan Holmes
29b5a7433d
Trying to flesh out how command boosts are gonna work.
2016-11-16 09:54:02 -05:00
