Commit Graph

6241 Commits

Author SHA1 Message Date
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
DarkPhoenix
f598e8e3c2 Fix couple of price-related bugs 2018-09-19 04:51:14 +03:00
Ryan Holmes
27488a0260 Merge pull request #1738 from m-sasha/missile-ammo-picker-fix
Fixed missile module ammo picker not showing damage type icons.
2018-09-17 00:30:06 -04:00
Ryan Holmes
c53e7964bf Merge pull request #1741 from pyfa-org/codeCleanup
Code cleanup
2018-09-17 00:04:23 -04:00
Ryan Holmes
3516d6fdc5 Merge pull request #1740 from pyfa-org/issue/1730
Add missing entosis link effect
2018-09-17 00:01:24 -04:00
blitzmann
69af1440ae Add missing entosis link effect 2018-09-17 00:00:42 -04:00
blitzmann
31c3101d6d Remove redundant parenthesis 2018-09-16 01:11:16 -04:00
blitzmann
5850026aa9 docstring fixes 2018-09-16 01:09:55 -04:00
blitzmann
b4b8a158f5 Bunch of import optimizations 2018-09-16 00:05:36 -04:00
blitzmann
5c6303995d Replace set() with a literal 2018-09-15 23:44:32 -04:00
blitzmann
f0353a7dd7 some dict cleanup 2018-09-15 23:44:16 -04:00
blitzmann
1fb19e3b94 Merge remote-tracking branch 'origin/master' into development 2018-09-15 23:41:49 -04:00
Ryan Holmes
1788b32b83 Merge pull request #1727 from pyfa-org/commandRefactor
Undo/Redo (refactoring into command pattern)
2018-09-15 23:41:06 -04:00
blitzmann
621672bf34 Some tox fixes 2018-09-15 20:38:08 -04:00
blitzmann
b08406b7d6 Move the FitRenameCommand command 2018-09-15 17:46:55 -04:00
Ryan Holmes
6211d1de70 Merge pull request #1728 from pyfa-org/errorDialogFixes
Add pyfa and eve data version to error dialog
2018-09-15 17:30:49 -04:00
Ryan Holmes
916b11deb8 Merge pull request #1735 from m-sasha/crisp-text
The text drawn in chrome_tabs is now crisp on Retina screens
2018-09-12 20:50:56 -04:00
Alexander Maryanovsky
8e41a90f57 Fixed missile module ammo picker not showing damage type icons. 2018-09-12 23:54:02 +03:00
blitzmann
9aa2b17ae6 commit all the new things! 2018-09-11 19:50:25 -04:00