Commit Graph

2974 Commits

Author SHA1 Message Date
DarkPhoenix
18385584bf Merge branch 'master' into singularity 2014-06-02 00:13:33 +04:00
DarkPhoenix
7d58b2caa1 Show additional cargo parameters in panel and tooltip. Closes #111 2014-06-02 00:12:11 +04:00
DarkPhoenix
08f22172a6 Merge branch 'master' into singularity 2014-06-01 21:31:50 +04:00
DarkPhoenix
88344dcfdc Disable change affecting skills menu for now 2014-06-01 21:18:41 +04:00
DarkPhoenix
4ea69201ea Remove debugging print 2014-06-01 19:09:30 +04:00
Anton Vorobyov
07692584cf Merge pull request #110 from blitzmann/issue-101
Add "Change affecting skill" context menu, resolves #101
2014-06-01 19:06:19 +04:00
DarkPhoenix
96707275be Add new overrides to the list 2014-06-01 17:21:11 +04:00
DarkPhoenix
239fec48e8 Merge branch 'master' into singularity 2014-06-01 17:04:52 +04:00
DarkPhoenix
6fc2cfff71 Unknown for DB items are fetched as None; make sure service doesn't fail in this case 2014-06-01 16:58:42 +04:00
Anton Vorobyov
faff60c5e0 Merge pull request #97 from blitzmann/issue-67
Fixes #67
2014-06-01 16:51:09 +04:00
DarkPhoenix
9a51d1fe3c Update db to 792006 and add new ship icons 2014-05-31 23:34:12 +04:00
DarkPhoenix
8313fa03b8 Rerun 'used by' script and remove unused effects 2014-05-31 22:13:59 +04:00
DarkPhoenix
665a1c473c Add more effects for new items 2014-05-31 22:02:41 +04:00
DarkPhoenix
c9dca6cd2a Implement remaining changes - besides new modules and ships 2014-05-31 19:16:15 +04:00
DarkPhoenix
7b3e0fe3b0 Barge, freighter and phoenix changes 2014-05-31 17:46:53 +04:00
DarkPhoenix
8ea4ef1b44 Implement DST changes 2014-05-31 02:30:38 +04:00
DarkPhoenix
933fbb26d7 Implement pirate ship updates 2014-05-30 02:21:29 +04:00
blitzmann
de9ae5c78c Ensure that we load all skills for a character and some minor tweaks. 2014-05-29 12:59:53 -04:00
blitzmann
0d1c7b93be Add icons to skill context menu 2014-05-28 22:32:23 -04:00
blitzmann
749934b89d Fix #106 2014-05-27 19:35:51 -04:00
blitzmann
1c84e9dc4b Added default value for used parameter 2014-05-27 16:29:22 -04:00
blitzmann
df046769ff Add GUI support for changing affected skills 2014-05-27 16:26:14 -04:00
DarkPhoenix
ae386cae4e Fix broken names in database 2014-05-27 12:48:59 +04:00
DarkPhoenix
d2635d6405 Update database to 788467 2014-05-26 02:17:24 +04:00
blitzmann
45fca2a87d All things that can affect attribute from current fit/ships is included in modifiedAttributeDict.
The previous method was to only add those that change a value. This adds things can can affect it, and then pass a new `used` flag to the dict to show if it's used or not.
2014-05-25 14:48:40 -04:00
blitzmann
f1f9da9214 Merge branch 'issue-102', resolves #102 2014-05-25 10:14:13 -04:00
blitzmann
a1416e6bec Improves on fit loading on startup by only calculating the last fit that is opened.
Issue with FittingView.MakeSnapshot() need an exception catch.
2014-05-25 02:55:28 -04:00
blitzmann
2d82eb7c92 Add thread for opening fits on startup, which allows us of wait dialog
Wait dialog doesn't actually move as the GUI thread is locked when opening the fits, but at least it shows that -something- is happening.
2014-05-24 22:20:26 -04:00
blitzmann
9a2408741e Feature: reopen previous fits on startup 2014-05-23 21:31:36 -04:00
blitzmann
b7e2b62562 Improved fitting window import; revert addition of staticmethod's in fit service 2014-05-23 18:58:09 -04:00
blitzmann
fbc336b038 Moved item override and fit porting to services.
Also sprinkled static methods around Fit service and other PEP8 goodness because why not.
2014-05-22 21:00:42 -04:00
DarkPhoenix
9dea4a26bf Remove nos immunity from ewar immune ships as well 2014-05-22 01:05:35 +04:00
Anton Vorobyov
0ea8a7a921 Merge pull request #77 from blitzmann/issue-69
Fix #69 - Neut on triage/siege/bastion

Not all exclusions are added, i will add the rest in later commits.
2014-05-22 00:45:14 +04:00
blitzmann
0bf956e9b3 Add support for explicitly converting items to another. 2014-05-20 12:46:19 -04:00
blitzmann
3bd66f174d Added skill prereq tooltip compact option to preferences 2014-05-18 01:45:28 -04:00
blitzmann
4f38d71676 Create compact skill requirement list
I probably could have worked this into the existing function instead of creating a new one if I thought about it, but meh.
2014-05-18 00:38:10 -04:00
blitzmann
493294e648 Update "Import Character" label to be less ambiguous 2014-05-16 00:27:24 -04:00
Anton Vorobyov
2a12e4c566 Merge pull request #85 from blitzmann/issue-84
Fix #84 - Bug with projected mods on projected ships
2014-05-16 00:21:13 +04:00
blitzmann
b75c86d251 Ignore Orbital ammo in ammo picker - see #71 2014-05-15 11:44:09 -04:00
blitzmann
a148a6d818 Added some bulk to PFStaticText to allow for more refined layout of text. Will probably increase font size later (it's so teeny!)
(cherry picked from commit 4f0c246e80a6d245bd9bd6be0dc0c0f995e2ae80 branch `tag`)
2014-05-15 01:08:19 -04:00
blitzmann
ee8f514266 Removed debug statement. 2014-05-15 00:47:41 -04:00
blitzmann
8a0778662f Fixes refresh issue with importing from fitting window into empty fit.
This removes a conditional that makes sure we don't fire the FitSelected event if the active fit is same as imported fit. Removing this, to my knowledge, has no adverse effects because when importing we *always* create a new fit (with the exception of the new fitting window import) and thus this conditional is not needed.
2014-05-14 23:44:44 -04:00
blitzmann
f9c141fa25 Adds import support for fitting window copy. Resolves #91
This requires us to pass an active fit to use as a base for the modules, as the format does not include ship information. Features:
* If active fit has modules, makes a new fit using same ship
* Does basic dummy checking. As the format doesn't include ship info, it will probably be common for someone to accidentally try to import a Legion fit to a Rifter by mistake. Import logic checks module legality for fit and, if fails, silently halts import without saving.
2014-05-14 23:39:47 -04:00
blitzmann
40c1bc8ae6 Added cargo gauge to resources and ability to toggle 2014-05-08 13:58:40 -04:00
blitzmann
6992537750 Fix regression 2014-05-07 17:44:47 -04:00
blitzmann
a604093387 Merge branch 'cargoDrag' - adding improved drag/drop functionality.
fittingView was the only real view that had drag and drop, and that was to support module swapping. I tweaked the dragged data to include source so that other Views can use it. Supported drag/drop:

* Copy / Move / Swap module from fitting to cargo
* Drag market items to fitting and other views
* Probably more that I cannot remember
2014-05-07 17:27:14 -04:00
blitzmann
d9e61a3305 Improved on drag/drop for cargo and fitting views. Can now copy rather than swap 2014-05-07 17:18:01 -04:00
blitzmann
0c42848d52 Fix recalc after module clone. Enforce module restrictions. 2014-05-07 15:53:03 -04:00
blitzmann
294f51ae5d Add support for drag and drop between pyfa displays which explicitly support it (some other tweaks as well) 2014-05-07 11:21:50 -04:00
blitzmann
ecd82ac7a4 Merge branch 'cargo' 2014-05-06 01:00:58 -04:00