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

361 Commits

Author SHA1 Message Date
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
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
blitzman
7875c2acaa Fix titan command effects 2016-12-12 00:24:50 -05:00
blitzman
07148f1e7f Merge branch 'VoidBombs' of https://github.com/Ebag333/Pyfa into Ebag333-VoidBombs 
Conflicts:
	eos/effects/usemissiles.py
 2016-12-11 23:27:30 -05:00
Stefan Dresselhaus
4f77dff6dd fixed parameters in call when adding neuts to structures. 2016-12-11 20:25:55 +01:00
blitzman
70af2b0df7 fix for #871 2016-12-10 01:27:17 -05:00
blitzman
753b5c5339 Fix for #883 2016-12-10 01:11:38 -05:00
blitzman
9bb86b4ee4 fix a couple command effects 2016-12-10 01:00:14 -05:00
blitzman
907196018b Fixed a few issues with command bursts 2016-12-09 00:07:35 -05:00
blitzman
4a95156e35 Revert "Remove effect files that are not used by any item" 
This reverts commit b29fa2467a.
 2016-12-04 23:10:09 -05:00
blitzman
b375d3cb6c Bump dev, fix for #874 2016-12-03 18:28:48 -05:00
blitzman
5a846c36ab Merge branch 'T3CSubRemoteRepEffect' of https://github.com/Ebag333/Pyfa into Ebag333-T3CSubRemoteRepEffect 
Conflicts:
	eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
	eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
	eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
	eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
 2016-12-02 01:02:17 -05:00
Ryan Holmes
b76e8df1bf Merge pull request #689 from MrNukealizer/RAH-v3 
RAH v3
 2016-12-01 01:06:24 -05:00
blitzman
4d9c2898bf Fix orca effects (#866) 2016-12-01 00:07:24 -05:00
Ryan Holmes
0d874f9ad1 Merge pull request #858 from Ebag333/RemoveIncorrectEffects 
Remove Effects
 2016-11-27 21:51:55 -05:00
blitzman
019b8e93b4 Remove effect files for effects that no longer exist 2016-11-27 21:33:47 -05:00
blitzman
b29fa2467a Remove effect files that are not used by any item 2016-11-27 21:32:44 -05:00
blitzman
8b17cbfbc8 Fix effects that utilize old commandBonus attribute, and update headers 2016-11-27 21:22:28 -05:00