Ryan Holmes
25182de365
Merge branch 'master' into development
...
Conflicts:
gui/builtinViewColumns/baseName.py
2017-02-08 13:58:37 -05:00
Ryan Holmes
b1b3ff2637
Merge pull request #960 from Ebag333/Fueled_Booster_Misc_Column_Improvements
...
Add extra info for misc column for fueled boosters (cap, shield, and armor)
2017-02-07 23:59:07 -05:00
blitzman
ce9069af4a
Fix projected fit view not showing projected fit count
2017-02-07 20:11:02 -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
d67dbaa0ae
.gitattributes fixing line endings
2017-02-05 15:39:23 -08:00
Ebag333
32611e07c8
Fix syntax. Catch scenarios where none can be passed.
2017-01-29 10:12:16 -08:00
Ebag333
dd3316a1c2
Gets the multiplier bonus from the item rather than hard coding it to 3
2017-01-29 00:28:20 -08:00
Ebag333
e524197a4d
Revert "wrap getting attribute in at try/except"
...
This reverts commit f111c49cc6
2017-01-29 00:25:55 -08:00
Ebag333
f111c49cc6
wrap getting attribute in at try/except
...
Catches if there's an attribute error. Useful when we try and get an
attribute when the object doesn't even have it.
2017-01-29 00:25:42 -08:00
Ebag333
c567ee2c08
Clean up logic and generally make purdier
2017-01-29 00:16:32 -08:00
Ebag333
34c69cf10f
Some pep8 stuff
2017-01-28 21:56:03 -08:00
Ebag333
88125634d2
Add extra info for misc column for fueled boosters
2017-01-28 21:47:58 -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
Ebag333
b1a6189c55
Revert back to /s for mining. Adds /hour to tooltips.
2017-01-17 09:29:22 -08:00
Ebag333
3c31391ec9
Burn types with fire
2017-01-09 22:36:19 -08:00
Ebag333
edfa130939
Fix tooltip order
...
(cherry picked from commit 61d1878
2016-12-14 12:15:09 -08:00
Ebag333
28404cd8bb
bajillion pep8 fixes to pass tox
2016-12-13 23:31:39 -08:00
a-tal
ab9c925c47
non-standard - use forces coding declarations
...
(cherry picked from commit 6e17d88)
2016-12-13 20:17:56 -08:00
a-tal
d3b6bc1c93
so many pep8 fixes
...
(cherry picked from commit bee125d)
2016-12-13 20:16:44 -08:00
Ebag333
61d1878494
Fix tooltip order
2016-12-04 22:36:22 -08:00
Ebag333
d963327ed4
Make it run again
2016-12-02 03:13:54 -08:00
Indiction
7493b92d83
Mining Yield set to "per hour". This is the way miners calculate.
2016-10-29 18:57:38 +02:00
blitzmann
ed3b2eb1bf
Fix energy warfare
2016-06-19 23:04:52 -04:00
Ryan Holmes
cc4e4c0f13
Merge pull request #649 from Ebag333/ECM-Misc-Column-Improvements
...
Updated ECM to be more descriptive
2016-06-13 21:21:29 -04:00
Ebag333
2f6f14fef2
Update misc.py
2016-06-13 18:14:41 -07:00
Ebag333
25e298ff69
Updated ECM to be more descriptive
...
Gave it the RAH treatment. Now shows min/max values if it's a racial,
and only one for multispectral. Tooltip shows all four broken out.
2016-06-12 16:46:18 -07:00
Ryan Holmes
15519fd783
Update misc.py
2016-06-12 02:18:18 -04:00
Ryan Holmes
a357a5b845
Merge pull request #643 from Ebag333/SeBo-Misc-Column-Improvements
...
Added sensor strength to handle scripting the SeBo
2016-06-12 02:16:13 -04:00
Ebag333
f2b636bd44
Rewrote function
2016-06-11 00:50:40 -07:00
Ebag333
e5dcac43dc
Added sensor strength to handle scripting the SeBo
2016-06-10 20:36:20 -07:00
Ebag333
8629710223
Add RAH misc column and tooltip
2016-06-10 19:33:13 -07:00
wolfwood
1cd7b9a250
correct '(E)HP restored over duration' calculation to reflect removal of AAR multiplier from armorDamageAmount
2016-05-27 20:19:24 -07: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
0ad4f07591
Add drone DPS/Volley to stats pane
2016-04-26 22:18:00 -04:00
blitzmann
af9a9c5698
More fighter work. Basic abilities now work correctly.
2016-04-17 13:28:12 -04:00
blitzmann
e7118f637c
Merge branch 'charImplants' into singularity
...
# Conflicts:
# eos/db/saveddata/fit.py
# gui/builtinContextMenus/itemStats.py
2016-04-12 20:16:53 -04:00
blitzmann
8ed485df0e
Group renames
2016-04-06 00:22:19 -04:00
blitzmann
b5cf835959
Add a toggle between fit-specific implants and character implants. This avoids a lot of the problems of how to mix these two sources of implants. Character implants cannot change stage.
2016-03-13 14:48:43 -04:00
blitzmann
48b45b5f51
Merge branch 'master' into charImplants
...
# Conflicts:
# gui/characterEditor.py
2016-03-12 23:20:26 -05:00
blitzmann
e9a0c5456e
Fix group matching: Capital charges
2016-03-05 21:48:12 -05:00
blitzmann
e2d33beb34
Fix group matching: Remote Sensor Dampener -> Sensor Dampener
2016-03-05 21:44:02 -05:00
blitzmann
b44c8461d4
Fix group matching: ECM Burst -> Burst Jammer
2016-03-05 21:41:01 -05:00
blitzmann
53a46dcec6
Fix bug causing fitting view to crash if ammo does not have icon
2016-03-05 21:32:02 -05:00
blitzmann
fb7c227a10
Add a few market conversions and change cap drone group name (Feb '16 release)
2016-02-10 01:24:21 -05:00
Wenda Zhou
57da36f1cf
Fixed category names for neut, nos and tracking disruptor.
...
With the implementation of falloff for energy neutralizer
and nosferatus, their names has changed so had to update
for correct display.
Also added some display for the new guidance disruptors
(i.e. missile disruptors). This also fixes the category
change for weapon disruptor (both are now called weapon
disruptor).
2015-12-09 22:50:30 -05:00
blitzmann
ca34d7cced
Differentiate between character implants and fits
2015-11-10 02:06:44 -05:00
