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

684 Commits

Author SHA1 Message Date
blitzman
a76eef01de name all ze threads 2017-01-28 17:46:59 -05:00
blitzman
5e0567ef4d Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-01-10 22:51:38 -05:00
blitzman
468a4644d6 Merge branch 'development' 
Conflicts:
	eos/db/saveddata/queries.py
 2017-01-10 22:42:01 -05:00
Ryan Holmes
29d0f102fd Move AT14 ships to the Limited Edition group (#935) 2017-01-05 11:38:47 -05:00
blitzman
5cbffcf3ac Handle counting number of fits per ship category more efficiently (see #819) 2017-01-03 01:32:12 -05:00
Ryan Holmes
152a708ee8 Merge pull request #920 from Ebag333/Database_Cleanup 
Database Validation and Cleanup
 2017-01-02 19:25:26 -05:00
Ebag333
f4761e099b Don't let people rename built in chars 2017-01-01 13:17:39 -08:00
Ebag333
be3696deba Add some sanity checks and validation of incoming data 2017-01-01 12:47:28 -08:00
Ebag333
f9ba95b3de Check the ness to see if it's an implant, booster, or something else. 
Log it if it's something else and don't try and import it. This prevents
a bad line from failing the entire import, and (hopefully) we know about
it.
 2016-12-27 12:32:52 -08:00
Ebag333
7ee4d1d588 Try loading item as a booster if implant fails. 2016-12-26 23:29:22 -08:00
Ebag333
cef5842344 Database validation and cleanup 2016-12-26 21:54:52 -08:00
blitzman
ff60538e21 Revert "Merge branch 'Ebag333-UnicodePaths' into development" 
This reverts commit 8a6ef788b3, reversing
changes made to cf91ae7627.
 2016-12-18 15:56:06 -05:00
blitzman
f198ff1773 more clean up 2016-12-12 00:49:47 -05: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
blitzman
b1bba74c5a Merge branch 'UnicodePaths' of https://github.com/Ebag333/Pyfa into Ebag333-UnicodePaths 2016-12-11 23:01:08 -05:00
Ryan Holmes
828d722be8 Merge pull request #807 from IndictionEve/ImportExportFighters 
Fighters for export and import functions
 2016-12-10 02:09:45 -05:00
Indiction
ab5f3488e7 Adding Fighter Support CREST 2016-12-04 19:56:42 +01:00
Ryan Holmes
bb96b0af1a Merge pull request #828 from resinneublem/group-drones-for-dna-export 
Groups drones before generating DNA
 2016-12-02 01:05:37 -05:00
Ebag333
0d4f24ade9 Handle unicode, utf8, and windows-1252 2016-11-26 22:57:53 -08:00
blitzman
0eed01811c Conversion mappings 2016-11-22 20:36:52 -05:00
Ryan Holmes
d3caee328f Merge pull request #799 from IndictionEve/ActiveFighterAbilities 
Activate fighter standard attack and limit active fighters
 2016-11-21 23:18:40 -05:00
blitzman
5eb5fb3310 Merge branch 'drop-null-sec-com' of git://github.com/resinneublem/Pyfa into resinneublem-drop-null-sec-com 2016-11-21 22:56:01 -05:00
Resin Neublem
e6dead2e27 Groups drones before generating DNA 
Drones can and often are in different stacks due to bandwidth and skills. The DNA would mess up in these cases because they would include duplicate ids with different numbers.

This commit groups the drones by the itemID before generating the DNA.

closes: https://github.com/pyfa-org/Pyfa/issues/367
 2016-11-20 15:25:30 -05:00
Resin Neublem
675533a732 Drops null-sec.com as an option 
It seems like it would be a good idea to make this user configurable so they could enter whatever domain they want.

However with this entire HTML export feature being questionable, I didn't go that far. https://github.com/pyfa-org/Pyfa/issues/825

closes: https://github.com/pyfa-org/Pyfa/issues/826
 2016-11-20 14:46:18 -05:00
blitzman
b4bbc82ba1 Merge branch 'master' into singularity 
Conflicts:
	eos/db/saveddata/fit.py
	eos/effects/armoredwarfaremindlink.py
	eos/effects/elitebonuscommanddestroyerarmored1.py
	eos/effects/elitebonuscommanddestroyerinfo1.py
	eos/effects/elitebonuscommanddestroyerinfohidden1.py
	eos/effects/elitebonuscommanddestroyersiege1.py
	eos/effects/elitebonuscommanddestroyerskirmish1.py
	eos/effects/elitebonuscommandshiparmoredcs3.py
	eos/effects/elitebonuscommandshipinformationcs3.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuscommandshipsiegecs3.py
	eos/effects/elitebonuscommandshipskirmishcs3.py
	eos/effects/miningforemanmindlink.py
	eos/effects/shipbonuscarriera4warfarelinksbonus.py
	eos/effects/shipbonuscarrierc4warfarelinksbonus.py
	eos/effects/shipbonuscarrierg4warfarelinksbonus.py
	eos/effects/shipbonuscarrierm4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
	eos/effects/shipbonussupercarriera5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
	eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
	eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
	eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
	eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
	eos/effects/subsystembonusminmatardefensivesiegewarfare.py
	eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	gui/shipBrowser.py
	scripts/prep_data.py
	service/fit.py
 2016-11-20 14:42:19 -05:00
blitzman
08be50caf2 More work on command boosts 2016-11-19 23:53:49 -05:00
Indiction
04c30e70af Fighters for export and import functions 2016-11-10 23:28:21 +01:00
blitzmann
34243b7b71 Get a working UI skeleton going for assigning boost fits 2016-11-08 19:36:57 -05:00
Indiction
bbc4ef8146 Activate "standard attack" if available. 
If there is no "standard attack" all other abilities set active except propmods
 2016-11-07 23:28:27 +01:00
Ebag333
b6c5183d40 Removed actual fleet files. Cleaned up __init__.py that had references. 2016-11-06 16:38:21 -08:00
Ebag333
e5d65b97ce Merged changes from Pyfa.org\Master to branch 2016-11-06 16:33:28 -08:00
Indiction
6cda47be9f Activate all fighter abilities by default and deactivate fighter groups if more than the maximum number of fighters are in bay 2016-11-06 23:19:18 +01:00
Ryan Holmes
c6e481efcf Merge pull request #791 from IndictionEve/OpenFittingsInNewPage 
open fittings in new page by default
 2016-11-04 12:48:23 -04:00
Ryan Holmes
e7feee6878 Merge pull request #759 from minlexx/feature/proxy_auth 
Add login/password for proxy authorization in network settings
 2016-11-03 14:58:08 -04:00
Indiction
12d5a21982 Option to open fittings in a new page by default 2016-10-30 00:43:23 +02:00
Alexey Min
2b5535c5d1 service/network: change "if" condition as suggested by @blitzmann 2016-10-09 13:14:37 +05:00
Alexey Min
1e9f911385 service/settings: setProxyAuthDetails(): empty string as login means no password too 2016-10-09 13:07:13 +05:00
Alexey Min
2a9a4fbdff service/settings: make getProxyAuthDetails() return None again 2016-10-09 13:05:39 +05:00
Ryan Holmes
7331c158b6 Merge pull request #756 from MrNukealizer/FighterFixes 
Fixed a few fighter/carrier bugs:
 2016-10-08 23:07:01 -04:00
petosorus
1853500729 Fix of the number of charges in multibuy 2016-10-06 08:45:35 +02:00
Alexey Min
c166fa6bf5 service/network: revert to simple ProxyHandler with login:password@host:port format 
previous sh@t with password managers and proxy basic auth handlers did not work for me :(
this way is simpler AND working.

Also explicitly use the default urllib2 opener if proxy is disabled (bug fix)
 2016-10-02 22:08:58 +05:00
Alexey Min
02557701f0 NetworkSettings: never return None in proxy auth details getter, 
return a tuple with empty strings instead
 2016-10-01 13:47:27 +05:00
Mr. Nukealizer
5467a58b04 Fixed a few fighter/carrier bugs: 
* Omnidirectional Tracking Link overheat applies to explosion radius/velocity bonuses.
* Networked Sensor Array affects fighters' sensor strengths.
* Long range heavy fighters no longer appear to require Bomb Deployment.
* Carriers and supercarriers are no longer capped at 300km lock range.
 2016-09-30 20:25:55 -07:00
Alexey Min
75f07afcb7 NetworkSettings: add setter method for proxy auth details (login, password) 2016-09-29 20:21:11 +05:00
Alexey Min
a0359b8bd9 [WIP] Add basic proxy authorization support to Network service class. 
not tested yet, will test later
 2016-09-28 01:42:59 +05:00
Ryan Holmes
e2434619b5 Merge pull request #733 from petosorus/multibuy-export 
Multibuy format export feature, adresses #726
 2016-09-27 01:49:12 -04:00
blitzman
becb3d4bb6 Fit Citadel imports (#749) 2016-09-27 01:45:21 -04:00
Alexey Min
8fec03bcbf Add proxy login/pass fields to NetworkSettings class. 
Use named "constants" instead of hardcoded numbers for proxy "mode" parameter
 2016-09-25 04:16:07 +05:00
petosorus
467d244bea Booster export in EFT Implants export 2016-09-16 18:40:24 +02:00
petosorus
840c041f8c Fighters get exported in EFT export 2016-09-16 12:06:17 +02:00