dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
4,863 Commits 3 Branches 5 Tags
4f12caa05fa2fbf00a507e7685029350df3c1289
Commit Graph

377 Commits

Author SHA1 Message Date
Ebag333
8322307ae0 Add tooltip for neut resist. Add handling missing attributes in getting modified value (return default, not exception). Tox fixes to clean up a little. 2017-03-07 09:45:34 -08:00
blitzman
9befaf7c91 Test implementation of eos settings 2017-03-05 02:01:10 -05: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
6f733394f7 Fix ICS / Mining Boost skill bonus (#892) 2017-02-16 00:26:11 -05:00
blitzman
de50bbb16f Update effect files 2017-02-15 21:14:40 -05:00
blitzman
e835cb7f8c update database 2017-02-15 21:12:05 -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
Ryan Holmes
25182de365 Merge branch 'master' into development 
Conflicts:
	gui/builtinViewColumns/baseName.py
 2017-02-08 13:58:37 -05:00
Ryan Holmes
752f9e77f5 Merge pull request #971 from Ebag333/ToxFixes2 
Some additional Tox tweaks
 2017-02-07 23:28:42 -05: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
blitzman
ca311e5dec Line endings again 2017-02-07 19:07:22 -05:00
blitzman
3ccd4ad2ca Revert "Convert remaining files to CRLF" 
This reverts commit a8ab876053.
 2017-02-07 19:05:45 -05:00
Ryan Holmes
a8ab876053 Convert remaining files to CRLF 2017-02-07 11:01:40 -05:00
Ebag333
aafc850dbd Adhere to standards 2017-02-05 20:09:00 -08:00
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -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
5614cec19d Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-01-17 20:18:21 -05:00
blitzman
3f24a4b2c5 Fix for #946 - citadel rig not increasing max targets 2017-01-17 20:18:12 -05:00
Ryan Holmes
77066f0389 Fix Rabisu effects (#941) 2017-01-11 15:06:50 -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
Ebag333
0056b704d4 Add other projector effects. Only allow it to affect the specific attribute it's modifying. 2017-01-02 03:18:54 -08:00
Ebag333
cd41e9e9be Change to use skill rather than group, and modify correct attribute 2017-01-01 03:08:38 -08:00
blitzman
a24e247f1b Merge branch 'master' into development 
Conflicts:
	eos/effects/usemissiles.py
	eos/saveddata/fit.py
 2016-12-18 09:24:39 -05:00
blitzman
936b746954 update headers 2016-12-16 21:19:00 -05:00
blitzman
ef14bfac58 Merge branch 'Patch_1105543' of https://github.com/Ebag333/Pyfa into Ebag333-Patch_1105543 2016-12-16 21:16:07 -05:00
blitzman
291f73b661 fix for #905 2016-12-16 20:59:54 -05:00
blitzman
3d9dae0d52 fuuu 2016-12-16 20:50:36 -05:00
blitzman
017c37c4af Fix for #892 2016-12-16 20:49:42 -05:00
blitzman
ee0c852ddb Fix titan effects and issue in which all warefarebuffs may not get run (range too short). This should also shore up (#897) 2016-12-16 20:17:20 -05:00
blitzman
d63627a37b More cleanup 2016-12-16 19:26:54 -05:00
blitzman
3ac2fd870f clean up 2016-12-16 19:20:30 -05:00
Ebag333
4fb07cc1d0 Bunch of pep8 and inspection cleanup 2016-12-15 12:43:19 -08:00
blitzman
37f8253836 oops 
(cherry picked from commit 0a28fb6)
 2016-12-14 12:26:22 -08:00
blitzman
200ff5a1a4 Fix titan command effects 
(cherry picked from commit 7875c2a)
 2016-12-14 12:26:08 -08:00
Stefan Dresselhaus
eccf405ba8 fixed parameters in call when adding neuts to structures. 
(cherry picked from commit 4f77dff)
 2016-12-14 12:22:28 -08:00
blitzman
9cfa0748ac fix for #871 
(cherry picked from commit 70af2b0)
 2016-12-14 12:20:42 -08:00
blitzman
df859a2132 Fix for #883 
(cherry picked from commit 753b5c5)
 2016-12-14 12:19:54 -08:00
blitzman
52257d60ac fix a couple command effects 
(cherry picked from commit 9bb86b4)
 2016-12-14 12:18:46 -08:00
blitzman
96ddb0bbff Fixed a few issues with command bursts 
(cherry picked from commit 9071960)
 2016-12-14 12:18:41 -08:00
blitzman
7fbd89392a Revert "Remove effect files that are not used by any item" 
This reverts commit b29fa2467a.

(cherry picked from commit 4a95156)
 2016-12-14 12:14:39 -08:00
Ebag333
a440ed3b37 Drop unicode 
(cherry picked from commit 7fe7056)
 2016-12-14 10:20:57 -08:00
Ebag333
39b7d9fdeb Change to shorthand unicode 
(cherry picked from commit ab32a3a)
 2016-12-14 10:20:53 -08:00
Ebag333
dfa728a486 Handle Lockbreaker, Void, and Focused Void Bombs 
(cherry picked from commit ea3e5e2)
 2016-12-14 10:20:48 -08:00
Ebag333
28404cd8bb bajillion pep8 fixes to pass tox 2016-12-13 23:31:39 -08:00
blitzman
8ab6e26def Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit) 2016-12-13 23:55:56 -05:00
Ebag333
cd7d25e4e1 Add skill bonus 2016-12-13 14:28:43 -08:00
Ebag333
506c7d31ca Update DB. Add defender missile effect. 2016-12-13 13:48:58 -08:00
blitzman
55c13d1ad0 Merge branch 'master' into Ebag333-Remove-Command-Boosts 2016-12-12 00:43:52 -05:00
blitzman
0a28fb60df oops 2016-12-12 00:27:36 -05:00