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

207 Commits

Author SHA1 Message Date
blitzmann
b30b3fcbf1 Merge branch 'master' into test-3 
Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py
 2017-11-23 11:19:05 -05:00
blitzmann
cc9b6ea04b More deprecation fixes 2017-11-13 00:18:24 -05:00
blitzmann
47cbc71e8a Implement simple skill import/export functionality, and some cleanup top pass tox 2017-08-14 23:28:50 -04:00
blitzmann
7962aa7b1b Reorganize file structure of item stats dialog box 2017-07-23 17:55:18 -04:00
blitzmann
de35692666 Fix a few things with affected by tab (indentation issue, overwriting modifier incorrectly) 2017-07-09 13:18:28 -04:00
Ryan Holmes
7ae41b71b2 Fix some deprecated things and a bug or two 2017-07-02 23:26:44 -04:00
Ryan Holmes
f16e14e0b4 Fix gauges again, convert remaining IconFromBitmap > Icon 2017-06-14 15:05:12 -04:00
Ryan Holmes
4b8f2ce9e7 Deprecation stuff 2017-06-14 01:07:18 -04:00
Ryan Holmes
8f369daf1e InsertStringItem > InsertItem 2017-06-14 00:46:38 -04:00
Ryan Holmes
610f501608 "Color Correction" 2017-06-12 21:11:10 -04:00
Ryan Holmes
8e4db5a8c3 Do some renaming of some files 2017-06-12 18:08:07 -04:00
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -04:00
blitzmann
a6a153b703 Update database, add missing renders, fix bug with not being able to add citadel modules, and fix bug associated with engineering complex properties (debug info, don't care about it) 2017-05-09 18:52:32 -04:00
blitzmann
4d8c9e0522 Fix floats in skill tree, and fix typo - apparently I can't spell dependents x_x 2017-05-08 22:49:37 -04:00
blitzmann
3de63c5ca5 flake8 fixes 2017-05-08 21:32:13 -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
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
77b5e8afdc Merge branch 'development' into feature/strictSkills 
Conflicts:
	eos/gamedata.py
 2017-04-26 19:42:29 -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
58abdcfa22 Add dependants tab for skills 2017-04-22 03:09:18 -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
994bd72409 Rework pricing. 2017-04-05 14:40:27 -07:00
Ebag333
b72304203c Add default option to getOriginal. This eliminates some double lookups and simplifies the code. 2017-03-13 10:56:33 -07:00
Ryan Holmes
db4e5e05a4 Merge pull request #1012 from Ebag333/PropertiesPane 
Add Properties Pane
 2017-02-26 00:17:38 -05:00
Ebag333
baec24ef14 get rid of unused method 2017-02-24 21:28:23 -08:00
Ebag333
df7f0b20f5 Tox cleanup 2017-02-24 21:25:13 -08:00
Ebag333
e5e3133869 Catch exceptions if we get them from a property. Exceptions are bad, but not showing the window is worse. 2017-02-24 21:18:38 -08:00
Ebag333
ca6ef546e5 Add debug pane for item stats 2017-02-24 18:09:22 -08:00
blitzman
b583589849 Remove unicode path fixes for now to better test original problems 2017-02-19 01:01:12 -05:00
Ebag333
2b45a16872 Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas. 2017-02-10 11:50:04 -08:00
Ebag333
3c641606da Revert until we actually get a Linux developer. 2017-02-10 05:41:06 -08:00
Ebag333
f61aeb8285 Fix bug where the toggle button the compare pane didn't do anything. (Need to check toggleView because you can hit both first and second if otherwise.) 2017-02-09 00:18:19 -08:00
Ebag333
11d7f9d029 Make modules static if they do not use self. 2017-02-09 00:04:41 -08:00
Ebag333
7a2feb9152 Fix a bunch of calls to functions that pass the wrong type of parameter, the wrong number, etc. 2017-02-08 22:20:56 -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
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
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -08: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
blitzman
fb538027f7 Fix issues with paths and linux / os x 2017-01-27 20:30:11 -05:00
Ebag333
3c31391ec9 Burn types with fire 2017-01-09 22:36:19 -08:00
Ebag333
d4b6099d6e Handle unicode, utf8, and windows-1252 
(cherry picked from commit 0d4f24a)
 2016-12-18 14:11:55 -08:00
Ebag333
08b5abc7ad Handle unicode, utf8, and windows-1252 
(cherry picked from commit 0d4f24a)
 2016-12-14 10:38:56 -08:00
Ebag333
28404cd8bb bajillion pep8 fixes to pass tox 2016-12-13 23:31:39 -08:00
Ebag333
be53dedb18 Large pep8 compliance to make work for Tox 2016-12-13 21:23:01 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes 
(cherry picked from commit bee125d)
 2016-12-13 20:16:44 -08:00
Ebag333
d963327ed4 Make it run again 2016-12-02 03:13:54 -08:00
blitzman
5a0165282f Add reverse sorting / name column to sorting 2016-12-01 00:40:27 -05:00
Ebag333
1854a21a50 Clicking on the name column now reverts back to default sorting 2016-11-30 13:17:50 -08:00