Ebag333
e4d0f2dc6f
Fix case where property gets reran multiple times.
2017-02-26 08:46:23 -08:00
blitzmann
c430a2d798
Merge branch 'development' into Remote_Repair_Pane_v2
...
Conflicts:
eos/mathUtils.py
service/crest.py
2017-02-26 01:40:53 -05:00
blitzman
7115cd178c
Merge branch 'development' into LogBook_v2
...
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
2017-02-25 18:21:07 -05:00
Ebag333
c24798ad2f
Clean up last reference and finish nuking floatfloor. One less method! (ouch my test!)
2017-02-24 17:07:05 -08:00
Ebag333
3411eca1e7
Fix a couple pep8 issues, and clean up other folks pep8 misses. :)
2017-02-24 16:34:32 -08:00
Ebag333
db330ad035
Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2
...
# Conflicts:
# eos/saveddata/fit.py
2017-02-24 16:15:39 -08:00
Ebag333
b3c7273681
implement a suggestion or six from @blitzmann. Fix a bunch of low level bugs (unlikely to have been noticed since we don't really expose those stats). Add some properties instead of referencing the attribute directly.
2017-02-24 16:10:54 -08:00
blitzman
3892ac5996
Change functionality of remote rep calculations to be more efficient.
...
* Implement a property per attribute
* Use None as our cleared value (signifies that it really hasn't been calculated, not just that the calc was 0)
2017-02-24 18:33:42 -05:00
Ebag333
5ca882d3ea
implement a suggestion from @blitzmann
2017-02-24 13:06:02 -08:00
Ebag333
6e04707457
Commit *ALL* the files.
2017-02-15 18:25:11 -08:00
Ebag333
be9eaa0859
Fix timer, make logging less annoying when at Info or higher level. Only show command bonus logspam if there is any.
2017-02-13 13:25:42 -08:00
blitzman
401d0d58d5
Merge branch 'development'
2017-02-11 21:42:48 -05:00
Ebag333
3b185e1bcb
Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers
2017-02-11 11:51:53 -08:00
blitzman
0cba428c81
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2017-02-11 10:48:11 -05:00
blitzman
bdee8f662c
Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann
2017-02-11 10:46:59 -05:00
blitzman
62bb550afd
Add shortcut indication for fitting search tooltip
2017-02-11 10:15:01 -05:00
Ebag333
2b45a16872
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
2017-02-10 11:50:04 -08:00
blitzman
72ebafe925
Remove redundant init
2017-02-10 00:37:45 -05:00
Ebag333
df9daf9b4b
Fix typo
2017-02-09 14:08:55 -08:00
Ebag333
64070a0798
Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.
2017-02-09 09:36:16 -08:00
Ebag333
dd9924a7a7
Fix issues where we assume something can exist when it may not.
2017-02-09 07:22:09 -08:00
Ebag333
7865219164
Add a ton of default values
2017-02-09 00:56:33 -08:00
Ebag333
11d7f9d029
Make modules static if they do not use self.
2017-02-09 00:04:41 -08:00
Ebag333
7a2feb9152
Fix a bunch of calls to functions that pass the wrong type of parameter, the wrong number, etc.
2017-02-08 22:20:56 -08:00
Ebag333
3e916e42f2
pyCharm inspection fixes. Mostly variable refernce issues
2017-02-08 17:55:20 -08:00
Ryan Holmes
25182de365
Merge branch 'master' into development
...
Conflicts:
gui/builtinViewColumns/baseName.py
2017-02-08 13:58:37 -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
Ebag333
aafc850dbd
Adhere to standards
2017-02-05 20:09:00 -08:00
Ebag333
be66ff1eec
Tox fixes
2017-02-05 15:39:07 -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
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
Ebag333
3c31391ec9
Burn types with fire
2017-01-09 22:36:19 -08:00
blitzman
c91723516e
Do not calculate projected fits for command fits (see #931 )
2017-01-02 23:54:06 -05: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
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
blitzman
0ebb992354
more clean up
...
(cherry picked from commit f198ff1
2016-12-14 12:44:42 -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
blitzman
96ddb0bbff
Fixed a few issues with command bursts
...
(cherry picked from commit 9071960
2016-12-14 12:18:41 -08:00
Ebag333
28404cd8bb
bajillion pep8 fixes to pass tox
2016-12-13 23:31:39 -08:00
blitzman
8ab6e26def
Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit)
2016-12-13 23:55:56 -05:00
blitzman
f198ff1773
more clean up
2016-12-12 00:49:47 -05:00
blitzman
7875c2acaa
Fix titan command effects
2016-12-12 00:24:50 -05:00
Stefan Dresselhaus
0ba88d081a
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.
2016-12-11 21:56:17 +01:00
blitzman
907196018b
Fixed a few issues with command bursts
2016-12-09 00:07:35 -05:00
blitzman
0e4e7525e1
Add runtimes to command effects (defaulting to normal)
2016-11-29 23:18:35 -05:00
