petosorus
|
46f5a592ce
|
Right click option to fill slots with a module
|
2018-10-21 16:07:02 +02: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 |
|
blitzmann
|
1276016a98
|
Reintroduce the check states functionality to the AddModule and ChangeState commands
|
2018-10-09 18:19:29 -04:00 |
|
blitzmann
|
c54d0dc5ff
|
add dynamic attribute miner to dump
|
2018-10-08 22:32:26 -04:00 |
|
Ryan Holmes
|
fc0bfd83b2
|
Merge pull request #1754 from MaruMaruOO/master
Small efs export update.
|
2018-10-08 16:54:21 -04:00 |
|
blitzmann
|
42620c842e
|
added some icons
|
2018-10-08 13:43:06 -04:00 |
|
blitzmann
|
fd3b3f98bf
|
Bumped version to 1398728
|
2018-10-08 13:38:52 -04:00 |
|
blitzmann
|
fd7c5c1580
|
Remove some old debugging prints
|
2018-10-08 12:50:07 -04:00 |
|
blitzmann
|
c0922adfb2
|
Merge branch 'hd-images' into release/v2.5.0
|
2018-10-08 12:44:04 -04:00 |
|
blitzmann
|
1454cd8a0d
|
Merge remote-tracking branch 'origin/development' into release/v2.5.0
|
2018-10-08 12:40:23 -04:00 |
|
MaruMaruOO
|
3e249ec155
|
Minor lint and EFS export maxRange bug fix.
|
2018-09-28 23:36:18 -04:00 |
|
MaruMaruOO
|
edfbf71958
|
EFS export version bump
|
2018-09-27 03:06:00 -04:00 |
|
MaruMaruOO
|
4876ff7035
|
Merge branch 'master' into efs_port
|
2018-09-27 02:52:49 -04:00 |
|
MaruMaruOO
|
d5034c9e0d
|
Add HIC points to EFS export.
|
2018-09-27 02:50:28 -04:00 |
|
Ryan Holmes
|
9ec54c9004
|
Merge pull request #1751 from pyfa-org/issue/1750
Fix for #1750 - when sorting items in the item compare, items without…
|
2018-09-26 18:17:55 -04:00 |
|
blitzmann
|
0749e03211
|
Fix for #1750 - when sorting items in the item compare, items without that attribute cause an error due to None / int comparison
|
2018-09-26 18:17:28 -04:00 |
|
Ryan Holmes
|
e03adad23a
|
Merge pull request #1749 from pyfa-org/issue/1656
Update DPS as factor in reload setting in preferences changes
|
2018-09-25 21:14:59 -04:00 |
|
blitzmann
|
9b3ba8c9aa
|
Update DPS as factor in reload setting in preferences changes
|
2018-09-25 21:14:37 -04:00 |
|
Ryan Holmes
|
85746cd681
|
Merge pull request #1748 from pyfa-org/issue/1447
Fix an issue in which left up event was triggered after selecting a f…
|
2018-09-25 21:04:18 -04:00 |
|
blitzmann
|
2e64280403
|
Fix an issue in which left up event was triggered after selecting a file in a file dialog (#1447)
|
2018-09-25 21:03:51 -04:00 |
|
Ryan Holmes
|
d7b81ea87d
|
Merge pull request #1747 from pyfa-org/issue/1746
Fix for localized fliament abyssal effect
|
2018-09-25 20:31:35 -04:00 |
|
blitzmann
|
f4404e2649
|
Fix for localized fliament abyssal effect
|
2018-09-25 20:29:48 -04:00 |
|