Commit Graph

6550 Commits

Author SHA1 Message Date
DarkPhoenix
712c49d129 Merge branch 'master' into price_optimize 2019-03-15 10:14:30 +03: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
768b0b3a3a Merge branch 'master' into price_optimize 2019-03-15 01:41:28 +03:00
DarkPhoenix
538271d737 Add UI-specific highIsGood override for web 2019-03-15 01:40:15 +03: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
DarkPhoenix
eaddc942a0 Merge branch 'master' into price_optimize 2019-03-12 14:25:51 +03: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
DarkPhoenix
f53c8e9efc Switch "total" and "character" around
So that total is bottom-right item
2019-03-09 17:40:13 +03:00
DarkPhoenix
d2b306d030 Fix export window sizing bug 2019-03-09 17:31:02 +03:00
DarkPhoenix
22fc6cb13c Integrate price optimization with undo/redo 2019-03-09 15:44:50 +03:00
DarkPhoenix
41711706c0 Merge branch 'master' into price_optimize 2019-03-07 13:13:17 +03:00
DarkPhoenix
becf7c3ff2 Commit stub of price optimization command 2019-03-06 23:59:11 +03:00
DarkPhoenix
257df58c3a Get rid of idea of "better" replacements
It turned out to be maintenance hell and it's just hard to find all the dual-action attributes (like crash vs GD sig attr, AB cycle time modification vs rep cycle time modification etc)
2019-03-06 00:43:19 +03:00
DarkPhoenix
8641c41da6 Add bunch of overrides to make sure hardwirings are upgraded as expected 2019-03-04 18:35:06 +03:00
DarkPhoenix
c3e03f2136 Fix em- implant series replacement 2019-03-03 23:39:55 +03:00
DarkPhoenix
4d31c2a2a3 Change the way we generate replacements and update database 2019-03-03 21:06:12 +03:00
DarkPhoenix
b03860e765 Add implant, booster and cargo support to fit price optimization 2019-03-03 19:57:59 +03:00
DarkPhoenix
647c093451 Add drones and fighters to fit optimization 2019-03-03 10:00:23 +03:00
DarkPhoenix
d96146034a Fix replacing of modules 2019-03-03 09:46:27 +03: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
DarkPhoenix
18e03e46c3 Wire functionality to menu item
Still doesn't work
2019-02-28 21:44:04 +03:00
DarkPhoenix
d9941945e0 Add method which supposedly will update fit to optimize its price 2019-02-28 00:12:53 +03: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
af3a7553ed Merge branch 'master' into price_optimize 2019-02-25 09:27:25 +03:00
DarkPhoenix
f68ee81634 Change stats window size for gtk 2019-02-25 09:26:35 +03:00
DarkPhoenix
4385b3651f Attempt to get rid of codacy warnings 2019-02-25 09:04:59 +03:00
DarkPhoenix
ed24e7a2a3 Add validity override of 2 hours for prices 2019-02-25 08:43:27 +03:00
DarkPhoenix
b9e68504ed Add support for multibuy price optimization option 2019-02-25 08:35: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