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
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
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
Indiction
a9fb55fedd
Add "projected" to selected fitting via shipbrowser right click menu
2016-11-13 20:48:44 +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
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
blitzman
6849478226
Change hyphens in fitting tooltip to unicode dashes
2016-11-06 21:51:33 -05: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
Peter Pfeufer
26ab7d5e6f
fixed link to development repository
2016-11-04 07:18:35 +01:00
Ebag333
832e7e6637
Revert moving projectionInfo out
...
Need to handle this better. :/
2016-11-03 22:15:40 -07:00
Ryan Holmes
8c7972ed78
Merge pull request #784 from Ebag333/Gitignore
...
Include more standard exceptions to gitignore
2016-11-03 15:01:23 -04:00
Ryan Holmes
05bbc14965
Merge pull request #789 from Ebag333/BurstJammerStrengthFix
...
Add Burst Jammer to effects modified by Scorpion hull bonus
2016-11-03 14:59:21 -04:00
Ryan Holmes
e7feee6878
Merge pull request #759 from minlexx/feature/proxy_auth
...
Add login/password for proxy authorization in network settings
2016-11-03 14:58:08 -04:00
Indiction
791ddcb9a1
load fitting in selected page if ctrl-key pressed and option active
2016-10-30 01:05:22 +02:00
Indiction
12d5a21982
Option to open fittings in a new page by default
2016-10-30 00:43:23 +02:00
Ebag333
e7c79e58b4
Use in instead of or, because that makes sense
2016-10-26 10:09:43 -07:00
Ebag333
0dbdbf7cfe
Add Burst Jammer to effects modified by Scorpion hull bonus
2016-10-26 08:42:49 -07:00
Ebag333
f39ca66dbf
Include more standard exceptions to gitignore
2016-10-23 13:20:45 -07:00
Ryan Holmes
8d80494b8d
Merge pull request #783 from Ebag333/ExportHiddenAttribs
...
Implement new method for exporting values
2016-10-23 14:40:38 -04:00
Ebag333
058768baab
Implement new method for finding values
...
Original method would only export values that were attached directly to
the ship. New method starts from the modified dict, which will export
values without attribute IDs or original values.
2016-10-23 10:44:59 -07:00
blitzman
cfee6fdcd0
Add effects for command mindlinks
2016-10-23 03:02:47 -04:00
blitzman
34c95bea5d
Apply command burst skills to the bursts and charges. Handle renamed items.
2016-10-23 02:34:29 -04:00
blitzman
50911c7fc8
test
2016-10-22 00:02:12 -04:00
Ryan Holmes
4e1f0f9cc6
Merge pull request #779 from Ebag333/ExportButton
...
Add button for exports
2016-10-21 22:29:40 -04:00
