dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity
4,711 Commits 3 Branches 10 Tags
99b2fdefcc69764c6c86e5efdc8c19043fcbe631
Commit Graph

229 Commits

Author SHA1 Message Date
blitzman
5c91f29efb Merge branch 'price-system-selection' of git://github.com/petosorus/Pyfa into petosorus-price-system-selection 
Conflicts:
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/price.py
 2017-02-11 11:36:35 -05:00
blitzman
134365c764 Reverts commit de87c9, and instead uses the mod variable to access the method needed. 
Conflicts:
	service/fit.py
 2017-02-10 00:29:40 -05:00
petosorus
aaece725aa Saving price system preference 2017-02-09 23:26:31 +01:00
Ebag333
64070a0798 Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later. 2017-02-09 09:36:16 -08:00
Ebag333
7865219164 Add a ton of default values 2017-02-09 00:56:33 -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
3b91ec8c06 Move check for module state being valid out of effectHandlerHelpers and into service\fit. We can't have it there because of cyclical imports. Plus we're already checking the module state here, so makes lots of sense to merge them. 2017-02-08 21:24:24 -08:00
Ebag333
3e916e42f2 pyCharm inspection fixes. Mostly variable refernce issues 2017-02-08 17:55:20 -08:00
Ebag333
de87c992d7 Remove calling es_Module from effectHandlerHelpers, this causes a circular import. Instead pass in from fit. 2017-02-08 16:50:41 -08:00
Ebag333
e5fb90f017 Fix commit message. LOTS of fixes for flake8. 2017-02-08 14:22:56 -08:00
blitzman
f7d7b3fe5e Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
 2017-02-07 19:22:26 -05:00
Ebag333
8095b4852b Clean up another broken reference. Fix broken XML export. 2017-01-24 21:34: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
468a4644d6 Merge branch 'development' 
Conflicts:
	eos/db/saveddata/queries.py
 2017-01-10 22:42:01 -05:00
Ebag333
3c31391ec9 Burn types with fire 2017-01-09 22:36:19 -08:00
blitzman
5cbffcf3ac Handle counting number of fits per ship category more efficiently (see #819) 2017-01-03 01:32:12 -05:00
Ebag333
4fb07cc1d0 Bunch of pep8 and inspection cleanup 2016-12-15 12:43:19 -08:00
blitzman
0ebb992354 more clean up 
(cherry picked from commit f198ff1)
 2016-12-14 12:44:42 -08:00
Ebag333
7532bcda08 Clean up some stuff left over from cherry picks 2016-12-14 10:42:04 -08:00
Ebag333
627977ab51 Purging fleet bonuses from code base 
(cherry picked from commit 68f4570)
 2016-12-14 10:18:19 -08: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
Ebag333
57f930c83e Cherry pick commits from @a-tal 2016-12-13 20:35:03 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes 
(cherry picked from commit bee125d)
 2016-12-13 20:16:44 -08:00
blitzman
f198ff1773 more clean up 2016-12-12 00:49:47 -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
Ebag333
510492e5e9 More refactoring, elimited another recursive import 2016-12-03 17:12:16 -08:00
Ebag333
ea8a4c01cb Eliminate export calling fit.py (no need) 
Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated.  Also spotted an
import reference that got missed.
 2016-12-02 12:50:49 -08:00
Ebag333
d963327ed4 Make it run again 2016-12-02 03:13:54 -08:00
Ryan Holmes
d3caee328f Merge pull request #799 from IndictionEve/ActiveFighterAbilities 
Activate fighter standard attack and limit active fighters
 2016-11-21 23:18:40 -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
08be50caf2 More work on command boosts 2016-11-19 23:53:49 -05:00
blitzmann
34243b7b71 Get a working UI skeleton going for assigning boost fits 2016-11-08 19:36:57 -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
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
12d5a21982 Option to open fittings in a new page by default 2016-10-30 00:43:23 +02:00
Ebag333
c30190f63e Revert "Revert "Purging fleet bonuses from code base"" 
This reverts commit 6e54d6788c.
 2016-09-15 15:27:30 -07:00
Ebag333
6e54d6788c Revert "Purging fleet bonuses from code base" 
This reverts commit 68f45706ab.
 2016-09-15 15:27:10 -07:00
Ebag333
68f45706ab Purging fleet bonuses from code base 2016-09-15 15:07:59 -07:00
petosorus
54c950f951 Multibuy format export feature 2016-09-14 23:38:09 +02:00
blitzmann
6e2878194c Merge branch 'master' into citadel 
Conflicts:
	config.py
	service/market.py
 2016-07-03 01:10:26 -04:00
Ebag333
47828c38d2 Merged differences from master (more catching up) 2016-06-15 19:40:45 -07:00
blitzmann
655d658a52 Remove prints 2016-05-16 23:56:46 -04:00
blitzmann
62fd545d24 Restrict citadels to only use citadel modules. Rename Ships tab to Fittings as it no longer just carries ships :(. Fix crash on item stats. 2016-05-15 23:18:39 -04:00
blitzmann
19929ef3ba Increment/decrement cargo instead of adding/removing (#610) 2016-05-11 21:29:17 -04:00
blitzmann
d416124081 Implemented projected fighters, and various fighter bugfixes / improvements 2016-04-30 19:52:13 -04:00
blitzmann
ed6f00a893 Added column for fighter abilities, fixed some fighter bugs, added some context menus to them 2016-04-28 00:29:25 -04:00
blitzmann
b15f9766c1 * Show fighter bay resources in fighter pane 
* Give fighters a state
* Include some toggled stats on the resources pane
* Add some decent icons for fighter stuff
 2016-04-28 00:10:01 -04:00