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
ab9c925c47
non-standard - use forces coding declarations
...
(cherry picked from commit 6e17d88)
2016-12-13 20:17:56 -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
bf16246825
Disable booster fit icon (for now)
2016-11-22 20:44:19 -05:00
blitzman
14e69b1e59
Add "Command Fit" context menu
2016-11-20 19:19:03 -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
blitzman
7f2ac25455
Remove fleet booster context menu on fit
2016-11-20 13:54:56 -05:00
Indiction
a9fb55fedd
Add "projected" to selected fitting via shipbrowser right click menu
2016-11-13 20:48:44 +01: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
blitzman
c52fecead3
Fix fit drag image getting stuck when mouse capture is lost ( #479 )
2016-10-16 22:32:40 -04:00
blitzman
fd91f56e55
Give citadels their own Upwell logo
2016-08-24 21:46:14 -04:00
blitzmann
10c79ac812
More work on restrictions
2016-07-04 11:01:08 -04:00
blitzmann
2ac62ece06
Remove erroneous command causing a break in ship booster menu
2015-12-05 22:53:51 -05:00
blitzmann
4d701f561e
fix booster menu causing crashes ( #424 )
2015-11-26 18:56:20 -05:00
blitzmann
365cacac66
Fix #371
2015-10-02 11:16:41 -04:00
blitzmann
072fac4259
Merge branch 'master' into wx3
2015-09-29 21:35:44 -04:00
blitzmann
2617143330
Fix #363
2015-09-27 18:16:54 -04:00
blitzmann
e9d02ce4c8
Change to use BitmapLoader class
2015-09-24 12:21:50 -04:00
blitzmann
474f270b26
Change to new icon locations
2015-09-24 12:17:17 -04:00
blitzmann
5372f31be8
Revert "Revert "Merge branch 'master' into wx3"". So many reverts.
...
This reverts commit cca7f1112a
2015-06-27 21:53:59 -04:00
blitzmann
6d01877d78
Merge branch 'master' into wx3
...
Conflicts:
pyfa.py
2015-06-27 19:33:12 -04:00
blitzmann
646f3afd27
Fixed oversights
2015-06-27 19:32:21 -04:00
blitzmann
98815f2b85
Fix #307 by moving menu code to spawn event
2015-06-27 18:18:43 -04:00
blitzmann
dc035469ed
Fix background color for certain panels under Linux
2015-06-25 16:09:56 -04:00
blitzmann
f285395e0f
Fix black bitmap when dragging fit, closes #303
2015-06-17 19:43:48 -04:00
blitzmann
b54e3aeaf9
See #303
2015-06-16 15:28:23 -04:00
DarkPhoenix
cca7f1112a
Revert "Merge branch 'master' into wx3"
...
This reverts commit 33a0c106502077655694
2015-04-30 19:47:15 +03:00
blitzmann
39c14b62fd
Merge branch 'master' into wx3
2015-04-17 17:48:56 -04:00
blitzmann
6c19f446be
Sort import stage results
2015-02-09 22:44:33 -05:00
blitzmann
dc77ee9353
Add import stage to goTo logic, and fixed a bug with search initiating a goTo to the last hx item
2015-02-09 22:05:56 -05:00
blitzmann
6d29fd6bc1
Simplified stage 3 history handling. Fixes:
...
* Hitting back button after creating/copying new fit breaks stage
* Importing more than 1 fit while on the search stage and hitting the back button breaks stage
2015-02-08 21:12:56 -05:00
blitzmann
cbcd5ccca5
Fixed bugs:
...
* Importing 1 fit would open stage3 of that ship, but add incorrect history data.
* Deleting fit from search stage caused blank stage most times, fixed this.
2015-02-08 20:29:54 -05:00
blitzmann
30d2ab23ad
Initial support for import stage in shipBrowser. Few bugs, see issue #93
2015-02-08 16:14:52 -05:00
blitzmann
675213f20f
Fix #252
2015-01-21 11:18:58 -05:00
DarkPhoenix
e8268633e3
Merge branch 'master' into wx3
...
Used code from the master on conflicts
2014-12-15 15:45:33 +03:00
DarkPhoenix
3c1bf22e87
Merge branch 'master' into wx3
2014-12-12 14:42:25 +03:00
blitzmann
88074c8516
Fix fonts and lag with OS X
2014-12-11 23:25:44 -05:00
DarkPhoenix
da15b63831
Fix race detection
2014-12-10 01:01:51 +03:00
blitzmann
a603a4359a
Fixed font discrepancy from different wxPython versions.
2014-11-08 16:45:09 +02:00
blitzmann
6fafe40f35
Fix for a fix that was removed with a fix (see #62 )
2014-11-07 23:17:14 -05:00
blitzmann
ec083428da
Fit search shortcut: Fix focus issues for Linux
2014-08-26 16:01:39 -04:00
blitzmann
59be18506c
Added "Open in Ship Browser" to fitting context menu, and modified a bit of the history logic in shipBrowser.
2014-08-19 23:50:10 -04:00
blitzmann
9e5f119248
Reduces icon opacity of "Empty Groups" toggle dependant on filtering state.
2014-08-10 17:21:48 -04:00
