Commit Graph

5213 Commits

Author SHA1 Message Date
blitzmann
f355cb3a72 Update effect headers 2017-06-25 00:18:06 -04:00
blitzmann
ff58648f94 start picking at strat cruiser update 2017-06-21 22:19:37 -04:00
blitzmann
cf02c74272 bump dev 2017-06-01 00:33:46 -04:00
blitzmann
f77cd0b834 Merge branch 'master' into development 2017-06-01 00:32:06 -04:00
Ryan Holmes
461f5219e5 bump release (#1204) 2017-05-31 23:51:46 -04:00
Ryan Holmes
373ead8da6 Add structure painter / web to dps graph (#1203) (#1202) 2017-05-31 23:14:17 -04:00
Ryan Holmes
3371086d54 Fix for #1193 - compounded bonuses during recursive command / projected fittings (#1197)
* Teak calculated logic

* test

* clear() on every calculation if it's not already calculated

* tox fix
2017-05-31 00:01:59 -04:00
Ryan Holmes
45c3533501 Make some extra logging statements and stuff to troubleshoot fit deletion bugs (#1199) 2017-05-30 22:57:52 -04:00
Ryan Holmes
4286f2ea5a Add stacking penalties to armor and shield resist command links (#1198) 2017-05-30 22:44:01 -04:00
Ryan Holmes
344546a583 Merge pull request #1196 from jasconius/mactest
updated drag and drop behavior to not trigger a suspected wx bug on Mac
2017-05-30 22:26:59 -04:00
Michael Ryan
46f61ecfa3 address travis errors 2017-05-30 21:07:02 -05:00
Ryan Holmes
2ec9c5addb Merge pull request #1194 from petosorus/pricing-pane-1158
Pricing pane 1158
2017-05-30 21:42:05 -04:00
Michael Ryan
d09f21fe15 updated drag and drop behavior to not trigger a suspected wx bug on Mac 2017-05-30 20:18:32 -05:00
petosorus
33410f0618 Formatting 2017-05-30 15:51:48 +02:00
petosorus
2c98baade8 Price options labels + total computing in minimal 2017-05-29 15:24:21 +02:00
petosorus
380f90d065 Price options in context menu 2017-05-24 17:30:55 +02:00
petosorus
1781c6dcf0 total computation + settings 2017-05-24 16:27:32 +02:00
Ryan Holmes
cff3d0ee95 Don't process removeModule is ctrl / cmd key is active (#1190) 2017-05-22 01:50:13 -04:00
Ryan Holmes
d1fc2dd6ec Fix issue with calculateSustainableTank not considering remote ancil modules (from https://forums.eveonline.com/default.aspx?g=posts&m=6948134#post6948134) (#1189) 2017-05-22 00:55:35 -04:00
Ryan Holmes
218712835e Merge pull request #1188 from pyfa-org/bug/evemon-char
EVEMon import fix
2017-05-22 00:41:12 -04:00
Ebag333
5a60cff9a1 Fixes EVEMon import. Security status was added, but wasn't handled in the EVEMon import. Also, default secstatus to 0 if it's somehow missing. 2017-05-22 00:29:29 -04:00
Ryan Holmes
18554e3186 Fix a bunch of item swapping mechanisms (see #1186) (#1187) 2017-05-21 20:31:12 -04:00
Ryan Holmes
2e2303c9aa Update some migrations to consider new schema (#1185)
* Update some migrations to consider new schema

* tox
2017-05-20 02:44:26 -04:00
blitzmann
fbf455c9fe Fix for fighter prices (#1178) 2017-05-18 22:28:09 -04:00
blitzmann
00dcda6fad Check if projected / command thing actually exist before attempting to remove it 2017-05-18 22:22:02 -04:00
blitzmann
3be7538daa Bump dev 2017-05-18 22:22:02 -04:00
Ryan Holmes
9e0638c54c Merge pull request #1175 from pyfa-org/bumprelease
Bumprelease
2017-05-16 22:12:29 -04:00
blitzmann
a5ff46fbd1 Bump stable 2017-05-16 21:34:09 -04:00
Ebag333
6900938208 Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. 2017-05-16 21:33:45 -04:00
blitzmann
4887817142 Revert "Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. (#1168)"
This reverts commit da33a372cb. Was squashed by mistake, commit author was lost
2017-05-16 21:33:28 -04:00
Ryan Holmes
0d721b55a7 Fix for when factor reload when module doesn't have a cycle time (#1171) (#1173) 2017-05-16 00:09:51 -04:00
Ryan Holmes
65f71b6f6b Fix exception with character implants, and don't show implant set menu if there aren't any (#1172) 2017-05-15 22:59:47 -04:00
Ryan Holmes
89b508d0f6 Merge pull request #1170 from pyfa-org/bug/char_fixes
Various character fixes
2017-05-14 23:05:18 -04:00
Ryan Holmes
6344f7a975 Merge branch 'master' into bug/char_fixes 2017-05-14 22:56:34 -04:00
blitzmann
11eea37aa7 Remove duplication of Character.ro property 2017-05-14 22:50:18 -04:00
blitzmann
bff44c46f8 Fix character list sorting (https://forums.eveonline.com/default.aspx?g=posts&m=6940327#post6940327) 2017-05-14 22:44:02 -04:00
blitzmann
7a0ea759ef Fix issue with character copy, as well as instantiating character with duplicate skills (since Skill has a backref to charactrer, it's automatically added to the characters skill list. No more need for the append()) 2017-05-14 22:24:05 -04:00
blitzmann
f9419977c0 Instantiate skills with a character (may help to solve https://forums.eveonline.com/default.aspx?g=posts&m=6939299#post6939299) 2017-05-14 20:55:48 -04:00
Ryan Holmes
da33a372cb Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. (#1168) 2017-05-14 20:52:06 -04:00
blitzmann
0db141d0a6 Fix exception when reverting character skills 2017-05-14 02:26:32 -04:00
blitzmann
79445225de fix issue with market shortcuts if not active items are present 2017-05-14 02:21:23 -04:00
Ryan Holmes
a0f5e4cbb3 Merge pull request #1166 from pyfa-org/bug/t3d-mod-delete
Bug/t3d mod delete
2017-05-14 01:59:38 -04:00
blitzmann
3b23c9eacd flake8 2017-05-14 01:41:15 -04:00
blitzmann
d4ce1ef3db Fix issue with Delete key event on t3d mode causing exception (#1160). Additionally, work around the fact that every module that is removed also recalculates the fit, allowing for a faster response time when deleting multiple modules at a time. This is somewhat ugly as the removeModule function was originally based on the assumption of removing only one module. Should clean it up at some point. 2017-05-14 01:37:49 -04:00
Ryan Holmes
b4f063b07a Merge pull request #1165 from pyfa-org/bug/fit-delete-stuff2
Bug/fit delete stuff2
2017-05-14 00:42:26 -04:00
blitzmann
ffe840e245 Fix for #1161. Can't reproduce, but I'm unsure what the root cause is (probably something firing in the wrong order). 9be4ae may also alleviate the root cause. 2017-05-13 23:28:51 -04:00
blitzmann
2e3c3e92f1 Fix for a possible bug (see comments in #1147). 2017-05-13 23:28:50 -04:00
blitzmann
5e20d6973f Fix situation in which deleting a fit that was both a command and projected fit for the same target threw an error 2017-05-13 23:28:49 -04:00
blitzmann
c68739d78c Move the FitRemoved event before the stage selected events. Otherwise, if the stage is selected first and the FitItem (self) is deleted before the FitRemoved is done, we get an error about how self is not valid anymore 2017-05-13 23:28:49 -04:00
blitzmann
5392aaa27e refresh command fits on boosted fits when the booster is deleted 2017-05-13 23:28:48 -04:00