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
372495a83a
Remove vestigial appendage
2017-01-10 22:45:41 -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
43f1ac78a6
Keep subsystem module in the same position when swapping them out (see #932 )
2017-01-04 23:17:56 -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
c91723516e
Do not calculate projected fits for command fits (see #931 )
2017-01-02 23:54:06 -05:00
blitzman
a0ec13d2ed
More tweaks
2017-01-02 18:45:08 -05:00
Ebag333
3313b7421f
Move query logic into own function in queries. Tighten up flow in DB repair. Catch null values.
2017-01-02 13:41:39 -08:00
blitzman
a76ee6b2fc
more tweaks
2017-01-02 12:07:15 -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
c1ead5fe27
change method for retreiving count
2017-01-02 00:29:44 -08:00
blitzman
85a89339a7
Cleaned up database corruption stuff
2017-01-02 00:58:54 -05:00
Ebag333
cd41e9e9be
Change to use skill rather than group, and modify correct attribute
2017-01-01 03:08:38 -08:00
Ebag333
cef5842344
Database validation and cleanup
2016-12-26 21:54:52 -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
0f05b60c20
Fix for #901
2016-12-18 05:47:56 -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
c858fc2859
Remove an inline import. Fix a reference that is missing.
2016-12-15 15:39:19 -08:00
Ebag333
4fb07cc1d0
Bunch of pep8 and inspection cleanup
2016-12-15 12:43:19 -08:00
Ebag333
658a87cbc0
Single line change to fix most (all??) of the problems
2016-12-15 12:10:03 -08:00
Ebag333
956fa7a8b7
Fixing some issues due to import cleanup
2016-12-14 13:06:13 -08:00
blitzman
0ebb992354
more clean up
...
(cherry picked from commit f198ff1
2016-12-14 12:44:42 -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
bb216aa6ed
wrong index in tuple.
...
Array looks normally so:
(RunTime, Value, etc., etc.)
("normal", -10, ..., ...)
I guess "RunTime" got added and this is an artifact as it is rarely
called.
Fixes Orca-Mining-Boost onto itself and other ships.
(cherry picked from commit 0ba88d0
2016-12-14 12:22:41 -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
57edc32a4b
Clean up new tactical mode stats stuff
...
(cherry picked from commit c9bc234
2016-12-14 12:21:00 -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
Ebag333
1a127bb1a6
Add ability to look at tactical mode item info.
...
(cherry picked from commit f5776a0
2016-12-14 12:16:51 -08:00
blitzman
7fbd89392a
Revert "Remove effect files that are not used by any item"
...
This reverts commit b29fa2467a4a95156
2016-12-14 12:14:39 -08:00
Ebag333
7532bcda08
Clean up some stuff left over from cherry picks
2016-12-14 10:42:04 -08:00
Indiction
38bf143704
Fighters for export and import functions
...
(cherry picked from commit 04c30e7
2016-12-14 10:24:45 -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
7bd8ca5a55
Removed actual fleet files. Cleaned up __init__.py that had references.
...
(cherry picked from commit b6c5183
2016-12-14 10:20:20 -08:00
