Ebag333
|
dc6cde86c9
|
Merge branch 'development' into PreferencesPaneV2
|
2017-02-26 11:22:10 -08:00 |
|
blitzman
|
1826122381
|
Clean up some syntax (use isinstance) and tox stuff
|
2017-02-26 14:17:46 -05:00 |
|
blitzman
|
b235dddbe0
|
Clean up to the sorting of implants and bosoters
|
2017-02-26 13:31:56 -05:00 |
|
Ebag333
|
68e75025be
|
Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.
|
2017-02-26 09:54:58 -08:00 |
|
blitzmann
|
767cb46d40
|
Merge branch 'development' into More_Variations
Conflicts:
gui/builtinContextMenus/metaSwap.py
|
2017-02-26 02:24:38 -05: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
|
3ccd4ad2ca
|
Revert "Convert remaining files to CRLF"
This reverts commit a8ab876053.
|
2017-02-07 19:05:45 -05:00 |
|
Ryan Holmes
|
a8ab876053
|
Convert remaining files to CRLF
|
2017-02-07 11:01:40 -05:00 |
|
Ebag333
|
3774e3bca0
|
add variations for drones, fighters, boosters, and implants
|
2017-01-12 01:24:26 -08:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -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 |
|
blitzmann
|
4d158d99fd
|
Fix crash related to structure rigs not having meta level, and a traceback that might happen occasionally.
|
2016-07-05 23:23:55 -04:00 |
|
blitzmann
|
6e2878194c
|
Merge branch 'master' into citadel
Conflicts:
config.py
service/market.py
|
2016-07-03 01:10:26 -04:00 |
|
blitzmann
|
10f51b41b7
|
Fix context menu with structure modules (no meta information), add citadel icons.
|
2016-05-15 19:16:51 -04:00 |
|
blitzmann
|
d061a13b58
|
Move ID pool to context menu class rather than individual menu items
|
2016-05-15 12:18:56 -04:00 |
|
Will Wykeham
|
2904ab6afa
|
Non-windows platform fix for variations menu
|
2015-08-18 15:59:02 +01:00 |
|
Will Wykeham
|
c763595cc4
|
Remove debug print statement
|
2015-08-17 15:41:58 +01:00 |
|
Will Wykeham
|
8fe97180ed
|
Sort higher metalevel items properly in variations menu
|
2015-08-16 21:56:39 +01:00 |
|
Will Wykeham
|
6a4b2ffe69
|
Make variations menu handle multiple selections
Ensure the variations menu only shows when you've got
a matching set of items selected.
|
2015-08-16 21:45:20 +01:00 |
|
Will Wykeham
|
7f100353e2
|
Make variations menu actually swap out module
Functional, but not handling multiple selections well
|
2015-08-16 18:30:27 +01:00 |
|
Will Wykeham
|
97ac0804c5
|
Add Submenu of variations of module type.
Non functional so far.
|
2015-08-15 19:35:31 +01:00 |
|