Commit Graph

6110 Commits

Author SHA1 Message Date
Ryan Holmes
fc0bfd83b2 Merge pull request #1754 from MaruMaruOO/master
Small efs export update.
2018-10-08 16:54:21 -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
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
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
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
Alexander Maryanovsky
4e399f9bbb The text drawn in chrome_tabs is now crisp on Retina screens 2018-09-11 14:42:37 +03:00
Ryan Holmes
b77a577c06 Merge pull request #1725 from pyfa-org/issue1722
Make sure small abyssal nos has a type name (bad eve data)
2018-09-01 18:12:52 -04:00
blitzmann
c5aab07d65 Make sure small abyssal nos has a type name (bad eve data) 2018-09-01 18:12:16 -04:00
Ryan Holmes
99a8b03697 Add pyfa and eve data version to error dialog 2018-09-01 03:01:42 -04:00
Ryan Holmes
9d63946aa7 Merge pull request #1715 from pyfa-org/priceFix
Price callback fix
2018-08-30 23:05:41 -04:00
Ryan Holmes
75333264a7 Merge pull request #1710 from minlexx/master
Fix parsing system proxy var containing "user:password@" part
2018-08-25 22:22:32 -04:00
blitzmann
79be16114d fix 2018-08-25 19:12:42 -04:00
blitzmann
97ef231711 fix price callbacks 2018-08-23 21:10:59 -04:00
Alexey Minnekhanov
dde5ee3701 Fix parsing system proxy var containing "user:password@" part 2018-08-23 11:15:33 +03:00
DarkPhoenix
44a3cb3b2e Add ability to export mutated module attributes 2018-08-22 19:54:52 +03:00
DarkPhoenix
44c58abe81 Rewrite EFT export function
Now uses double blank lines to divide logical sections, and racks within these sections (mods/rigs/subs, drones/fighters, implants/boosters) and sorts unordered containers for export
2018-08-22 18:51:31 +03:00
Ryan Holmes
7055690805 Merge pull request #1705 from pyfa-org/release/v2.4.0
Release/v2.4.0
2018-08-21 20:45:51 -05:00
blitzmann
116dde3f3f Bump release 2018-08-21 21:45:35 -04:00
Ryan Holmes
daef1ebdfd Merge branch 'master' into release/v2.4.0 2018-08-21 20:43:27 -05:00
Ryan Holmes
5c38ab4228 Merge pull request #1688 from MaruMaruOO/efs_port
Adds copy to clipboard for Eve Fleet Simulator
2018-08-21 20:43:13 -05:00
Ryan Holmes
299243c446 Merge pull request #1689 from MaruMaruOO/issue/1683
Update market.service to reflect new booster market groups.
2018-08-21 20:34:48 -05:00
Ryan Holmes
970c3a5473 Merge branch 'master' into efs_port 2018-08-21 20:21:16 -05:00
Ryan Holmes
bc63eaa876 Merge pull request #1704 from feyyd/bug/1692
Bug/1692
2018-08-21 20:14:44 -05:00
Ryan Holmes
78de723b81 Merge pull request #1701 from feyyd/bug/1691
Bug/1691
2018-08-21 20:12:57 -05:00
Ryan Holmes
dbb9823df5 Merge pull request #1697 from feyyd/bugfix-1695
Bug/1695, Bug/1690
2018-08-21 20:06:15 -05:00
blitzmann
95899548e5 Fix an issue with double forward slashes in res paths (#1703) 2018-08-21 20:58:38 -04:00
blitzmann
2a076292da pep8 2018-08-21 20:48:30 -04:00
blitzmann
308fa3c46c Update effect headers 2018-08-21 20:47:56 -04:00
blitzmann
ccd6d357ed New icons 2018-08-21 20:45:16 -04:00
blitzmann
21b6a2cdfd Update for new effects and ships 2018-08-21 20:44:46 -04:00
DarkPhoenix
ccbd0a117b Fix merge issue 2018-08-21 19:51:56 +03:00
DarkPhoenix
6caa79c951 Merge master into singularity 2018-08-21 19:43:41 +03:00
DarkPhoenix
4365da8292 Merge branch 'master' into singularity 2018-08-21 19:40:39 +03:00
DarkPhoenix
ff222b8d62 Some fixes to DB conversion script 2018-08-21 19:39:07 +03:00
P
b4e765abfa add None checks in deleteFit to prevent exceptions 2018-08-20 21:41:50 -07:00
P
2f40365a03 default return of getModifiedAttr so can use comparison 2018-08-19 17:42:55 -07:00