blitzmann
|
5571bae8b2
|
Fix situation in which event propagation was not working properly for structures
|
2018-02-17 12:47:07 -05:00 |
|
blitzmann
|
c6e715aa5c
|
Merge branch 'master' into test-3
|
2018-02-14 22:07:33 -05:00 |
|
blitzmann
|
d94d49f0a9
|
Add misc column to booster panel, and show booster duration
|
2018-02-10 20:45:26 -05:00 |
|
blitzmann
|
b30b3fcbf1
|
Merge branch 'master' into test-3
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
|
2017-11-23 11:19:05 -05:00 |
|
blitzmann
|
b70f401a91
|
Merge branch 'qol/file-reorg' into development
|
2017-07-09 18:27:18 -04:00 |
|
Ryan Holmes
|
1cbd8ee901
|
Fix some deprecated stuff
|
2017-06-12 21:31:37 -04:00 |
|
Ryan Holmes
|
ad535ccc78
|
Merge branch 'qol/additionPanes' into qol/file-reorg
|
2017-06-12 01:17:22 -04:00 |
|
Ryan Holmes
|
9dee761f6d
|
Move addition pane views into their own directory
|
2017-06-12 01:17:00 -04:00 |
|