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
622efb624d
Refactor how remote resistance works. We now check the resistance ID directly from the effect, and fall back to the remoteResistanceID attribute. See #1139
2017-05-02 22:19:58 -04:00
blitzmann
50965244c0
Merge branch 'bug/1139' into bug/resist-effects
2017-05-02 20:41: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
c0f74cd0a3
Fix old issue with trying to open previous fits that don't exist.
2017-04-23 23:40:51 -04:00
blitzmann
2a679efc14
Remove print message for except clause when iterating through item properties. This is dev stuff, not too worried about handling it. Was failing on getting a property that doesn't make sense for a module.
2017-04-21 23:38:46 -04:00
Ebag333
4652b91e98
Always show refresh button on compare window (annoying that it hides sometimes when it shouldn't). Move compare window prices to the new price model.
2017-04-21 00:55:06 -04:00
Ebag333
0079f76f67
Change price column to use new method
2017-04-21 00:54:13 -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
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
blitzmann
8c83ac120f
Implement asynchronous api skill fetching
2017-04-18 00:01:24 -04:00
blitzmann
90d854fd24
Add change affecting skills menu to drones and fighters
2017-04-17 19:25:35 -04:00
blitzmann
1ee679903c
Bring dev up to date with master
...
Conflicts:
service/fit.py
2017-04-16 11:42:41 -04:00
blitzmann
b02506d6cd
fixes issue in which fit was recalced on fit switch when characters were different, regardless of calculation state.
2017-04-15 22:33:45 -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
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
6f914386ec
Remove unused function
2017-04-10 21:58:56 -04:00
blitzmann
efaede0929
Use queries to bulk-delete target resists and damage profiles
2017-04-10 21:49:35 -04:00
Ebag333
73821cbe49
Formatting
2017-04-10 21:41:56 -04:00
Ebag333
e245891cb4
Add delete buttons
2017-04-10 21:40:59 -04:00
blitzmann
894c86ebc3
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
2017-04-10 21:09:40 -04:00
Ryan Holmes
47ea12f4ba
Merge pull request #1048 from Ebag333/ErrorDialog_and_miscfixes
...
Error Dialog improvements and Pyfa.py refactoring
2017-04-10 21:09:11 -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
blitzmann
1260900668
Merge branch 'pricing_v2' into development
2017-04-10 20:46:57 -04:00
Ryan Holmes
addff1118c
Extend "Open Fit In Context Menu" option for command fits. ( #1104 )
2017-04-05 19:26:12 -04:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ebag333
01eaba6697
First pass
2017-04-05 11:44:36 -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
Ryan Holmes
59b0ac127f
Merge pull request #1071 from blitzmann/issue-686
...
Switch units in recharge pane based on effective HP toggle (requested by #686 )
2017-04-01 22:31:38 -05:00
Ryan Holmes
f08a66924c
Re-introduce Command Fit State ( #1074 )
...
Reintroduce command view state
Squashes `blitzmann/command-fit-state`:
* Reintroduces command view state, allowing users to toggle command fits on and off.
* Remove type() function call and use __class__ instead
2017-04-01 22:04:44 -05:00
Ebag333
c6d50b7d6e
Merge branch 'development' into ErrorDialog_and_miscfixes
2017-03-27 21:00:51 -07:00
Ebag333
03f12bfca1
Finish implementing wx 2.8 selector. Add a bunch of error catching. General cleanup.
...
(cherry picked from commit b0ec69e)
2017-03-27 20:52:45 -07:00
blitzman
37ec3d41d9
Switch the units of recharge rates based on EHP / HP
2017-03-26 16:19:14 -04:00
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
df587892a3
Merge branch 'development' into feature/commandmenu
2017-03-26 12:27:52 -04:00
Ryan Holmes
57a1f71fdd
Merge branch 'development' into ErrorDialog_and_miscfixes
2017-03-26 12:22:08 -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
blitzman
e7aceb6a8b
Bringing branch up to date with dev
...
Merge branch 'development' into ErrorDialog_and_miscfixes
Conflicts:
eos/saveddata/fit.py
pyfa.py
2017-03-25 22:30:18 -04:00
blitzman
fd745c5f62
Tox fix.
2017-03-25 01:02:20 -04:00
Ebag333
aacddb251d
pep8 stuff
...
(cherry picked from commit e87b6c3)
2017-03-24 11:15:23 -07:00
blitzman
79040adf1a
tox fixes
2017-03-23 01:13:41 -04:00
