Commit Graph

6279 Commits

Author SHA1 Message Date
DarkPhoenix
dc2a4d4446 For abyssal modification range, show integer + 3 fraction digits, like CCP does 2018-11-19 14:59:34 +03:00
DarkPhoenix
b0895611d6 Move tiamat/hydra out of normal groups 2018-11-17 14:48:25 +03:00
DarkPhoenix
f664a1cad3 Fix crash on opening mutated BCS stats 2018-11-15 16:19:20 +03:00
Ryan Holmes
19de7e40dc Merge pull request #1799 from pyfa-org/mutation_gauge_fix
Mutation gauge fix
2018-11-14 21:26:33 -05:00
DarkPhoenix
de2ee1dce6 Set input box upon updates as well 2018-11-14 17:36:35 +03:00
DarkPhoenix
90698dde90 Rework slider to use values rather than modifiers 2018-11-14 17:15:04 +03:00
Ryan Holmes
0ab6d6e845 Merge pull request #1798 from pyfa-org/release/v2.6.0
Release/v2.6.0
2018-11-13 21:14:54 -05:00
Ryan Holmes
74d87845cf Merge pull request #1797 from pyfa-org/master
Merge pull request #1796 from pyfa-org/release/v2.6.0
2018-11-13 21:14:12 -05:00
blitzmann
9e2b15776f bump version 2018-11-13 21:13:35 -05:00
Ryan Holmes
c8ade0741c Merge pull request #1796 from pyfa-org/release/v2.6.0
Release/v2.6.0
2018-11-13 21:12:47 -05:00
blitzmann
af8b444ab5 update icons 2018-11-13 20:49:53 -05:00
blitzmann
2ba26f01b2 update db 2018-11-13 20:49:37 -05:00
DarkPhoenix
e77bb11d0a Update database and effects to 1419904 2018-11-13 14:09:23 +03:00
DarkPhoenix
c14b56f37d Fix file name for case-sensitive filesystems
Phobos produces all-lowercase file
2018-11-13 13:41:59 +03:00
DarkPhoenix
e6fe8de5ed Remove unused effects 2018-11-02 15:52:58 +03:00
DarkPhoenix
cf27c2be10 Update database and add effects for two new triglavian ships 2018-11-02 15:49:35 +03:00
Ryan Holmes
78ff74f0f7 Merge pull request #1787 from pyfa-org/issue/1778
Issue/1778
2018-10-28 22:08:03 -04:00
blitzmann
29a2a08986 Add drag n drop form market to implant view 2018-10-28 22:06:08 -04:00
blitzmann
881b92a6ea Convert implant location change to a command 2018-10-28 21:59:14 -04:00
Ryan Holmes
50c22c836b Merge pull request #1786 from pyfa-org/issue/1777
Recalc fit after removing implants (and undoing removal)
2018-10-28 21:07:58 -04:00
blitzmann
63115a7c0f Recalc fit after removing implants (and undoing removal) 2018-10-28 21:07:12 -04:00
Ryan Holmes
f854627888 Merge pull request #1776 from pyfa-org/release/v2.5.1
release 2.5.1
2018-10-15 21:22:25 -04:00
blitzmann
5ec8468d3f release 2.5.1 2018-10-15 21:21:53 -04:00
Ryan Holmes
0da4e4359b Merge pull request #1772 from tron1point0/issue/pyfa-org/1769
Try loading smaller variants if scaled icons are missing
2018-10-15 21:11:02 -04:00
Tron
c5e8742838 More flake8 fixes. 2018-10-15 06:00:15 -05:00
Tron
f9f90852c5 Merge branch 'master' into issue/pyfa-org/1769 2018-10-15 05:59:42 -05:00
Traian Nedelea
6b5f2450ad Merge pull request #1 from pyfa-org/master
Pull from upstream.
2018-10-15 05:59:27 -05:00
DarkPhoenix
4f2e962a46 Blow sig of command destroyers which are using MJFG 2018-10-15 13:55:14 +03:00
Tron
05ce8fbf1c Fixed flake8 complaints. 2018-10-15 05:44:22 -05:00
Tron
929b2dfb38 Factored out scaled image loading into a method so CodeClimate (hopefully) stops complaining about cognitive complexity. 2018-10-15 05:35:28 -05:00
Ryan Holmes
659e0e5ead Merge pull request #1774 from pyfa-org/issue/1773
Support changing variation for drones #1773
2018-10-14 23:27:31 -04:00
blitzmann
7bb44f6473 Support changing variation for drones #1773 2018-10-14 23:26:56 -04:00
Tron
60f024fdb7 Try loading smaller variants if scaled icons are missing. pyfa-org/Pyfa/#1769 2018-10-14 15:47:58 -05:00
Ryan Holmes
da601c9a63 Merge pull request #1770 from pyfa-org/issue/1769
Don't include 2x version of icons that don't have a larger version.
2018-10-13 20:50:39 -04:00
blitzmann
7464de06b1 Don't include 2x version of icons that don't have a larger version. 2018-10-13 20:49:56 -04:00
Ryan Holmes
20fbda9e7a Merge pull request #1768 from pyfa-org/issue/1767
Check to make sure the bitmap exists before converting to image.
2018-10-12 23:59:22 -04:00
blitzmann
15bbf69fcf Check to make sure the bitmap exists before converting to image. 2018-10-12 23:58:51 -04:00
Ryan Holmes
677a9b33c5 Merge pull request #1766 from pyfa-org/issue/1758
Don't run implant toggle when there is not fit loaded
2018-10-11 22:27:26 -04:00
blitzmann
e9efdcd4e8 Don't run implant toggle when there is not fit loaded 2018-10-11 22:27:07 -04:00
Ryan Holmes
c3b0b7d1e1 Merge pull request #1765 from pyfa-org/hotfix/2.5.0
fix issue with pyinstaller not finding correct modules
2018-10-11 22:02:59 -04:00
blitzmann
d46a2d61bb fix issue with pyinstaller not finding correct modules 2018-10-11 22:02:36 -04:00
Ryan Holmes
673a2e25e3 Merge pull request #1764 from pyfa-org/release/v2.5.0
Release/v2.5.0
2018-10-11 21:17:23 -04:00
blitzmann
749adb9ec8 update efsport 2018-10-11 21:16:12 -04:00
blitzmann
5cab8b1070 Merge remote-tracking branch 'origin/master' into release/v2.5.0-1
# Conflicts:
#	service/efsPort.py
2018-10-11 21:15:15 -04:00
blitzmann
00637f84cb update version 2018-10-11 21:12:07 -04:00
blitzmann
bc5a43bfb3 tox fixes 2018-10-11 21:08:26 -04:00
blitzmann
723ef5c48d Merge branch 'maxGroupFix' into release/v2.5.0-1 2018-10-11 00:50:43 -04:00
blitzmann
53c1a77aeb Add effect for emergency hull energizer 2018-10-11 00:47:41 -04:00
DarkPhoenix
e5389d44d9 Make mass entangler active 2018-10-10 10:42:12 +03:00
blitzmann
54b2e5b5fb update renders and icons 2018-10-09 18:38:05 -04:00