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 |
|
Indiction
|
38bf143704
|
Fighters for export and import functions
(cherry picked from commit 04c30e7)
|
2016-12-14 10:24:45 -08:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -08:00 |
|
Ryan Holmes
|
828d722be8
|
Merge pull request #807 from IndictionEve/ImportExportFighters
Fighters for export and import functions
|
2016-12-10 02:09:45 -05:00 |
|
Ebag333
|
3aa60ac669
|
Make Effects Togglable
|
2016-11-21 22:02:16 -08:00 |
|
Indiction
|
04c30e70af
|
Fighters for export and import functions
|
2016-11-10 23:28:21 +01:00 |
|
Ebag333
|
ad76104033
|
Revert "Create variables before they are referenced. "
1dc15936ed
This is a problem for us. See #794 for more details.
|
2016-11-04 14:18:18 -07:00 |
|
Ebag333
|
0c0eb327f7
|
lots of PEP8 cleanup
|
2016-10-19 12:25:31 -07:00 |
|
Ebag333
|
1dc15936ed
|
Create variables before they are referenced.
Resolves attribute reference validation errors in pyCharm
|
2016-10-19 12:08:35 -07:00 |
|
Ebag333
|
f9f53a13c0
|
Reformatting eos.saveddata
|
2016-10-19 11:42:45 -07:00 |
|
Ebag333
|
68f769aac2
|
Remove redundent parentheses
|
2016-10-19 08:37:07 -07:00 |
|
Ebag333
|
32068e8d8e
|
Create set directly
|
2016-10-19 08:22:45 -07:00 |
|
Ebag333
|
c1dfd676e1
|
Simplified boolean check
|
2016-10-19 08:08:50 -07:00 |
|
Ryan Holmes
|
7331c158b6
|
Merge pull request #756 from MrNukealizer/FighterFixes
Fixed a few fighter/carrier bugs:
|
2016-10-08 23:07:01 -04:00 |
|
Mr. Nukealizer
|
30755fbb73
|
Made fighter DPS calculations more accurate when factoring in reload time.
|
2016-09-30 23:44:12 -07:00 |
|
blitzmann
|
655d658a52
|
Remove prints
|
2016-05-16 23:56:46 -04:00 |
|
blitzmann
|
3673391f5a
|
Moved DPS calc from fighter to fighter ability, and fixed fighters in the graph to consider target values.
|
2016-05-14 01:48:22 -04:00 |
|
blitzmann
|
d416124081
|
Implemented projected fighters, and various fighter bugfixes / improvements
|
2016-04-30 19:52:13 -04:00 |
|
blitzmann
|
b5420e9c6a
|
Add fighter bomb launcher logic
|
2016-04-29 19:10:51 -04:00 |
|
blitzmann
|
1669a5434c
|
Removing debugging
|
2016-04-28 00:42:09 -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 |
|
blitzmann
|
4704c5a1b0
|
Limit fighters to fit's available slots. We hijack the module slot bit to do the dirty work >_>
|
2016-04-25 23:45:01 -04:00 |
|
blitzmann
|
af9a9c5698
|
More fighter work. Basic abilities now work correctly.
|
2016-04-17 13:28:12 -04:00 |
|
blitzmann
|
021de1af80
|
Get fighter abilities saved into database
|
2016-04-17 00:37:52 -04:00 |
|
blitzmann
|
3177713447
|
Add preliminary (database/gui) fighter support. No effects / calculations.
|
2016-04-04 23:32:03 -04:00 |
|