dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
5,213 Commits 3 Branches 5 Tags
47fcbefe8bee2af94950ffb8767b6d97903bb248
Commit Graph

238 Commits

Author SHA1 Message Date
blitzmann
c2cb5d763f Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects. 
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
 2017-06-04 23:33:11 -04:00
petosorus
33410f0618 Formatting 2017-05-30 15:51:48 +02:00
petosorus
2c98baade8 Price options labels + total computing in minimal 2017-05-29 15:24:21 +02:00
petosorus
380f90d065 Price options in context menu 2017-05-24 17:30:55 +02:00
Ryan Holmes
65f71b6f6b Fix exception with character implants, and don't show implant set menu if there aren't any (#1172) 2017-05-15 22:59:47 -04:00
Ryan Holmes
da33a372cb Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. (#1168) 2017-05-14 20:52:06 -04:00
blitzmann
3b23c9eacd flake8 2017-05-14 01:41:15 -04:00
blitzmann
d4ce1ef3db Fix issue with Delete key event on t3d mode causing exception (#1160). Additionally, work around the fact that every module that is removed also recalculates the fit, allowing for a faster response time when deleting multiple modules at a time. This is somewhat ugly as the removeModule function was originally based on the assumption of removing only one module. Should clean it up at some point. 2017-05-14 01:37:49 -04:00
blitzmann
21a071ea40 Add "remove" context menu to command fits 2017-05-08 22:34:03 -04:00
blitzmann
4f1e7697ed Fix issue in which "Open Fit" was showing on the command view, not the command fit, potentially causing an error 2017-05-08 22:29:50 -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
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
080590a292 Add "Currently Open Fits" context menu for projected and command views 2017-04-13 23:23:48 -04:00
blitzmann
6f914386ec Remove unused function 2017-04-10 21:58:56 -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
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
216dac068d Fix for #1090 - using variations on implants is not recalcing fit correctly. (#1094) 2017-04-02 01:04:34 -05:00
blitzman
fd745c5f62 Tox fix. 2017-03-25 01:02:20 -04:00
blitzman
79040adf1a tox fixes 2017-03-23 01:13:41 -04:00
blitzman
cbcc81d42e Actually apply the command fit, and remove print statement 2017-03-23 00:38:24 -04:00
blitzman
732386b83a Get command fit menu up and running. Had to revert to a non-cached version of the menu, as the instance has root menu, which we need in order to properly bind. Don't think caching the menu would have really given a large performance gain anyway. 2017-03-23 00:38:24 -04:00
blitzman
4065022866 Initial work on caching command fits unless needing to update. FitChanged event can now carry an action and typeID, only used in the CommandFit context menu (for now, can use this elsewhere). If the module being added or removed, we update the cached list. 2017-03-23 00:38:23 -04:00
blitzman
2ff66970ad remove __all__ from contect menus 2017-03-16 19:05:07 -04:00
Ebag333
e3c2220a1c Fix matplotlib importing 2017-03-16 14:09:10 -07:00
Ebag333
dc6cde86c9 Merge branch 'development' into PreferencesPaneV2 2017-02-26 11:22:10 -08:00
blitzman
1826122381 Clean up some syntax (use isinstance) and tox stuff 2017-02-26 14:17:46 -05:00
blitzman
b235dddbe0 Clean up to the sorting of implants and bosoters 2017-02-26 13:31:56 -05:00
Ebag333
68e75025be Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched. 2017-02-26 09:54:58 -08:00
blitzmann
767cb46d40 Merge branch 'development' into More_Variations 
Conflicts:
	gui/builtinContextMenus/metaSwap.py
 2017-02-26 02:24:38 -05:00
blitzman
06baa10cdc Fix for #991 2017-02-14 20:33:27 -05:00
Ebag333
f2c84692a9 Clean up a bunch of unused variables 2017-02-09 00:22:14 -08:00
Ebag333
11d7f9d029 Make modules static if they do not use self. 2017-02-09 00:04:41 -08:00
Ebag333
23c6f2add5 We have two of the exact same backported file. Get rid of one. Also, handle the except if we can't import so we don't get stacktraces. (Currently the three functions affected are not used.) 2017-02-08 22:42:19 -08:00
Ebag333
6e524de320 Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt 2017-02-08 20:15:24 -08:00
Ebag333
3e916e42f2 pyCharm inspection fixes. Mostly variable refernce issues 2017-02-08 17:55:20 -08:00
Ebag333
e18deb5eeb Roll up #967 and #974 
Takes the import fixes and cleanup out of those and rolls it into this
one
 2017-02-08 13:12:54 -08:00
blitzman
f7d7b3fe5e Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
 2017-02-07 19:22:26 -05:00
blitzman
3ccd4ad2ca Revert "Convert remaining files to CRLF" 
This reverts commit a8ab876053.
 2017-02-07 19:05:45 -05:00
Ryan Holmes
a8ab876053 Convert remaining files to CRLF 2017-02-07 11:01:40 -05:00
blitzman
5d46fe7e4d Merge branch 'master' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py
 2017-01-29 15:02:22 -05:00
blitzman
6b6dacf94c Fix traceback when trying to cancel an amount dialog with nothing in the field 2017-01-28 13:30:14 -05:00
blitzman
1d69ed7584 Merge branch 'test_import' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/characterEditor.py
	gui/itemStats.py
 2017-01-27 20:39:54 -05:00
blitzmann
4111d670a7 Fix possible issue with floats coming through (see #729) 2017-01-26 23:52:18 -05:00
Ebag333
ea12ec9cd1 Now can add 1000 ammo stacks or 5 drone stacks through context menu 2017-01-12 08:45:16 -08:00
Ebag333
3774e3bca0 add variations for drones, fighters, boosters, and implants 2017-01-12 01:24:26 -08:00