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

284 Commits

Author SHA1 Message Date
Ebag333
a853ed9960 Remove test variable 2017-01-25 18:17:05 -08:00
Ebag333
323a7060ec Fix import 2017-01-25 17:53:04 -08:00
blitzman
c34d86ba80 Fix XML exports 2017-01-25 20:12:30 -05:00
Ebag333
8095b4852b Clean up another broken reference. Fix broken XML export. 2017-01-24 21:34:24 -08:00
Ebag333
cc3274f245 Add comment to note special snowflakes needs 2017-01-24 18:21:09 -08:00
Ebag333
fbde9ce7bf Fix passing the fit into exportXML 2017-01-24 18:13:57 -08:00
blitzman
85131e6166 oh god this isn't gonna work 
Merge branch 'ebag_importchanges' into test_import

Conflicts:
	config.py
	eos/db/saveddata/queries.py
	eos/effects/chargebonuswarfarecharge.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
	eos/effects/energydestabilizationnew.py
	eos/effects/iceharvestingdroneoperationdurationbonus.py
	eos/effects/miningforemanstrengthbonus.py
	eos/effects/modulebonuswarfarelinkarmor.py
	eos/effects/modulebonuswarfarelinkinfo.py
	eos/effects/modulebonuswarfarelinkmining.py
	eos/effects/modulebonuswarfarelinkshield.py
	eos/effects/modulebonuswarfarelinkskirmish.py
	eos/effects/moduletitaneffectgenerator.py
	eos/effects/remotehullrepair.py
	eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipmodesmallmissiledamagepostdiv.py
	eos/effects/structureenergyneutralizerfalloff.py
	eos/effects/structuremoduleeffectstasiswebifier.py
	eos/effects/structurerigmaxtargets.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/techtwocommandburstbonus.py
	eos/saveddata/fighter.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	eve.db
	gui/bitmapLoader.py
	gui/builtinContextMenus/itemStats.py
	gui/builtinStatsViews/miningyieldViewFull.py
	gui/builtinViewColumns/misc.py
	gui/builtinViews/__init__.py
	gui/builtinViews/fittingView.py
	gui/contextMenu.py
	gui/graphFrame.py
	gui/itemStats.py
	gui/mainFrame.py
	gui/marketBrowser.py
	service/__init__.py
	service/character.py
	service/fit.py
	service/port.py
	service/prefetch.py
	service/pycrest/eve.py
	service/settings.py
 2017-01-23 21:06:12 -05:00
Ebag333
d7c71f5d47 fix some, missed import references. 2016-12-15 16:17:10 -08:00
Ebag333
c858fc2859 Remove an inline import. Fix a reference that is missing. 2016-12-15 15:39:19 -08:00
Ebag333
f76f44e9f3 Fix port references, imports, and add some logging 2016-12-15 15:20:29 -08:00
Ebag333
4fb07cc1d0 Bunch of pep8 and inspection cleanup 2016-12-15 12:43:19 -08:00
Ebag333
956fa7a8b7 Fixing some issues due to import cleanup 2016-12-14 13:06:13 -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
Ebag333
57f930c83e Cherry pick commits from @a-tal 2016-12-13 20:35:03 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes 
(cherry picked from commit bee125d)
 2016-12-13 20:16:44 -08:00
blitzman
95b3f0a21c Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts 
Conflicts:
	eos/db/saveddata/fleet.py
	eos/db/saveddata/queries.py
	gui/additionsPane.py
 2016-12-12 00:41:47 -05:00
Ebag333
510492e5e9 More refactoring, elimited another recursive import 2016-12-03 17:12:16 -08:00
Ebag333
ea8a4c01cb Eliminate export calling fit.py (no need) 
Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated.  Also spotted an
import reference that got missed.
 2016-12-02 12:50:49 -08:00
Ebag333
d963327ed4 Make it run again 2016-12-02 03:13:54 -08:00
Ebag333
c30190f63e Revert "Revert "Purging fleet bonuses from code base"" 
This reverts commit 6e54d6788c.
 2016-09-15 15:27:30 -07:00
Ebag333
6e54d6788c Revert "Purging fleet bonuses from code base" 
This reverts commit 68f45706ab.
 2016-09-15 15:27:10 -07:00
Ebag333
68f45706ab Purging fleet bonuses from code base 2016-09-15 15:07:59 -07:00
petosorus
54c950f951 Multibuy format export feature 2016-09-14 23:38:09 +02:00
blitzmann
6e2878194c Merge branch 'master' into citadel 
Conflicts:
	config.py
	service/market.py
 2016-07-03 01:10:26 -04:00
Ebag333
b79009517e Updated po-ta-toe to po-tah-toh 2016-06-16 14:46:22 -07:00
Ebag333
b4694dcf03 Implemented menu option to import default database values 
Allows for existing databases to be updated with the current default
profiles.  Can also be used to inject other defaults (maybe 0 and V
chars?)
 2016-06-13 14:13:38 -07:00
blitzmann
62fd545d24 Restrict citadels to only use citadel modules. Rename Ships tab to Fittings as it no longer just carries ships :(. Fix crash on item stats. 2016-05-15 23:18:39 -04:00
blitzmann
39b2f87194 Add in logic that required an entity for implant sets and target resists (not needed for character or damage profiles as we have read-only defaults) 2016-03-30 00:03:48 -04:00
blitzmann
36ad31ab25 Get some initial scaffolding up for implant sets sourced from the resist code. 2016-03-20 02:04:55 -04:00
Constantin Wenger
cf60bbc904 Merge remote-tracking branch 'upstream/master' 
updated from upstream
 2016-02-11 06:53:01 +01:00
blitzmann
9c67e7dd93 Fix database for icons (using old data), bump for release 2016-02-10 20:07:56 -05:00
blitzmann
7e305aab67 Revert "Tentative fix for character editor issues." 
This reverts commit 253ebdc4e1.
 2016-01-31 10:52:00 -05:00
blitzmann
55eed0d029 Revert "Fix Character Editor Dialog for osx" 
This reverts commit 9fc31d6a55.
 2016-01-31 10:51:45 -05:00
blitzmann
9fc31d6a55 Fix Character Editor Dialog for osx 2016-01-25 22:47:27 -05:00
blitzmann
f3f1d022ef Updated to new repo location and forum thread 2016-01-25 21:14:45 -05:00
blitzmann
253ebdc4e1 Tentative fix for character editor issues. 2016-01-25 21:10:20 -05:00
Constantin Wenger
96048b5133 added command line option to set the window title 2016-01-12 21:28:15 +01:00
blitzmann
343d605a84 Fitting file import improvements: 
- Blank files don't cause crash
- If error happens during processing, notify user
 2016-01-03 21:45:19 -05:00
blitzmann
ad738f7e7c Fix exporting fit to XML when name is unicode 2016-01-03 00:06:53 -05:00
blitzmann
2fadaa890b fix save character as on os x 2015-11-08 13:52:53 -05:00
blitzmann
95dba166eb Remove some debugging prints 2015-11-08 12:37:31 -05:00
blitzmann
83adadd71f Convert pubsub to wx events 2015-11-08 12:33:56 -05:00
blitzmann
febc2eee09 Add some conditionals to disable Attribute Editor for wxPython 2.8 2015-11-06 20:23:09 -05:00
blitzmann
bf0b89f3b5 Old mac client shouldn't even know about CREST / override. Disable all instances of them for this build. 2015-11-03 21:25:52 -05:00
blitzmann
4b27becb5f Merge branch 'overrides' into singularity 
Conflicts:
	eos/db/__init__.py
	eos/db/saveddata/__init__.py
	eos/db/saveddata/queries.py
	gui/mainFrame.py
	gui/mainMenuBar.py
 2015-11-02 19:01:12 -05:00
blitzmann
c436e0e669 Create a proper menu item toggle for overrides 2015-11-01 21:19:49 -05:00
blitzmann
0d0ec42daf Initial GUI commit. Still need to actually handle the attribute change 2015-11-01 19:49:22 -05:00
blitzmann
ccb9e085b2 Setting to change server for CREST, and some other improvements. 2015-10-31 13:20:13 -04:00
blitzmann
7032baa7ef Add some logic to disable from CREST menu items if character is not logged in 2015-10-25 22:02:15 -04:00