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

2536 Commits

Author SHA1 Message Date
Ebag333
61d1878494 Fix tooltip order 2016-12-04 22:36:22 -08:00
Ryan Holmes
7bd6344359 Merge pull request #790 from IndictionEve/miningyieldperhour 
Mining Yield "per hour".
 2016-12-02 00:52:00 -05:00
blitzman
5a0165282f Add reverse sorting / name column to sorting 2016-12-01 00:40:27 -05:00
blitzman
597d9f2612 Merge branch 'SortableCompare' of https://github.com/Ebag333/Pyfa into Ebag333-SortableCompare 2016-12-01 00:07:44 -05:00
Ebag333
1854a21a50 Clicking on the name column now reverts back to default sorting 2016-11-30 13:17:50 -08:00
blitzman
a5b5da6d27 Update developers 2016-11-28 21:24:17 -05:00
Ebag333
97f72f6df5 Add ability to sort compare list 2016-11-27 12:06:41 -08:00
blitzman
bf16246825 Disable booster fit icon (for now) 2016-11-22 20:44:19 -05:00
blitzman
0d94ffe27a Merge branch 'singularity' of https://github.com/pyfa-org/Pyfa into singularity 2016-11-22 18:45:27 -05:00
Ryan Holmes
91f87b02cc Merge branch 'EffectTest' of https://github.com/Ebag333/Pyfa into Ebag333-EffectTest 
Conflicts:
	eos/saveddata/fit.py
	eos/saveddata/module.py
 2016-11-22 12:34:10 -05:00
Ebag333
3aa60ac669 Make Effects Togglable 2016-11-21 22:02:16 -08:00
blitzman
81612cc32a Remove border from note box text area 2016-11-21 23:51:18 -05:00
blitzman
d5af6127e5 Tweaks 2016-11-21 23:02:29 -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
blitzman
fbb1750528 Merge branch 'master' into singularity 
Conflicts:
	eos/db/saveddata/fit.py
	gui/additionsPane.py
 2016-11-20 20:52:23 -05:00
Ryan Holmes
dad63b6d77 Merge pull request #821 from resinneublem/notes-field 
Adds a new notes pane for each fit
 2016-11-20 20:48:02 -05:00
blitzman
14e69b1e59 Add "Command Fit" context menu 2016-11-20 19:19:03 -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
26285cfc95 Tweaks 2016-11-20 14:28:51 -05:00
Resin Neublem
78cbed516a Adds a new notes pane for each fit 
This allows users to save text notes for each fit. They may do this for history, or usage, etc.
 2016-11-20 14:11:42 -05:00
blitzman
7f2ac25455 Remove fleet booster context menu on fit 2016-11-20 13:54:56 -05:00
blitzman
380d74b333 Fix issue with gangboost not recalculating. We really should ensure that a command fit that has been calcuated does not need ot recalculate unless it's changed / is needed. But that's for a different time. 2016-11-20 01:14:40 -05:00
Indiction
a9fb55fedd Add "projected" to selected fitting via shipbrowser right click menu 2016-11-13 20:48:44 +01:00
blitzmann
34243b7b71 Get a working UI skeleton going for assigning boost fits 2016-11-08 19:36:57 -05:00
blitzmann
9fd81e8acd Copy projected view into a command view, first step to developing new command burst structure 2016-11-08 00:21:25 -05:00
blitzman
6849478226 Change hyphens in fitting tooltip to unicode dashes 2016-11-06 21:51:33 -05:00
Indiction
a0ef1a3d9b change to ternary operators (less ugly) 2016-11-06 20:37:24 +01:00
Indiction
ba47420577 Bugfix: Unable to handle ships without traits (Citadels) 2016-11-06 18:47:56 +01:00
Indiction
806f17545f Moved HTML remover into ShipItem and FitItem function 2016-11-06 16:36:12 +01:00
Indiction
f0f5b4c04c Tooltip to Ships and Fittings 2016-11-06 16:14:49 +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
791ddcb9a1 load fitting in selected page if ctrl-key pressed and option active 2016-10-30 01:05:22 +02:00
Indiction
12d5a21982 Option to open fittings in a new page by default 2016-10-30 00:43:23 +02:00
Indiction
7493b92d83 Mining Yield set to "per hour". This is the way miners calculate. 2016-10-29 18:57:38 +02:00
Ebag333
058768baab Implement new method for finding values 
Original method would only export values that were attached directly to
the ship.  New method starts from the modified dict, which will export
values without attribute IDs or original values.
 2016-10-23 10:44:59 -07:00
Ebag333
2b1abfc9b2 No longer refresh GUI. They can click the refresh button themselves, lazy jerks. 2016-10-21 19:28:54 -07:00
Ebag333
595c139ca8 Add button for exports 2016-10-21 10:53:47 -07:00
blitzman
c52fecead3 Fix fit drag image getting stuck when mouse capture is lost (#479) 2016-10-16 22:32:40 -04:00
Alexey Min
a06810c7c8 Network settings GUI: Use "Username:" and "Password:" for labels, as you wish 2016-10-09 13:20:20 +05:00
Alexey Min
160de64135 Network settings GUI: be prepared for None return from getProxyAuthDetails() 2016-10-09 13:16:38 +05:00
Alexey Min
3a7e343f1c Network preferences settings: GUI to set proxy login/password 2016-10-02 19:15:32 +05:00
petosorus
54c950f951 Multibuy format export feature 2016-09-14 23:38:09 +02:00
blitzman
ef06a1ccb1 Merge remote-tracking branch 'origin/master' 2016-08-30 23:16:12 -04:00
Ryan Holmes
9f9cd29a7f Merge pull request #712 from pyfa-org/feature/citadels 
Feature/citadels
 2016-08-30 09:23:34 -04:00
blitzman
c5b78c20e5 Do not allow projection to citadels 2016-08-28 20:00:46 -04:00
blitzman
f98f6a120b Bump dev, fix issue with applying fleet boosts 2016-08-28 19:35:55 -04:00
blitzman
fd91f56e55 Give citadels their own Upwell logo 2016-08-24 21:46:14 -04:00
PageArkanis
9ace9815b6 fixed exception that froze interface 2016-08-19 15:11:06 +01:00