blitzman
|
b18bb200a9
|
Merge branch 'development' into MorePreferences
|
2017-03-26 13:52:59 -04:00 |
|
Ebag333
|
301e874cd4
|
Add a ton of logging to the fitting service
|
2017-03-17 16:05:09 -07:00 |
|
Ryan Holmes
|
58977810f9
|
Merge pull request #1030 from Will-W/new_tab
Add option to open fit in new tab
|
2017-03-06 21:14:51 -05:00 |
|
Will Wykeham
|
05facc6961
|
Remove semicolon caused by too much C programming
|
2017-03-06 14:03:27 +00:00 |
|
Will Wykeham
|
f8db54136e
|
Add option to open fit in new tab
Works from context menu and on middle click - like a browser
|
2017-03-06 13:52:56 +00:00 |
|
Ebag333
|
9a284bc740
|
Add preference to disable ship browser tooltip popup.
|
2017-02-27 14:33:18 -08:00 |
|
blitzman
|
7115cd178c
|
Merge branch 'development' into LogBook_v2
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
|
2017-02-25 18:21:07 -05:00 |
|
blitzman
|
ee407913c3
|
Fix for #1005
|
2017-02-24 00:11:24 -05:00 |
|
blitzman
|
b351befa97
|
Fix for #1000
|
2017-02-18 18:14:21 -05:00 |
|
blitzman
|
401d0d58d5
|
Merge branch 'development'
|
2017-02-11 21:42:48 -05:00 |
|
Ebag333
|
3b185e1bcb
|
Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers
|
2017-02-11 11:51:53 -08:00 |
|
blitzman
|
62bb550afd
|
Add shortcut indication for fitting search tooltip
|
2017-02-11 10:15:01 -05:00 |
|
Ebag333
|
2b45a16872
|
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
|
2017-02-10 11:50:04 -08:00 |
|
Ebag333
|
f2c84692a9
|
Clean up a bunch of unused variables
|
2017-02-09 00:22:14 -08:00 |
|
Ebag333
|
11d7f9d029
|
Make modules static if they do not use self.
|
2017-02-09 00:04:41 -08:00 |
|
Ebag333
|
72633825cf
|
Formatting and layout changes
|
2017-02-08 23:32:51 -08:00 |
|
Ebag333
|
6e524de320
|
Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
|
2017-02-08 20:15:24 -08: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
|
5cbffcf3ac
|
Handle counting number of fits per ship category more efficiently (see #819)
|
2017-01-03 01:32:12 -05:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -08:00 |
|
Ebag333
|
be53dedb18
|
Large pep8 compliance to make work for Tox
|
2016-12-13 21:23:01 -08:00 |
|
a-tal
|
ab9c925c47
|
non-standard - use forces coding declarations
(cherry picked from commit 6e17d88)
|
2016-12-13 20:17:56 -08:00 |
|
a-tal
|
d3b6bc1c93
|
so many pep8 fixes
(cherry picked from commit bee125d)
|
2016-12-13 20:16:44 -08:00 |
|
Ebag333
|
d963327ed4
|
Make it run again
|
2016-12-02 03:13:54 -08:00 |
|
blitzman
|
bf16246825
|
Disable booster fit icon (for now)
|
2016-11-22 20:44:19 -05:00 |
|
blitzman
|
14e69b1e59
|
Add "Command Fit" context menu
|
2016-11-20 19:19:03 -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 |
|
blitzman
|
7f2ac25455
|
Remove fleet booster context menu on fit
|
2016-11-20 13:54:56 -05:00 |
|
Indiction
|
a9fb55fedd
|
Add "projected" to selected fitting via shipbrowser right click menu
|
2016-11-13 20:48:44 +01: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 |
|
blitzman
|
c52fecead3
|
Fix fit drag image getting stuck when mouse capture is lost (#479)
|
2016-10-16 22:32:40 -04:00 |
|
blitzman
|
fd91f56e55
|
Give citadels their own Upwell logo
|
2016-08-24 21:46:14 -04:00 |
|
blitzmann
|
10c79ac812
|
More work on restrictions
|
2016-07-04 11:01:08 -04:00 |
|
blitzmann
|
2ac62ece06
|
Remove erroneous command causing a break in ship booster menu
|
2015-12-05 22:53:51 -05:00 |
|
blitzmann
|
4d701f561e
|
fix booster menu causing crashes (#424)
|
2015-11-26 18:56:20 -05:00 |
|
blitzmann
|
365cacac66
|
Fix #371
|
2015-10-02 11:16:41 -04:00 |
|
blitzmann
|
072fac4259
|
Merge branch 'master' into wx3
|
2015-09-29 21:35:44 -04:00 |
|
blitzmann
|
2617143330
|
Fix #363
|
2015-09-27 18:16:54 -04:00 |
|
blitzmann
|
e9d02ce4c8
|
Change to use BitmapLoader class
|
2015-09-24 12:21:50 -04:00 |
|
blitzmann
|
474f270b26
|
Change to new icon locations
|
2015-09-24 12:17:17 -04:00 |
|
blitzmann
|
5372f31be8
|
Revert "Revert "Merge branch 'master' into wx3"". So many reverts.
This reverts commit cca7f1112a.
|
2015-06-27 21:53:59 -04:00 |
|
blitzmann
|
6d01877d78
|
Merge branch 'master' into wx3
Conflicts:
pyfa.py
|
2015-06-27 19:33:12 -04:00 |
|
blitzmann
|
646f3afd27
|
Fixed oversights
|
2015-06-27 19:32:21 -04:00 |
|
blitzmann
|
98815f2b85
|
Fix #307 by moving menu code to spawn event
|
2015-06-27 18:18:43 -04:00 |
|
blitzmann
|
dc035469ed
|
Fix background color for certain panels under Linux
|
2015-06-25 16:09:56 -04:00 |
|