blitzmann
dd09b3d951
Add fitting notes to the ship browser tooltips
2017-05-08 19:20:30 -04:00
blitzmann
6b22bd189a
Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
...
Conflicts:
eos/config.py
gui/notesView.py
service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb
Merge branch 'feature/recent' into dev
...
Conflicts:
eos/db/saveddata/character.py
eos/db/saveddata/fit.py
Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c
Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities.
2017-05-07 02:02:54 -04:00
blitzmann
4a9662c0f7
Merge branch 'feature/skill-filter' into dev
...
Conflicts:
gui/characterEditor.py
This implements a long-requested feature to be able to search skills in the character editor
2017-05-06 13:25:20 -04:00
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
d888982657
Merge branch 'bug/market-fit-none' into dev
2017-05-06 13:11:26 -04:00
blitzmann
703d6dbc85
Merge branch 'feature/grant-needed-skills' into dev
2017-05-06 13:09:30 -04:00
blitzmann
2e6066e848
Merge branch 'feature/tabbed-fits' into dev
2017-05-06 13:08:52 -04:00
blitzmann
f751eff1cf
Fix some styling issues on linux
2017-05-06 12:57:20 -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
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
77b5e8afdc
Merge branch 'development' into feature/strictSkills
...
Conflicts:
eos/gamedata.py
2017-04-26 19:42:29 -04:00
blitzmann
f9b7376cc7
Move sql alchemy events into their own file for now so that mac-deprecated doesn't get pissy.
2017-04-26 19:34:47 -04:00
blitzmann
34723d7bb1
Merge branch 'development' into feature/recent
2017-04-26 18:51:46 -04:00
blitzmann
32f417ce5a
Created first iteration of "Recent Fits" view, in which a nav button is interacted with to show a list of the 100 most recently modified fits. Ship Broswer is littered with ToggleRecentShips() to reset the icon when not in "recent" mode. This should probably be fixed at some point.
...
Removed the FIT_CHANGED binding from FitItem - this was causing very odd issues when the object was destroyed (navigating to another "stage") such as the Fit Changed event for that fit no longer firing (or at least seemingly so)
To fix this, simply look at the active fit during FitItem.Refresh()
Also creates a new query to get a list of items from the DB, although it's not used (was gonna use it, decided against it, but didn't want to delete the code - could prove handy later)
2017-04-26 18:51:39 -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
bb73065b43
Update FitItem datetime when fit changes
2017-04-22 22:46:23 -04:00
blitzmann
ae99a179d9
Update FitItem to use modified datetime of fit (fallback to created and old timestamp). Remove activation of FitItem timer (no idea what this is trying to do???)
2017-04-22 19:30:50 -04:00
blitzmann
86e6250a63
Add strict skills to preference pane
2017-04-22 14:49:13 -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
58abdcfa22
Add dependants tab for skills
2017-04-22 03:09:18 -04:00
blitzmann
e94b4a1c18
Fix old issue with trying to open previous fits that don't exist.
2017-04-21 23:43:40 -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
cca61b8ac1
Fix issue with selecting item with an empty view
2017-04-14 21:45:41 -04:00
blitzmann
da9816d1bd
Implement character skill searching
2017-04-13 23:39:00 -04:00
blitzmann
283aba4f85
Add grant missing skills feature
2017-04-13 23:26:08 -04:00
blitzmann
080590a292
Add "Currently Open Fits" context menu for projected and command views
2017-04-13 23:23:48 -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
