Ryan Holmes
6ececbb81a
Merge pull request #1063 from blitzmann/feature/commandmenu
...
Command Fit Menu
2017-03-26 14:56:50 -04:00
Ryan Holmes
a67c28a4c9
Merge branch 'development' into feature/commandmenu
2017-03-26 14:43:12 -04:00
Ryan Holmes
c3a0176c88
Merge pull request #1021 from Ebag333/MorePreferences
...
Add more functionality to preferences window.
2017-03-26 14:42:49 -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
225011f2c1
Merge pull request #1070 from blitzmann/fixforsettings
...
Fix settings provider
2017-03-26 13:47:41 -04:00
blitzman
024edc500f
Fix settings provider
2017-03-26 13:35:46 -04:00
Ryan Holmes
42d59d21a6
Merge pull request #1042 from Ebag333/HandleBadHandleres
...
Effect Handlers Import - Less Spam
2017-03-26 12:38:47 -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
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
Ryan Holmes
41628ca17f
Merge pull request #1065 from Ebag333/pytests
...
pytests
2017-03-25 00:41:02 -04:00
Ebag333
21fbbf154d
Try fake wx module
2017-03-24 18:00:51 -07:00
Ebag333
66c4aefc1e
Add comment
2017-03-24 17:27:17 -07: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
Ebag333
4a9638767d
use math
...
(cherry picked from commit 4b75f57)
2017-03-24 11:15:34 -07:00
Ebag333
55cd0d5000
Clean up test structure a bit
...
(cherry picked from commit 320e05b)
2017-03-24 11:15:32 -07:00
Ebag333
1da15cfde3
Add right number of levels to remove.
...
(cherry picked from commit 1d0a682)
2017-03-24 11:15:30 -07:00
Ebag333
9df0ee9a1c
Comment out print
...
(cherry picked from commit df48cda)
2017-03-24 11:15:28 -07: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
aacddb251d
pep8 stuff
...
(cherry picked from commit e87b6c3)
2017-03-24 11:15:23 -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
bccb1d2805
update config
...
(cherry picked from commit b18aecf)
2017-03-24 11:15:00 -07:00
Ebag333
d84787b041
add test
...
(cherry picked from commit b1b5cb1)
2017-03-24 11:14:57 -07:00
Ebag333
f1d6252d8b
Add pyfa path to python paths
...
(cherry picked from commit dd51c38)
2017-03-24 11:14:53 -07:00
Ebag333
38a7a50d1c
move helpers functions out
...
(cherry picked from commit 2047d3f)
2017-03-24 11:14:50 -07:00
Ebag333
3ca181fce4
Add comment
...
(cherry picked from commit dbbe3aa)
2017-03-24 11:14:48 -07:00
Ebag333
9eeb01b746
Add debug output
...
(cherry picked from commit f8d7012)
2017-03-24 11:14:45 -07:00
Ebag333
9ef9a0f1fb
disable import tests
...
(cherry picked from commit 58ac331)
2017-03-24 11:14:43 -07:00
Ebag333
599b5318fc
Add local path
...
(cherry picked from commit c9c340d)
2017-03-24 11:14:41 -07:00
Ebag333
75df133071
Add hack to add in root path to python paths
...
(cherry picked from commit 1068c41)
2017-03-24 11:14:38 -07:00
Ebag333
403b39659c
Fix tox things.
...
(cherry picked from commit 60298c8)
2017-03-24 11:14:34 -07:00
Ebag333
8d357ee282
Test more Rifter things!
...
(cherry picked from commit b92f584)
2017-03-24 11:14:32 -07:00
Ebag333
96ad687944
Baby's first (real) Eos test.
...
(cherry picked from commit df51f9f)
2017-03-24 11:14:29 -07:00
blitzman
79040adf1a
tox fixes
2017-03-23 01:13:41 -04:00
blitzman
cbcc81d42e
Actually apply the command fit, and remove print statement
2017-03-23 00:38:24 -04:00
blitzman
732386b83a
Get command fit menu up and running. Had to revert to a non-cached version of the menu, as the instance has root menu, which we need in order to properly bind. Don't think caching the menu would have really given a large performance gain anyway.
2017-03-23 00:38:24 -04:00
blitzman
4065022866
Initial work on caching command fits unless needing to update. FitChanged event can now carry an action and typeID, only used in the CommandFit context menu (for now, can use this elsewhere). If the module being added or removed, we update the cached list.
2017-03-23 00:38:23 -04:00
blitzman
6c1d949cef
Proof of concept for gathering fits based on modules that are fit
2017-03-23 00:38:23 -04:00
blitzman
c4293bba6b
bump dev
2017-03-23 00:36:20 -04:00
blitzman
0a1008f64f
Merge branch 'master' into development
2017-03-23 00:35:28 -04:00
blitzman
4a6c0db4fa
Bump to stable point release
2017-03-20 21:05:09 -04:00
blitzman
f31ec9a154
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2017-03-19 16:29:27 -04:00
blitzman
b4ad4becd3
Fix for #1060
2017-03-19 16:27:41 -04:00
Ryan Holmes
554807968a
Update requirements.txt
2017-03-19 00:23:17 -04:00
