Commit Graph

4928 Commits

Author SHA1 Message Date
blitzmann
524bb43113 Merge branch 'fix_unread_description' of git://github.com/jeffy-g/Pyfa-dev into jeffy-g-fix_unread_description 2017-05-08 00:09:09 -04:00
Ryan Holmes
bedd6efff2 Fix for #1137 - industrial command skill was applying to incorrect attribute (#1138) 2017-04-26 20:25:35 -04:00
Ryan Holmes
3afa829173 Merge pull request #1136 from blitzmann/bug/rr-fuel-1135
Remote Ancil Bug
2017-04-21 00:02:11 -04:00
blitzmann
cd30d74393 Rename fueled to modifier 2017-04-20 23:54:52 -04:00
Ebag333
25a945f9e6 Catch bug where remote reppers have the fueled multiplier applied when they have no charges. 2017-04-20 23:54:36 -04:00
Ryan Holmes
504d582b59 Merge pull request #1134 from blitzmann/bug/drones
Drone bugs
2017-04-19 21:43:39 -04:00
blitzmann
3d8a80aeaa Include drones in RR stats 2017-04-19 21:36:49 -04:00
blitzmann
9ac609528b Fix issue in which drones hp/s does not consider number of drones 2017-04-19 21:04:48 -04:00
blitzmann
1aaa93c1fd Set sqlalchemy version to 1.0.5 in requirements... newer version causing issues in builds? 2017-04-17 21:35:22 -04:00
Ryan Holmes
f563b2666d Merge pull request #1129 from blitzmann/bug/fighters-1128
Fix for #1128
2017-04-17 19:46:51 -04:00
blitzmann
9c406a0a44 Fix for #1128 - these modifiers are in their own pen-group 2017-04-16 23:53:19 -04:00
Ryan Holmes
89614f7948 Merge pull request #1127 from blitzmann/master
Appveyor tweaks
2017-04-16 11:39:16 -04:00
blitzmann
dec5970bd6 Update appveyor to use cx_freeze until pyInstaller is reviewed. 2017-04-16 11:31:08 -04:00
Ebag333
a374fb4a12 Appveyor (#1101)
Appveyor setup
2017-04-16 11:31:01 -04:00
jeffy-g
a86ff19c98 Merge branch 'fix_unread_description' of https://github.com/jeffy-g/Pyfa-dev into fix_unread_description 2017-04-10 14:31:29 +09:00
jeffy-g
c07bcf6a29 Determine the necessary changes to use db with test code,
I made necessary edits

.travis.yml
  necessary to depend on wx mod indirectly when running test code

eos\config.py
  copy from development branch, This change was necessary when using data base in test code.

service\settings.py
  copy from development branch.
  and modified SettingsProvider.getSettings and Settings.save.
  After that, we made the same as master branch except for necessary code.
  This change was necessary when using data base in test code.

and other improvement.
2017-04-10 14:23:50 +09:00
jeffy-g
fc7ca56f8b searching for a way to open db with minimal changes required 2017-04-10 09:33:54 +09:00
jeffy-g
d629061506 Merge branch 'master' into fix_unread_description 2017-04-10 03:20:35 +09:00
jeffy-g
4a964ab6be apply recent improvements 2017-04-10 03:05:44 +09:00
jeffy-g
53957c24df Reflect changes when writing test code 2017-04-08 22:31:25 +09:00
Ryan Holmes
5f35553438 Restrict cap modules to only cap ships (#1097)
* Restrict capital modules to capital hulls

* tweak comment

* Make a isCapitalSize property for modules
2017-04-05 18:54:16 -04:00
jeffy-g
d4d69522f5 edit source 2017-04-06 03:37:40 +09:00
jeffy-g
dd88d64d67 im trying PyCharm now! 2017-04-05 21:48:37 +09:00
jeffy-g
0ecaa4d36c edit missied format... 2017-04-05 21:26:45 +09:00
jeffy-g
e9e8ef964c refactoring some code and added docstring
added stopwatch.py(modify from utils.timer.py) for test
2017-04-05 21:18:30 +09:00
jeffy-g
8fd424814a edit... 2017-04-03 02:00:10 +09:00
jeffy-g
4d8c3eadbc pep8 2017-04-03 01:50:26 +09:00
jeffy-g
c560d17bdd Improved processing status notification for import and export 2017-04-03 01:34:07 +09: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
Ryan Holmes
112ab91e34 Fix for #1091 (#1092) 2017-04-01 23:09:32 -05:00
Ryan Holmes
e03b3227d4 Fix for #1081 (#1085)
* Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081

* Make tox happy
2017-04-01 22:23:50 -05:00
blitzman
fd745c5f62 Tox fix. 2017-03-25 01:02:20 -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
Ryan Holmes
5cecb24654 Update README.md 2017-03-19 00:22:50 -04:00
blitzman
5911538e29 Do a version check for logbook 2017-03-19 00:22:17 -04:00
blitzman
2ff66970ad remove __all__ from contect menus 2017-03-16 19:05:07 -04: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
Ryan Holmes
73f6a68b9d Merge pull request #1047 from Ebag333/Hotfix_Implant_ContextMenu
Hotfix - Implant ContextMenu
2017-03-16 18:54:04 -04:00
Ryan Holmes
b88f4bc77f Merge pull request #1050 from Ebag333/Hotfix_Matplotlib
Hotfix - Matplotlib import
2017-03-16 18:52:48 -04:00
Ebag333
e3c2220a1c Fix matplotlib importing 2017-03-16 14:09:10 -07:00
Ebag333
26238e731d Fix matplotlib importing 2017-03-16 10:22:40 -07:00
Ebag333
1c59a27902 Fix typo and missing setting
(cherry picked from commit c122047)
2017-03-16 08:40:18 -07:00
Ebag333
6ce52a1da9 PEP8 cleanup
(cherry picked from commit 63f2f85)
2017-03-16 08:40:14 -07:00
blitzman
20ac2ad847 bump dev 2017-03-15 20:19:05 -04:00
blitzman
3b5fc7e13c Bump stable 2017-03-15 20:10:08 -04:00
blitzman
73a12aedeb Fix for #1041 2017-03-15 20:05:38 -04:00
blitzman
2ce6592048 Merge branch 'development' 2017-03-15 20:01:01 -04:00