Commit Graph

6522 Commits

Author SHA1 Message Date
DarkPhoenix
42383cef03 Add effect which increases rig strength if system is not hi-sec 2019-03-16 13:29:47 +03:00
Ryan Holmes
2290281024 Merge pull request #1869 from IndictionEve/Code_Cleanup_Enums
Code cleanup enums #1862
2019-03-15 18:06:49 -04:00
Ryan Holmes
ac16b19d93 Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-14 20:15:25 -04:00
Ryan Holmes
51b3cff4a9 Fix for #1877 2019-03-14 20:15:05 -04:00
DarkPhoenix
538271d737 Add UI-specific highIsGood override for web 2019-03-15 01:40:15 +03:00
Ryan Holmes
61da8be732 Few import fixes and some bug fixes 2019-03-14 14:46:01 -04:00
Ryan Holmes
90e275e386 Remove unused import 2019-03-14 14:25:11 -04:00
Ryan Holmes
8e98af8517 Performance improvement when collecting counts for categories. Instead of making n calls for each category to sql, we get a grouped count by shipID, then process this in python, which is much faster. 2019-03-14 14:15:01 -04:00
Ryan Holmes
9a16c579eb fixing various imports to point to eos.const instead of old locations 2019-03-14 12:50:20 -04:00
Indiction
8b864692fb Moved non-EOS enum to new service/const.py. Renamed FittingAttrGroup
to GuiAttrGroup
2019-03-12 23:17:25 +01:00
Ryan Holmes
82c5ae1fe9 some clean up 2019-03-09 20:43:40 -05:00
Ryan Holmes
5c2df66335 #1867 Fix for the image list crash on linux 2019-03-09 20:38:58 -05:00
Indiction
afa8c3c53a Replaced eos.enum by enum. Removed unused enum import.
Found another Enum to move.
2019-03-09 18:59:43 +01:00
Indiction
bd33efa875 Changed FittingSlot to IntEnum 2019-03-09 18:45:28 +01:00
Indiction
f58c8ec4f9 Added unique to rest except Fittingslot 2019-03-09 15:18:10 +01:00
Indiction
aaec82e493 Added unique to current IntEnums
Renamed PortMultiBuyItemType to PortMultiBuyOptions
2019-03-09 12:30:05 +01:00
Indiction
6333a0c74b Adding descriptions to enums.
Renaming Enums into more useful names.
2019-03-07 22:30:51 +01:00
Indiction
e6309bb8bb Copy Enums to const.py
Switching to IntEnum where necessary.
2019-03-07 00:14:48 +01:00
IndictionEve
909c9f7b71 Merge pull request #2 from pyfa-org/master
Update
2019-03-06 23:29:50 +01:00
blitzmann
c9b0322c9f Merge branch 'tonycoz-colour-item-list' 2019-03-02 17:35:37 -05:00
blitzmann
114d72e23f Fix bug for when updating preferences before loading anything into ItemView 2019-03-02 17:35:30 -05:00
blitzmann
f8e6474b39 Some slight tweaks to work done by @tonycoz for #1839 2019-03-02 17:21:46 -05:00
Ryan Holmes
8d0c2c18d2 Merge branch 'master' into colour-item-list 2019-03-02 15:27:54 -05:00
Ryan Holmes
dddec72f13 Merge pull request #1813 from pyfa-org/attrGroup
Attribute grouping
2019-03-02 15:25:11 -05:00
Ryan Holmes
9cfbaf3450 Merge branch 'req_updates' into origin_master 2019-03-02 14:53:48 -05:00
Ryan Holmes
9fc16cb287 more updates 2019-03-02 14:31:16 -05:00
Ryan Holmes
78836add28 update requirements 2019-03-02 14:21:13 -05:00
Ryan Holmes
f919e23360 There's some times when self.httpd doesn't exist for some reason. Too lazy to find out the cause 2019-03-02 11:43:21 -05:00
Ryan Holmes
ec3822a6da Develop dialog and keep SSO server running as long as dialog remains active (#1859) 2019-03-02 11:00:28 -05:00
Tony Cook
9bdb4ea967 move the item slot colours to config and use it from there 2019-03-01 19:52:02 +11:00
Tony Cook
af17a4f1c9 make slot a property for item and use that for the item list bg 2019-03-01 19:51:30 +11:00
Tony Cook
2ea3394845 make the item list colour per slot if colorFitBySlot set
attempts to resolve #1839
2019-03-01 19:51:30 +11:00
Ryan Holmes
65dff8dcf7 Scroll the window back to 0, 0 when children are removed (#1843) 2019-02-28 21:41:59 -05:00
Ryan Holmes
bfaad631bc Fix crash in linux for attribute groupings 2019-02-28 20:24:07 -05:00
blitzmann
96a5bf7ea9 update eve.db 2019-02-28 18:52:41 -05:00
blitzmann
e665161dc8 Merge remote-tracking branch 'origin/master' into attrGroup
# Conflicts:
#	eve.db
2019-02-28 18:51:52 -05:00
Ryan Holmes
75d5b48df8 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2019-02-27 11:28:46 -05:00
Ryan Holmes
8c8e7825e9 fix typo 2019-02-27 11:28:38 -05:00
DarkPhoenix
f68ee81634 Change stats window size for gtk 2019-02-25 09:26:35 +03:00
blitzmann
1fcd95d36f Merge branch 'WatchMeCalculate-issue-1845' 2019-02-24 17:59:12 -05:00
blitzmann
4dc70dad3b Apply CTRL+Backspace fix for fitting Notes text box 2019-02-24 17:58:55 -05:00
blitzmann
e0a54c14e2 Merge branch 'issue-1845' of git://github.com/WatchMeCalculate/Pyfa into WatchMeCalculate-issue-1845 2019-02-24 17:49:42 -05:00
IndictionEve
09bc1eb9d2 Merge pull request #1 from pyfa-org/master
Update Commit
2019-02-24 08:24:57 +01:00
DarkPhoenix
5d0900337f Change how we split lines during fit import, also re-use split lines where needed to avoid format-specific linebreak bugs 2019-02-22 11:24:43 +03:00
Jonah Jolley
a5a9dc0877 Adding support for ctrl+backspace in searchbars 2019-02-21 18:18:01 -07:00
Anton Vorobyov
0dfe6707a7 Merge pull request #1856 from WatchMeCalculate/issue-1835
Mac Osx clipboard can store items with \r, ensure we split on newline or carriage return
2019-02-21 14:23:44 +03:00
Anton Vorobyov
0471cda64e Merge pull request #1847 from pyfa-org/fit_export_options
Multibuy export options
2019-02-21 12:28:20 +03:00
DarkPhoenix
b2bcdf0a46 Replace old export option format with new one when needed 2019-02-21 12:16:36 +03:00
DarkPhoenix
cf9d2082ef Fix codacy issues 2019-02-21 10:44:37 +03:00
DarkPhoenix
032b1589ad Merge branch 'master' into fit_export_options 2019-02-21 10:39:50 +03:00