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
blitzman
7f2ac25455
Remove fleet booster context menu on fit
2016-11-20 13:54:56 -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
11716f7f94
Add command processor effect
2016-11-20 03:22:28 -05:00
blitzman
180166156a
Revert mining change ( #771 )
2016-11-20 02:51:15 -05:00
blitzman
3c8bab92b5
Add some missing effects
2016-11-20 02:17:57 -05:00
Ryan Holmes
cf361593a4
Merge pull request #771 from Ebag333/MiningCrystalBonus
...
Applied Mining Crystal Bonus to modules
2016-11-20 02:00:02 -05:00
blitzman
8ad639a122
Add titan command effects
2016-11-20 01:54:45 -05:00
blitzman
a7cd445cef
Add Mining Burst effects
2016-11-20 01:33:22 -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
eade4f0ebd
Add the four main combat boost module effects
2016-11-20 00:59:07 -05:00
blitzman
08be50caf2
More work on command boosts
2016-11-19 23:53:49 -05:00
Ebag333
6a5c86b84f
Should be all the Rorq and Orca effects.
2016-11-19 18:51:59 -08:00
Ebag333
1fb5bbc36e
Effects used by Orca
...
first pass
2016-11-18 20:53:57 -08:00
Ebag333
d6edb57a10
Update to current TQ DB
2016-11-18 20:53:39 -08:00
Ebag333
d3fdf9854d
Add versions
...
Updated Gnosis to point to at least the current version.
Pinned Requests as there's a bug in the most recent version. (Only applies to Python 3, but....)
2016-11-18 01:01:08 -08:00
Ebag333
3217980ada
Revert "Switch Shield/Cap to using new formula"
...
This reverts commit d2a52e26b2
2016-11-16 12:11:27 -08:00
Ryan Holmes
29b5a7433d
Trying to flesh out how command boosts are gonna work.
2016-11-16 09:54:02 -05:00
Ebag333
5bca2d723e
Change from multi to en-us only
...
Allows this to run in 32 bit Python.
2016-11-15 10:10:19 -08:00
Ebag333
d2a52e26b2
Switch Shield/Cap to using new formula
...
The old formula was surpsingly close in most scenarios. It is, however,
hardcoded to 25% which isn't always peak cap/shield regen.
2016-11-14 05:27:16 -08:00
Ebag333
8a4fe1627e
Requirements for Pyfa
...
Caught most of the main ones, I think.
(Yes I'm sneaking EVE-Gnosis in here, just so I don't have a conflict
when I submit the cap/shield sim fix)
2016-11-14 01:37:23 -08:00
Indiction
a9fb55fedd
Add "projected" to selected fitting via shipbrowser right click menu
2016-11-13 20:48:44 +01:00
Indiction
04c30e70af
Fighters for export and import functions
2016-11-10 23:28:21 +01:00
Ebag333
c0210895e9
Ignore temp files
...
These don't exist for long, but could catch them in a commit if you
clicked commit too quickly.
2016-11-09 07:44:24 -08:00
Ebag333
fe9917e620
Updated docstring with more information
2016-11-09 07:21:27 -08:00
Ebag333
a3dfa3b5ba
Make Effects Togglable
2016-11-09 00:46:19 -08:00
blitzmann
34243b7b71
Get a working UI skeleton going for assigning boost fits
2016-11-08 19:36:57 -05:00
blitzmann
9fd81e8acd
Copy projected view into a command view, first step to developing new command burst structure
2016-11-08 00:21:25 -05:00
Indiction
bbc4ef8146
Activate "standard attack" if available.
...
If there is no "standard attack" all other abilities set active except propmods
2016-11-07 23:28:27 +01:00
Ebag333
7fe7056c12
Drop unicode
2016-11-07 12:18:36 -08:00
Ebag333
ab32a3afb0
Change to shorthand unicode
2016-11-07 12:09:20 -08:00
Ebag333
ea3e5e273f
Handle Lockbreaker, Void, and Focused Void Bombs
2016-11-07 10:27:51 -08:00
blitzman
6849478226
Change hyphens in fitting tooltip to unicode dashes
2016-11-06 21:51:33 -05:00
Ebag333
b6c5183d40
Removed actual fleet files. Cleaned up __init__.py that had references.
2016-11-06 16:38:21 -08:00
Ebag333
e5d65b97ce
Merged changes from Pyfa.org\Master to branch
2016-11-06 16:33:28 -08:00
Indiction
6cda47be9f
Activate all fighter abilities by default and deactivate fighter groups if more than the maximum number of fighters are in bay
2016-11-06 23:19:18 +01:00
Indiction
a0ef1a3d9b
change to ternary operators (less ugly)
2016-11-06 20:37:24 +01:00
Indiction
ba47420577
Bugfix: Unable to handle ships without traits (Citadels)
2016-11-06 18:47:56 +01:00
Indiction
806f17545f
Moved HTML remover into ShipItem and FitItem function
2016-11-06 16:36:12 +01:00
Indiction
f0f5b4c04c
Tooltip to Ships and Fittings
2016-11-06 16:14:49 +01:00
Ebag333
ad76104033
Revert "Create variables before they are referenced. "
...
1dc15936ed#794 for more details.
2016-11-04 14:18:18 -07:00
Ryan Holmes
c6e481efcf
Merge pull request #791 from IndictionEve/OpenFittingsInNewPage
...
open fittings in new page by default
2016-11-04 12:48:23 -04:00
Ryan Holmes
2ad0c00c17
Merge pull request #792 from ppfeufer/patch-1
...
fixed link to development repository
2016-11-04 12:43:19 -04:00
