Ryan Holmes
|
a67c28a4c9
|
Merge branch 'development' into feature/commandmenu
|
2017-03-26 14:43:12 -04:00 |
|
blitzman
|
e7de57fc7a
|
tox fixes
|
2017-03-26 14:39:45 -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 |
|
Ryan Holmes
|
4795571629
|
Merge branch 'development' into HandleBadHandleres
|
2017-03-26 12:33:58 -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 |
|
Ebag333
|
8baeafbdc2
|
Rename a few tests to follow standards. Move fits into a helper so they can be reused. Add two new Eos tests.
(cherry picked from commit f87ac4d)
|
2017-03-24 11:15:25 -07:00 |
|
Ebag333
|
1240e0f768
|
attempt terrible hack make run in memory
(cherry picked from commit 357275c)
|
2017-03-24 11:15:20 -07:00 |
|
Ebag333
|
cdbd2979d2
|
Back to what works on Windows
(cherry picked from commit 3401b87)
|
2017-03-24 11:15:05 -07:00 |
|
Ebag333
|
da493d07c0
|
recreate DB connection
(cherry picked from commit 5593e28)
|
2017-03-24 11:15:02 -07:00 |
|
Ebag333
|
d84787b041
|
add test
(cherry picked from commit b1b5cb1)
|
2017-03-24 11:14:57 -07:00 |
|
Ebag333
|
403b39659c
|
Fix tox things.
(cherry picked from commit 60298c8)
|
2017-03-24 11:14:34 -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
|
b4ad4becd3
|
Fix for #1060
|
2017-03-19 16:27:41 -04:00 |
|
Ebag333
|
6ce52a1da9
|
PEP8 cleanup
(cherry picked from commit 63f2f85)
|
2017-03-16 08:40:14 -07:00 |
|
Ebag333
|
a588aec978
|
Simple change to not try and reimport handlers if they have failed previously.
|
2017-03-15 15:53:40 -07:00 |
|
blitzman
|
4633a1c136
|
some clean up
|
2017-03-14 19:22:18 -04:00 |
|
Ebag333
|
9d34c2a2e6
|
Add TODO
|
2017-03-13 11:52:18 -07:00 |
|
Ebag333
|
4f12caa05f
|
Remove test variable
|
2017-03-13 11:30:07 -07:00 |
|
Ebag333
|
649ba71c0f
|
Make sure overrides are enabled before we return override values
|
2017-03-13 11:15:14 -07:00 |
|
Ebag333
|
af5a9b31bc
|
Fix another hidden import (move to top)
|
2017-03-13 11:09:12 -07:00 |
|
Ebag333
|
b72304203c
|
Add default option to getOriginal. This eliminates some double lookups and simplifies the code.
|
2017-03-13 10:56:33 -07:00 |
|
Ebag333
|
f70d250995
|
Cleanup code. Use slightly faster comparison (is instead of isinstance). Rename OVERRIDES variable to eliminate confusion.
|
2017-03-13 10:11:15 -07:00 |
|
Ryan Holmes
|
53937d1723
|
Merge pull request #1023 from Ebag333/EosLoggingCleanup
Quick Eos cleanup and logging fix
|
2017-03-11 19:33:58 -05:00 |
|
Ebag333
|
46626e9a63
|
Kill another double lookup
|
2017-03-09 15:31:19 -08:00 |
|
Ebag333
|
b5626c13b1
|
Refactor __calculateValue
|
2017-03-09 15:16:52 -08:00 |
|
Ebag333
|
84de420002
|
Remove comment
|
2017-03-09 12:27:45 -08: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
|
1c4128b9a1
|
Change probe size cap to 1.08 (previous testing done apparently showed 1.1 - 1.12, however most people refer to 1.08 as the cap.
|
2017-03-05 17:01:00 -05:00 |
|
blitzman
|
9befaf7c91
|
Test implementation of eos settings
|
2017-03-05 02:01:10 -05:00 |
|
Ebag333
|
b9b56f5e73
|
kill another hidden import.
|
2017-02-28 19:23:01 -08:00 |
|
Ebag333
|
d28312f13b
|
Slightly correction to the effective reload time for cycle time.
|
2017-02-28 18:57:12 -08:00 |
|
Ebag333
|
9134464a39
|
Fixes case that would generate a exception on the first fit calc (would trigger logging dumps for users). Also clean up a bunch of unnecessary try/exceptions, and some logging improvements
|
2017-02-28 11:28:41 -08:00 |
|
Ebag333
|
d67573f83a
|
Add more functionality to preferences window.
|
2017-02-27 12:05:38 -08:00 |
|
blitzman
|
1826122381
|
Clean up some syntax (use isinstance) and tox stuff
|
2017-02-26 14:17:46 -05:00 |
|
Ryan Holmes
|
70934e05e1
|
Merge pull request #943 from Ebag333/More_Variations
Add variations for: drones, fighters, boosters, and implants
|
2017-02-26 13:33:13 -05:00 |
|
Ebag333
|
e4d0f2dc6f
|
Fix case where property gets reran multiple times.
|
2017-02-26 08:46:23 -08:00 |
|
blitzmann
|
767cb46d40
|
Merge branch 'development' into More_Variations
Conflicts:
gui/builtinContextMenus/metaSwap.py
|
2017-02-26 02:24:38 -05:00 |
|
blitzmann
|
c430a2d798
|
Merge branch 'development' into Remote_Repair_Pane_v2
Conflicts:
eos/mathUtils.py
service/crest.py
|
2017-02-26 01:40:53 -05:00 |
|
blitzman
|
7115cd178c
|
Merge branch 'development' into LogBook_v2
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
|
2017-02-25 18:21:07 -05:00 |
|
Ebag333
|
c24798ad2f
|
Clean up last reference and finish nuking floatfloor. One less method! (ouch my test!)
|
2017-02-24 17:07:05 -08:00 |
|
Ebag333
|
3411eca1e7
|
Fix a couple pep8 issues, and clean up other folks pep8 misses. :)
|
2017-02-24 16:34:32 -08:00 |
|
Ebag333
|
43073069c7
|
Fix merge conflict.
|
2017-02-24 16:25:31 -08:00 |
|
Ebag333
|
db330ad035
|
Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2
# Conflicts:
# eos/saveddata/fit.py
|
2017-02-24 16:15:39 -08:00 |
|
Ebag333
|
b3c7273681
|
implement a suggestion or six from @blitzmann. Fix a bunch of low level bugs (unlikely to have been noticed since we don't really expose those stats). Add some properties instead of referencing the attribute directly.
|
2017-02-24 16:10:54 -08:00 |
|
blitzman
|
3892ac5996
|
Change functionality of remote rep calculations to be more efficient.
* Implement a property per attribute
* Use None as our cleared value (signifies that it really hasn't been calculated, not just that the calc was 0)
|
2017-02-24 18:33:42 -05:00 |
|
Ebag333
|
5ca882d3ea
|
implement a suggestion from @blitzmann
|
2017-02-24 13:06:02 -08:00 |
|