blitzmann
47a683c44c
Merge branch 'feature/strictSkills' into dev
...
Conflicts:
service/character.py
Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
blitzmann
184c46dbce
Merge branch 'bug/unicode-skill-export' into dev
2017-05-06 13:11:07 -04:00
blitzmann
703d6dbc85
Merge branch 'feature/grant-needed-skills' into dev
2017-05-06 13:09:30 -04:00
blitzmann
d342e66db4
Merge branch 'feature/sec-status-change' into dev
...
Add ability to change characters sec status
2017-05-06 12:23:40 -04:00
blitzmann
1222567a4f
Merge branch 'feature/allow-restrictions' into dev.
...
Allows user to turn off most fitting restrictions (#1117 )
2017-05-06 12:11:00 -04:00
blitzmann
1f7858f853
Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
...
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
blitzmann
c2880c0175
Move queue and wait variables to __init__.
...
Turns out threading.start() returns before the thread actually starts, so there were situations in which we would start the thread and immediately try to use it before run() happened.
2017-05-04 19:27:54 -04:00
blitzmann
f57e7cf1ec
Implement FloatSpin as well as changing sec status via character editor
2017-04-26 22:14:30 -04:00
blitzmann
9bffc6afd6
Fix issue in which exception happened because of a bad type check
2017-04-26 19:59:57 -04:00
blitzmann
c9a04e886a
Add eos setting for strict skills, and update info in skill tree without doing a repopulation
2017-04-22 14:02:40 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -04:00
blitzmann
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
blitzmann
f0fc5643e9
Return and save sec status for character when updating skills
2017-04-18 00:01:25 -04:00
blitzmann
8c83ac120f
Implement asynchronous api skill fetching
2017-04-18 00:01:24 -04:00
blitzmann
1ee679903c
Bring dev up to date with master
...
Conflicts:
service/fit.py
2017-04-16 11:42:41 -04:00
Ryan Holmes
962c45b807
Merge pull request #1124 from StinGer-ShoGuN/PR_01
...
Default HTML export to pyfa save path, and allow override of database file path
2017-04-14 00:31:59 -04:00
blitzmann
04242ef52c
Fix issue with handling item names that include unicode
2017-04-13 23:39:42 -04:00
blitzmann
283aba4f85
Add grant missing skills feature
2017-04-13 23:26:08 -04:00
blitzmann
e28bf545e9
Fix some bugs with notes view - exception happening due to lack of fit, and possibility of notes saving under the wrong fit
2017-04-12 23:22:57 -04:00
Ryan Holmes
5aeb3a38c8
Fit Calculation Code Cleanup ( #1103 )
...
* Remove dirtyStorage, legacy of old fleet boosting system
* Remove withBooster flag from the recalc() function.
This was a legacy parameter dealing with the old fleet boost code, the purpose of which has changed with the addition of command boosts. We no longer have to call recalc with this particular parameter (indeed, it was forced to False in `recalc`). These were never cleaned up. We still have the withBoosters parameter for the `calculateModifiedAttributes` function, however that will be renamed and has a different meaning than it used to (used in the recursion of command fits)
* Add some comments
* Consolidate the tangled mess of conditional flags meant to determine if a fit is local/projected/command. This should make the logic flow a bit clearer.
Also rewrite a blurb about returning on a calculated fit - need to look into this a little bit more.
* fix up test to no longer pass `withBooster`
2017-04-12 19:50:16 -04:00
StinGer ShoGun
c00372900f
Save HTML export to .pyfa user's directory by default.
...
This commit is part of attempts to ease system package creation and
maintenance (specifically Gentoo ebuilds).
2017-04-12 16:13:56 +02:00
Ryan Holmes
114246bf1e
Do not recalc fits on tab switch ( #1105 )
...
* Do not recalc fits if they are already calculated. Fits that are projected onto other fits recursively set their victims to `calculated=False` so that the victim will re calculate when it loads again.
* Reset boosted fits when calculating a fit that is boosting others. Also, remove semicolon due to habit :x
* Develop a `__resetDependantCalc()` which will reset any fits that are immediately affected by the current fits calculation.
2017-04-11 23:40:40 -04:00
Ryan Holmes
ebda1349cf
Add a small delay on key down for market search ( #1123 )
...
* Add a small delay on key down for market search
* prevent a double search if user does something like hit enter in the middle of a timer
2017-04-11 23:30:38 -04:00
blitzmann
4e74555b5d
Opps, forgot to change this back from testing.
2017-04-10 21:26:03 -04:00
blitzmann
ce01c66b3e
Better manage price object juggling in Item.price property. The previous way was creating new price objects when an object already existed in the database which could lead to Integrity issues.
2017-04-10 20:48:58 -04:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ryan Holmes
3dd539b4f0
Improve some efficiencies with the variations context menu: Do not recalc twice when switching items. ( #1095 )
2017-04-02 16:46:25 -05:00
Ryan Holmes
92722d491f
Remove functionality related to auto HTML export ( #1088 )
2017-04-02 11:46:17 -05:00
Ryan Holmes
216dac068d
Fix for #1090 - using variations on implants is not recalcing fit correctly. ( #1094 )
2017-04-02 01:04:34 -05:00
blitzman
cb77987129
Fix an exception caused by too few variables for string formatting
2017-03-26 23:51:05 -04:00
Ryan Holmes
a67c28a4c9
Merge branch 'development' into feature/commandmenu
2017-03-26 14:43:12 -04:00
blitzman
d928df9c69
Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now
2017-03-26 14:28:13 -04:00
blitzman
b18bb200a9
Merge branch 'development' into MorePreferences
2017-03-26 13:52:59 -04:00
blitzman
024edc500f
Fix settings provider
2017-03-26 13:35:46 -04:00
Ryan Holmes
df587892a3
Merge branch 'development' into feature/commandmenu
2017-03-26 12:27:52 -04:00
Ryan Holmes
1ffcdc92f2
Merge pull request #1031 from Ebag333/tooltip_capacitor_neut_resistance
...
Tooltip for capacitor neut resistance
2017-03-26 12:16:41 -04:00
Ryan Holmes
bd043c2358
Fix for #1061 ( #1068 )
...
Squash commit that does the following:
* Enable Council Diplo Shuttle
* Disables a test that was preventing Travis from returning success (need to look into this more later)
2017-03-26 12:15:07 -04:00
Ebag333
5d5c95fb2c
Example tests for services! General cleanup.
...
(cherry picked from commit 9f41bb4)
2017-03-24 11:15:39 -07:00
Ebag333
13305d9ee1
Use correct formula. \o/
...
(cherry picked from commit b20b6c1)
2017-03-24 11:15:37 -07:00
blitzman
6c1d949cef
Proof of concept for gathering fits based on modules that are fit
2017-03-23 00:38:23 -04:00
blitzman
0a1008f64f
Merge branch 'master' into development
2017-03-23 00:35:28 -04:00
Ebag333
301e874cd4
Add a ton of logging to the fitting service
2017-03-17 16:05:09 -07:00
Ryan Holmes
58142664cc
Merge pull request #1051 from Ebag333/Fix_PR943
...
Fix bad merge of #943
2017-03-16 18:58:09 -04:00
Ebag333
e3c2220a1c
Fix matplotlib importing
2017-03-16 14:09:10 -07:00
Ebag333
1c59a27902
Fix typo and missing setting
...
(cherry picked from commit c122047)
2017-03-16 08:40:18 -07:00
Ebag333
99f939026f
Refactor some logic in modifiedAttributeDict
2017-03-09 12:14:23 -08:00
Ebag333
9da485da55
Cleaning up tox errors that crept in by the pep8 gremlins.
2017-03-08 21:02:57 -08:00
Ebag333
8322307ae0
Add tooltip for neut resist. Add handling missing attributes in getting modified value (return default, not exception). Tox fixes to clean up a little.
2017-03-07 09:45:34 -08:00
blitzman
9befaf7c91
Test implementation of eos settings
2017-03-05 02:01:10 -05:00
Ebag333
ff5d40dcd3
Add additional logging to services
2017-02-28 10:32:03 -08:00
