blitzman
f010f2fef2
Don't loop through all amounts of cargo and drones just to get the price. ( #958 )
2017-01-28 13:15:25 -05:00
blitzmann
4111d670a7
Fix possible issue with floats coming through (see #729 )
2017-01-26 23:52:18 -05:00
blitzmann
397084a9ff
Disable rename and delete button for restricted character on character editor spawn (fix for #930 )
2017-01-26 21:33:13 -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
5cbffcf3ac
Handle counting number of fits per ship category more efficiently (see #819 )
2017-01-03 01:32:12 -05:00
blitzman
ff60538e21
Revert "Merge branch 'Ebag333-UnicodePaths' into development"
...
This reverts commit 8a6ef788b3cf91ae7627
2016-12-18 15:56:06 -05:00
Ryan Holmes
50c6133046
Revert "Remembers user's meta filtering choices"
2016-12-18 10:09:55 -05:00
Ryan Holmes
b7d7b80544
Merge pull request #829 from resinneublem/remember-user-filters
...
Remembers user's meta filtering choices
2016-12-18 10:07:15 -05:00
blitzman
2b9342692d
working commit
2016-12-18 09:45:26 -05:00
blitzman
95b3f0a21c
Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts
...
Conflicts:
eos/db/saveddata/fleet.py
eos/db/saveddata/queries.py
gui/additionsPane.py
2016-12-12 00:41:47 -05:00
blitzman
b1bba74c5a
Merge branch 'UnicodePaths' of https://github.com/Ebag333/Pyfa into Ebag333-UnicodePaths
2016-12-11 23:01:08 -05:00
blitzman
c9bc2341d1
Clean up new tactical mode stats stuff
2016-12-10 02:04:51 -05:00
Ebag333
5eb2fef89c
Implement fittingMode
2016-12-08 18:56:43 -08:00
Ebag333
9403a1fce9
Add logging, because why not
2016-12-08 17:31:04 -08:00
Ebag333
fd224d6781
Don't use try for fittingView, and don't show remove item for modes.
2016-12-08 16:59:26 -08:00
Ebag333
f5776a0cb2
Add ability to look at tactical mode item info.
2016-12-08 13:12:15 -08:00
Ebag333
61d1878494
Fix tooltip order
2016-12-04 22:36:22 -08:00
Ryan Holmes
7bd6344359
Merge pull request #790 from IndictionEve/miningyieldperhour
...
Mining Yield "per hour".
2016-12-02 00:52:00 -05:00
blitzman
5a0165282f
Add reverse sorting / name column to sorting
2016-12-01 00:40:27 -05:00
blitzman
597d9f2612
Merge branch 'SortableCompare' of https://github.com/Ebag333/Pyfa into Ebag333-SortableCompare
2016-12-01 00:07:44 -05:00
Ebag333
1854a21a50
Clicking on the name column now reverts back to default sorting
2016-11-30 13:17:50 -08:00
blitzman
a5b5da6d27
Update developers
2016-11-28 21:24:17 -05:00
Ebag333
97f72f6df5
Add ability to sort compare list
2016-11-27 12:06:41 -08:00
Ebag333
0d4f24ade9
Handle unicode, utf8, and windows-1252
2016-11-26 22:57:53 -08:00
blitzman
bf16246825
Disable booster fit icon (for now)
2016-11-22 20:44:19 -05:00
blitzman
0d94ffe27a
Merge branch 'singularity' of https://github.com/pyfa-org/Pyfa into singularity
2016-11-22 18:45:27 -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
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
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
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
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
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
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
26285cfc95
Tweaks
2016-11-20 14:28:51 -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
7f2ac25455
Remove fleet booster context menu on fit
2016-11-20 13:54:56 -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
Indiction
a9fb55fedd
Add "projected" to selected fitting via shipbrowser right click menu
2016-11-13 20:48:44 +01: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
Ebag333
b6c5183d40
Removed actual fleet files. Cleaned up __init__.py that had references.
2016-11-06 16:38:21 -08: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
