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
5657438e3c
Change up effect classes for better efficiency
2017-04-24 19:04:07 -04:00
blitzmann
f7349316b4
Revert "Change to using inspect() instead of the current shitty way"
...
This reverts commit 711537dcf4
2017-04-24 00:34:04 -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
b4930d15b7
Update Fit.modified whenever modules change, allowing proper "recent" timestamps
2017-04-22 18:58:30 -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
b21c850598
move skill mapping to item class
2017-04-22 03:12:33 -04:00
blitzmann
58abdcfa22
Add dependants tab for skills
2017-04-22 03:09:18 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -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
711537dcf4
Change to using inspect() instead of the current shitty way
2017-04-21 00:45:36 -04:00
blitzmann
e971b7927e
Fix issue in which prices are removed all the time (forgot to add the check for deleted to the condition >.<)
2017-04-21 00:40:45 -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
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
blitzmann
66a8669c64
Implement CONCORD ship sec status bonus.
2017-04-18 01:21:08 -04:00
blitzmann
99b0322289
Merge branch 'singularity' into sisi-dev
2017-04-18 00:03:58 -04:00
blitzmann
b0e7c02a6a
Add migration script for character sec status
2017-04-18 00:01:25 -04:00
blitzmann
f0fc5643e9
Return and save sec status for character when updating skills
2017-04-18 00:01:25 -04:00
blitzmann
8c83ac120f
Implement asynchronous api skill fetching
2017-04-18 00:01:24 -04:00
blitzmann
53cab4b1ab
Merge branch 'master' into development
...
Conflicts:
requirements.txt
2017-04-17 21:41:44 -04:00
blitzmann
6d176c0010
Merge branch 'master' into singularity
2017-04-17 21:41:02 -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
blitzmann
9d1c77f5b7
Damn you effects...
2017-04-17 21:19:51 -04:00
Ryan Holmes
3b351603a3
Merge pull request #1130 from blitzmann/feature/drone-affecting-skills
...
Add affecting skills context menu to drones and fighters
2017-04-17 19:52:19 -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
cede46d4a4
Remove PyYAML from list of requirements to run pyfa.
2017-04-17 19:40:47 -04:00
blitzmann
90d854fd24
Add change affecting skills menu to drones and fighters
2017-04-17 19:25:35 -04:00
blitzmann
9c406a0a44
Fix for #1128 - these modifiers are in their own pen-group
2017-04-16 23:53:19 -04:00
blitzmann
81160e9e72
Fix effects (don't need level for ship bonuses x_x)
2017-04-16 22:50:19 -04:00
blitzmann
7bfd19dca4
Update effect headers
2017-04-16 22:24:32 -04:00
blitzmann
8ff244d509
Add new effects to support new hulls
2017-04-16 22:11:28 -04:00
blitzmann
e2061a25c2
Update effects for logi
2017-04-16 21:06:28 -04:00
blitzmann
272201c0fc
Update for renamed attribute
2017-04-16 20:34:58 -04:00
blitzmann
54930d7d50
Rename effects.
2017-04-16 20:20:57 -04:00
blitzmann
5ddac97719
Update EVE db from sisi
2017-04-16 19:04:51 -04:00
blitzmann
973432b997
Merge remote-tracking branch 'origin/master' into singularity
2017-04-16 19:02:17 -04:00
