blitzmann
29d175c7b3
Fix for error that happens when switching to/from firepower/mining
2018-01-10 00:51:21 -05:00
blitzmann
40ce7b7c0b
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
# eos/saveddata/character.py
# service/network.py
# service/price.py
2017-12-10 22:36:15 -05:00
blitzmann
2936b88c3d
code cleanup
2017-11-27 21:05:06 -05:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -05:00
blitzmann
337f0a9c8a
Fix stretchspacers
2017-11-24 17:23:04 -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
burnsypet
d522fff511
Add projected warp strength to scrams
...
Changes to effects:
Added warp strength projected effects to all kinds of warp disruption
modules except for WDFG (this will need some more thinking). Fixed
a bug where warp disruptors appeared to reduce the warp strength of
the ship they were fitted to
Changes to targetingMiscView*.py:
Replaced abs() with multiplication by -1 where appropriate
2017-10-30 21:05:46 +00:00
burnsypet
20a1618e41
Display warp core strength as warp speed tooltip
...
Changes to antiwarpscramblingpassive.py:
Fixed a typo of "warmScrambleStatus" to "warpScrambleStatus"
Changes to targetingMiscViewMinimal.py:
Extended existing tooltip to include warp core strength. Warp core
strength is none for ships that do not have a hull bonus (venture etc.)
or do not have any warp core stabs fitted so logic is added to
default value to 0.
Changes to targetingMiscViewFull.py:
As above.
2017-10-29 20:40:39 +00:00
blitzmann
eda6d738a4
fix some whitespace stuff, update database, effect headers, and release version
2017-08-16 20:39:26 -04:00
burnsypet
caef752a74
Bind contextHandler to children of contentPanel
...
Changes to statsPane.py:
Added new method applyBinding which loops through all the children
of the contentPanel passed to it and binds contextHandler to each of them
Changes to miningyieldViewFull.py:
Call to new method applyBinding
2017-08-16 22:54:32 +01:00
Ryan Holmes
f16e14e0b4
Fix gauges again, convert remaining IconFromBitmap > Icon
2017-06-14 15:05:12 -04:00
Ryan Holmes
3b546de070
More deprecated fixes, and re-enable a working stats view
2017-06-14 03:51:40 -04:00
Ryan Holmes
9d75dea31a
"Fix" more spacers
2017-06-12 21:14:45 -04:00
Ryan Holmes
610f501608
"Color Correction"
2017-06-12 21:11:10 -04:00
Ryan Holmes
6c317d56ee
touch up the gauge code
2017-06-12 20:45:58 -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
petosorus
33410f0618
Formatting
2017-05-30 15:51:48 +02:00
petosorus
2c98baade8
Price options labels + total computing in minimal
2017-05-29 15:24:21 +02:00
petosorus
1781c6dcf0
total computation + settings
2017-05-24 16:27:32 +02:00
blitzmann
fbf455c9fe
Fix for fighter prices ( #1178 )
2017-05-18 22:28:09 -04:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ryan Holmes
59b0ac127f
Merge pull request #1071 from blitzmann/issue-686
...
Switch units in recharge pane based on effective HP toggle (requested by #686 )
2017-04-01 22:31:38 -05:00
blitzman
37ec3d41d9
Switch the units of recharge rates based on EHP / HP
2017-03-26 16:19:14 -04:00
Ryan Holmes
df587892a3
Merge branch 'development' into feature/commandmenu
2017-03-26 12:27:52 -04:00
Ryan Holmes
1ffcdc92f2
Merge pull request #1031 from Ebag333/tooltip_capacitor_neut_resistance
...
Tooltip for capacitor neut resistance
2017-03-26 12:16:41 -04:00
blitzman
cbcc81d42e
Actually apply the command fit, and remove print statement
2017-03-23 00:38:24 -04:00
Ebag333
6ce52a1da9
PEP8 cleanup
...
(cherry picked from commit 63f2f85
2017-03-16 08:40:14 -07:00
Ebag333
8991e1dbad
Fix the view. Not sure why it broke (it was working at one point).
2017-03-13 20:09:37 -07:00
Ebag333
99f939026f
Refactor some logic in modifiedAttributeDict
2017-03-09 12:14:23 -08:00
Ebag333
da922601cd
You say Potatoe, I say tomahtie
2017-03-08 20:59:53 -08:00
Ebag333
8322307ae0
Add tooltip for neut resist. Add handling missing attributes in getting modified value (return default, not exception). Tox fixes to clean up a little.
2017-03-07 09:45:34 -08:00
blitzman
2c4a2f7dd9
Fix probe size not updating #1026
2017-03-05 16:38:00 -05:00
Ebag333
370b58d500
Changes required to implement the remote reps pane
2017-02-26 12:42:39 -08:00
Ebag333
dc6cde86c9
Merge branch 'development' into PreferencesPaneV2
2017-02-26 11:22:10 -08:00
Ebag333
fbf35edae2
Fix capitalization and set up some logging to help catch errors.
2017-02-26 11:09:56 -08:00
Ebag333
68e75025be
Finish migrate from #868 . Lots of tox/formatting/inspection fixes to the files touched.
2017-02-26 09:54:58 -08:00
Ebag333
77e5bebf13
Migrate files from #868
2017-02-26 09:54:57 -08:00
Ebag333
2a72d10bfc
Commit file so we can migrate over from old PR
2017-02-26 09:54:57 -08:00
Ebag333
5aa5732606
Initial rollup of #868
2017-02-26 09:54:57 -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
43073069c7
Fix merge conflict.
2017-02-24 16:25:31 -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
eb97a1c11c
Add tooltip and also a minimal version of the view (for future state).
2017-02-15 19:11:32 -08:00
Ebag333
13996d7770
Stupid change list making me miss files.
2017-02-15 18:50:35 -08:00
Ebag333
93e7b4f5cf
Cherry pick d033e4a8d919664d3ae210098291e38df71d3256
2017-02-15 17:23:53 -08:00
Ebag333
096842de44
Tox fixes, and catching a few things lost in the merge.
2017-02-11 09:23:23 -08:00
blitzman
5c91f29efb
Merge branch 'price-system-selection' of git://github.com/petosorus/Pyfa into petosorus-price-system-selection
...
Conflicts:
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinStatsViews/priceViewFull.py
service/fit.py
service/price.py
2017-02-11 11:36:35 -05:00
