Commit Graph

6628 Commits

Author SHA1 Message Date
Ryan Holmes
703dc93dee Merge branch 'origin_master' into effect_rollup 2019-03-21 19:57:45 -04:00
Ryan Holmes
7fd545aad4 add rollup to macos build 2019-03-21 19:57:27 -04:00
Ryan Holmes
a69730085f Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-21 19:48:10 -04:00
Ryan Holmes
1603201166 Add "Can fit" grouping 2019-03-21 19:47:31 -04:00
DarkPhoenix
8380f516e8 Add fallback for safety 2019-03-21 23:56:44 +03:00
DarkPhoenix
1b7c23b1d3 Sort boosters by slot 2019-03-21 23:55:25 +03:00
DarkPhoenix
6291fe1626 Fix HTML export (#1890) 2019-03-21 13:01:21 +03:00
DarkPhoenix
cdaf5cc168 No need to use .value for IntEnums 2019-03-21 12:55:39 +03:00
Ryan Holmes
5940625e24 Don't attempt to add cargo if there is not fitting loaded (#1888) 2019-03-20 21:51:58 -04:00
Ryan Holmes
549353dba1 Merge pull request #1885 from pyfa-org/issue1870
Implement fixes for #1870 - undo the Module.toDummy that happens when…
2019-03-20 18:01:30 -04:00
DarkPhoenix
4dc281b37e Move spoolup enum into costs 2019-03-20 13:07:44 +03:00
DarkPhoenix
0242cc845c Pep8 2019-03-20 13:05:38 +03:00
DarkPhoenix
e9c6d98db8 Fix fetching skills via ESI 2019-03-20 13:04:38 +03:00
DarkPhoenix
86459faf76 Fix issue with ship filter which didn't follow market overrides
It bugged out if you have some limited edition ships. E.g. if you have malice fit and no other AF fits, when you enable filter it hid limited edition group but showed AF group
2019-03-20 12:12:51 +03:00
Anton Vorobyov
e8af636831 Merge pull request #1857 from pyfa-org/price_optimize
Price optimize
2019-03-19 19:48:36 +03:00
Ryan Holmes
eea7220e3d remove incorrect files 2019-03-19 11:47:55 -04:00
Ryan Holmes
cc56611783 add comment 2019-03-19 11:36:30 -04:00
Ryan Holmes
0b511af48a Remove weird typo, whoops 2019-03-19 11:34:54 -04:00
Ryan Holmes
25bbf3dc03 Move export logic from mainframe to export dialog, and introducing ui blocking for price optimization 2019-03-19 11:34:10 -04:00
DarkPhoenix
72a602b5b0 Merge branch 'master' into price_optimize 2019-03-19 16:45:17 +03:00
Ryan Holmes
d107156341 Fix for sill name getting cutoff on gtk (#1886) 2019-03-19 09:15:09 -04:00
DarkPhoenix
8063647bba Merge branch 'master' into price_optimize 2019-03-19 08:42:06 +03:00
Ryan Holmes
573d8e068c Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-18 22:32:48 -04:00
Ryan Holmes
f6c6f9a0c9 Handle double click event on skill groups in character editor (#1886) 2019-03-18 22:30:54 -04:00
Ryan Holmes
d9c5c9cc0e Merge pull request #1836 from pyfa-org/spoolup
Spoolup
2019-03-18 20:32:18 -04:00
Ryan Holmes
bb7fb022ef fixes for windows and selected menu item 2019-03-18 20:25:28 -04:00
DarkPhoenix
52c9f4076b Change reset label 2019-03-18 20:08:06 +03:00
DarkPhoenix
894231b009 Change selection affix 2019-03-18 19:40:30 +03:00
DarkPhoenix
34fe530ac7 Add current value marker 2019-03-18 19:29:27 +03:00
DarkPhoenix
33b91a79ab Add option to disable this context menu 2019-03-18 18:21:53 +03:00
DarkPhoenix
51180a9375 Put spoolup menu above item stats 2019-03-18 17:54:00 +03:00
DarkPhoenix
6e44963d57 Implement spoolup selection via purely context menu 2019-03-18 17:52:37 +03:00
DarkPhoenix
8114765236 Merge branch 'master' into spoolup 2019-03-18 16:04:45 +03:00
DarkPhoenix
7ddd3a35d1 Merge branch 'master' into price_optimize 2019-03-18 14:34:35 +03:00
DarkPhoenix
52a68adb11 Put character editor window into scope of main window
This fixes various annoying things happening under linux: two separate applications shown when character editor open and various window focus bugs when opening stats of skills in character editor
2019-03-18 14:33:17 +03:00
DarkPhoenix
566e7fd046 Disable UI for duration of price optimization 2019-03-18 13:55:57 +03:00
Ryan Holmes
a74cdc59bd Implement fixes for #1870 - undo the Module.toDummy that happens when replacing a module, but the new module doesn't fit. And shuffle around the logic that dictates if a module / item fits onto a particular ship to allow us to ask a fit if a base item can fit based on low-level attributes that don't change 2019-03-17 22:03:39 -04:00
Ryan Holmes
3c98aad4ba Autosize the item attribute columns (#1878). 2019-03-17 19:35:19 -04:00
Ryan Holmes
0063840cfa Merge branch 'price_optimize' of https://github.com/pyfa-org/Pyfa into price_optimize 2019-03-17 13:18:50 -04:00
Ryan Holmes
96077ed115 Create blocking UI for fit price optimizations 2019-03-17 13:18:42 -04:00
Ryan Holmes
19f02ef914 Align skill column to the right (#1866) 2019-03-17 09:06:47 -04:00
Ryan Holmes
de9ce47bed Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2019-03-17 09:01:47 -04:00
Ryan Holmes
ccd3665115 Do not call Layout on the skill tree view. #1866 2019-03-17 09:01:40 -04:00
Ryan Holmes
1a992a90ad Add logging 2019-03-16 19:11:27 -04:00
Ryan Holmes
fff07078dc add eos config option for all effects 2019-03-16 14:36:35 -04:00
Ryan Holmes
81d040fba6 Convert all effect files to effect<ID>.py 2019-03-16 14:08:20 -04:00
DarkPhoenix
a35f04cd9a Merge branch 'master' into price_optimize 2019-03-16 13:55:35 +03:00
DarkPhoenix
c6c364c451 Change runtime of combat rig sec modifier 2019-03-16 13:55:13 +03:00
DarkPhoenix
8dcc3f2b51 Merge branch 'master' into price_optimize 2019-03-16 13:30:35 +03:00
DarkPhoenix
42383cef03 Add effect which increases rig strength if system is not hi-sec 2019-03-16 13:29:47 +03:00