Ryan Holmes
8e4db5a8c3
Do some renaming of some files
2017-06-12 18:08:07 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
Ryan Holmes
9dee761f6d
Move addition pane views into their own directory
2017-06-12 01:17:00 -04:00
Ryan Holmes
45c3533501
Make some extra logging statements and stuff to troubleshoot fit deletion bugs ( #1199 )
2017-05-30 22:57:52 -04:00
blitzmann
2e3c3e92f1
Fix for a possible bug (see comments in #1147 ).
2017-05-13 23:28:50 -04:00
blitzmann
1f7858f853
Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
...
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
blitzmann
50965244c0
Merge branch 'bug/1139' into bug/resist-effects
2017-05-02 20:41:54 -04:00
Ebag333
0079f76f67
Change price column to use new method
2017-04-21 00:54:13 -04:00
blitzmann
3d8a80aeaa
Include drones in RR stats
2017-04-19 21:36:49 -04:00
blitzmann
9ac609528b
Fix issue in which drones hp/s does not consider number of drones
2017-04-19 21:04:48 -04:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ryan Holmes
f08a66924c
Re-introduce Command Fit State ( #1074 )
...
Reintroduce command view state
Squashes `blitzmann/command-fit-state`:
* Reintroduces command view state, allowing users to toggle command fits on and off.
* Remove type() function call and use __class__ instead
2017-04-01 22:04:44 -05:00
Ebag333
72633825cf
Formatting and layout changes
2017-02-08 23:32:51 -08:00
Ebag333
6e524de320
Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
2017-02-08 20:15:24 -08:00
Ebag333
e5fb90f017
Fix commit message. LOTS of fixes for flake8.
2017-02-08 14:22:56 -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
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
