blitzmann
da0f89ef91
Merge commit 'refs/tags/v1.35.0^{}' into test-3
2018-02-14 22:25:45 -05:00
blitzmann
89b6e8f8c3
fix tox stuff
2018-02-14 22:15:48 -05:00
blitzmann
c6e715aa5c
Merge branch 'master' into test-3
2018-02-14 22:07:33 -05:00
blitzmann
d94d49f0a9
Add misc column to booster panel, and show booster duration
2018-02-10 20:45:26 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
Ryan Holmes
b596447095
Fix issue with deleting a fit while having certain other fits open ( #1339 ) ( #1340 )
...
Also, bump dev version
2017-11-22 21:44:15 -05:00
blitzmann
efea46006a
Better include all missiles in the MISC column ( #1325 )
2017-10-28 20:37:29 -04:00
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
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
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
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
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
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
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
8ed485df0e
Group renames
2016-04-06 00:22:19 -04: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
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
a67b46bb9a
Fix some mining effects
2015-10-05 20:37:41 -04:00
blitzmann
e9d02ce4c8
Change to use BitmapLoader class
2015-09-24 12:21:50 -04:00
blitzmann
474f270b26
Change to new icon locations
2015-09-24 12:17:17 -04:00
blitzmann
238712e62c
Add consumption info for siege/cyno module in misc column ( resolves #219 )
2014-12-13 18:39:06 -05:00
